Run `make grand-replace'.

[lilypond.git] / lily / include / smobs.hh

diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh
index ba86f0fe84227c05c0413c971c4e184e2c053cc8..3c760cf33969953db4d8a31b7a3ca9c9a2c8cf2e 100644 (file)
--- a/lily/include/smobs.hh
+++ b/lily/include/smobs.hh
@@ -3,13 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SMOBS_HH
 #define SMOBS_HH
 
 #include "lily-guile.hh"
+#include "warn.hh"
 
 /*
   Smobs are GUILEs mechanism of exporting C(++) objects to the Scheme
@@ -26,7 +27,7 @@
   SCM smobbed_copy ().
 
   Simple smobs are created by adding the
-  DECLARE_SIMPLE_SMOBS(Classname, ) to the declaration
+  DECLARE_SIMPLE_SMOBS(Classname) to the declaration
 
   2. Complex smobs are objects that have an identity. These objects
   carry this identity in the form of a self_scm () method, which is a
@@ -57,7 +58,7 @@
   list = scm_cons (p->self_scm (), list);
   scm_gc_unprotect_object (p->self_scm ());
 
-  Complex smobs are made with DECLARE_SMOBS (Classname, ) in the class
+  Complex smobs are made with DECLARE_SMOBS (Classname) in the class
   declaration.
 
   CALLING INTERFACE
@@ -87,7 +88,7 @@
   from file "ly-smobs.icc"
 */
 
-#define DECLARE_SIMPLE_SMOBS(CL, dummy)                \
+#define DECLARE_SIMPLE_SMOBS(CL)               \
   public:                                      \
   SCM smobbed_copy () const;                   \
   DECLARE_BASE_SMOBS (CL)
@@ -95,13 +96,14 @@
 #define DECLARE_BASE_SMOBS(CL)                                 \
   friend class Non_existent_class;                             \
   private:                                                     \
+  static const char* smob_name_; \
   static scm_t_bits smob_tag_;                                 \
   static SCM mark_smob (SCM);                                  \
   static size_t free_smob (SCM s);                             \
   static int print_smob (SCM s, SCM p, scm_print_state*);      \
   public:                                                      \
   static SCM equal_p (SCM a, SCM b);                           \
-  static CL *unsmob (SCM s)                                    \
+  static CL *unsmob (SCM s) __attribute__((pure))              \
   {                                                            \
     if (SCM_NIMP (s) && SCM_CELL_TYPE (s) == smob_tag_)                \
       return (CL *) SCM_CELL_WORD_1 (s);                       \
@@ -112,7 +114,7 @@
   static void init_smobs ();                                   \
   private:
 
-#define DECLARE_SMOBS(CL, dummy)               \
+#define DECLARE_SMOBS(CL)                      \
   DECLARE_BASE_SMOBS (CL)                      \
     protected:                                 \
   virtual ~CL ();                              \
@@ -137,7 +139,20 @@
 #define DECLARE_TYPE_P(CL) extern SCM CL ## _type_p_proc
 
 void protect_smob (SCM smob, SCM *prot_cons);
-void unprotect_smob (SCM *prot_cons);
+void unprotect_smob (SCM smob, SCM *prot_cons);
+
+extern bool parsed_objects_should_be_dead;
+
+#ifndef NDEBUG
+#define ASSERT_LIVE_IS_ALLOWED()     \
+  static bool passed_here_once;\
+  if (parsed_objects_should_be_dead && !passed_here_once) { \
+    ::programming_error (string ("Parsed object should be dead: ")  + __PRETTY_FUNCTION__ ); \
+    passed_here_once = true;\
+  }    
+#else
+#define ASSERT_LIVE_IS_ALLOWED()
+#endif
 
 #endif /* SMOBS_HH */