X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsmobs.cc;h=ea2095c3a3f39bf69d35871b5903a91567aaec2a;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=a6fdc76b9e754ee306802d4d4c213f91960e0e31;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/smobs.cc b/lily/smobs.cc
index a6fdc76b9e..ea2095c3a3 100644
--- a/lily/smobs.cc
+++ b/lily/smobs.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "smobs.hh"
@@ -11,51 +11,60 @@
 /*
   The CDR contains the actual protected list.
  */
-static SCM smob_protection_list;
+static SCM smob_protection_list = SCM_EOL;
 
 void
 init_smob_protection ()
 {
-  smob_protection_list = scm_cons (SCM_UNDEFINED, SCM_EOL);
-  scm_permanent_object (smob_protection_list);
+  smob_protection_list = scm_cons (SCM_BOOL_F, SCM_EOL);
+  scm_gc_protect_object (smob_protection_list);
 }
 ADD_SCM_INIT_FUNC (init_smob_protection, init_smob_protection);
 
-LY_DEFINE(ly_smob_protects, "ly:smob-protects",
-	  0,0,0, (),
-	  "Return lily's internal smob protection list")
+LY_DEFINE (ly_smob_protects, "ly:smob-protects",
+	  0, 0, 0, (),
+	  "Return LilyPond's internal smob protection list.")
 {
-  return scm_cdr (smob_protection_list);
+  return scm_is_pair (smob_protection_list)
+    ? scm_cdr (smob_protection_list)
+    : SCM_EOL;
 }
 
-	  
-	  
-
 void
 protect_smob (SCM smob, SCM *prot_cons)
 {
+#if 0
   SCM s = scm_cdr (smob_protection_list);
-  while (scm_is_pair (s) && scm_car (s) == SCM_UNDEFINED)
-    s = scm_cdr (s);
-
+  while (scm_is_pair (s) && scm_car (s) == SCM_BOOL_F)
+    {
+      s = scm_cdr (s);
+    }
   SCM prot = scm_cons (smob, s);
   scm_set_cdr_x (smob_protection_list,
 		 prot);
   *prot_cons = prot;
+#else
+  (void) prot_cons; 
+  scm_gc_protect_object (smob);
+#endif
 }
 
 void
-unprotect_smob (SCM *prot_cons)
+unprotect_smob (SCM smob, SCM *prot_cons)
 {
+#if 1
+  (void) prot_cons; 
+  scm_gc_unprotect_object (smob);
+#else
   SCM next = scm_cdr (*prot_cons);
 
   if (next == SCM_EOL)
-    scm_set_car_x (*prot_cons, SCM_UNDEFINED);
+    scm_set_car_x (*prot_cons, SCM_BOOL_F);
   else
     {
-      scm_set_car_x (*prot_cons, SCM_UNDEFINED);
+      scm_set_car_x (*prot_cons, SCM_BOOL_F);
       while (scm_is_pair (next)
-	     && scm_car (next) == SCM_UNDEFINED)
+	     && scm_car (next) == SCM_BOOL_F)
 
 	next = scm_cdr (next);
 
@@ -63,4 +72,5 @@ unprotect_smob (SCM *prot_cons)
     }
 
   *prot_cons = SCM_EOL;
+#endif
 }