Run `make grand-replace'.

[lilypond.git] / lily / smobs.cc

diff --git a/lily/smobs.cc b/lily/smobs.cc
index e2ec5d5638124b947cd9cf0c936ebe1e86dff775..247489e342b5c759d8638baccc82fb9b2a09ef68 100644 (file)
--- a/lily/smobs.cc
+++ b/lily/smobs.cc
@@ -3,50 +3,68 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "smobs.hh"
 
-static SCM smob_protection_list;
+/*
+  The CDR contains the actual protected 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 LilyPond's internal 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)
+  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);
 
@@ -54,4 +72,5 @@ unprotect_smob (SCM *prot_cons)
     }
 
   *prot_cons = SCM_EOL;
+#endif
 }