X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsmobs.hh;h=da37b4f9e8004798ccc5fcfa9460146c25310fe3;hb=04974e9ea76a647fb5ded11d048017ad2e469157;hp=c563f6df19aff2121c26c75c3f0b9fe36d7791be;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh
index c563f6df19..da37b4f9e8 100644
--- 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--2006 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)
@@ -112,7 +113,7 @@
   static void init_smobs ();					\
   private:
 
-#define DECLARE_SMOBS(CL, dummy)		\
+#define DECLARE_SMOBS(CL)			\
   DECLARE_BASE_SMOBS (CL)			\
     protected:					\
   virtual ~CL ();				\
@@ -120,7 +121,10 @@
   private:					\
   void smobify_self ();				\
   SCM self_scm_;				\
+  SCM protection_cons_;				\
   public:					\
+  SCM unprotect ();				\
+  void protect ();				\
   SCM self_scm () const { return self_scm_; }	\
   private:
 
@@ -133,5 +137,17 @@
 
 #define DECLARE_TYPE_P(CL) extern SCM CL ## _type_p_proc
 
+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 */