Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh
index dd384786edc3bc61696f70563aaea19faf5bff76..da37b4f9e8004798ccc5fcfa9460146c25310fe3 100644 (file)
--- a/lily/include/smobs.hh
+++ b/lily/include/smobs.hh
@@ -10,7 +10,7 @@
 #define SMOBS_HH
 
 #include "lily-guile.hh"
-#include "virtual-methods.hh"
+#include "warn.hh"
 
 /*
   Smobs are GUILEs mechanism of exporting C(++) objects to the Scheme
@@ -27,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
@@ -58,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
@@ -88,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)
@@ -113,7 +113,7 @@
   static void init_smobs ();                                   \
   private:
 
-#define DECLARE_SMOBS(CL, dummy)               \
+#define DECLARE_SMOBS(CL)                      \
   DECLARE_BASE_SMOBS (CL)                      \
     protected:                                 \
   virtual ~CL ();                              \
@@ -140,5 +140,14 @@
 void protect_smob (SCM smob, SCM *prot_cons);
 void unprotect_smob (SCM smob, SCM *prot_cons);
 
+extern bool parsed_objects_should_be_dead;
+
+#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;\
+  }    
+
 #endif /* SMOBS_HH */