* lily/include/lily-guile-macros.hh: new file.

[lilypond.git] / lily / protected-scm.cc

diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc
index 0304d91f9133033f5b8e1881e6ad59a30afea76f..9e682104f9a50063c117b1646ca6478c885a8af0 100644 (file)
--- a/lily/protected-scm.cc
+++ b/lily/protected-scm.cc
@@ -3,50 +3,60 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-#include "protected-scm.hh"
-extern "C"
-{
-#include <libguile/gc.h>
-};
 
+#include "protected-scm.hh"
 
 Protected_scm::Protected_scm ()
 {
-  object_ = 0;
+  object_ = SCM_UNDEFINED;
 }
 
 Protected_scm::Protected_scm (SCM s)
 {
-  object_ = s  ? scm_protect_object (s): 0;
+  object_ = SCM_NIMP (s) ? scm_gc_protect_object (s): s;
 }
 
 Protected_scm::Protected_scm (Protected_scm const &s)
 {
-  object_ = s.object_ ? scm_protect_object (s.object_) : 0;
+  object_ = (SCM_NIMP (s.object_) ? scm_gc_protect_object (s.object_)
+            : s.object_);
+}
+
+Protected_scm::~Protected_scm ()
+{
+  if (SCM_NIMP (object_))
+    scm_gc_unprotect_object (object_);
 }
 
 Protected_scm & 
-Protected_scm::operator =(Protected_scm const &s)
+Protected_scm::operator = (SCM s)
 {
-  if (this == &s)
+  if (object_ == s)
     return *this;
-  if (object_)
-    scm_unprotect_object(object_);
+  
+  if (SCM_NIMP (object_))
+    scm_gc_unprotect_object (object_);
 
-  object_ = (s.object_) ? scm_protect_object (s.object_): 0;
+  object_ = SCM_NIMP (s) ? scm_gc_protect_object (s) : s;
   return *this;
 }
 
-Protected_scm::~Protected_scm ()
+Protected_scm&
+Protected_scm::operator = (Protected_scm const &s)
+{
+  return operator = (s.object_);
+}
+
+Protected_scm::operator SCM () const
 {
-  if  (object_)
-    scm_unprotect_object (object_);
+  return object_;
 }
 
-Protected_scm::operator SCM ()
+SCM 
+Protected_scm::to_SCM () const
 {
   return object_;
 }