patch::: 1.3.96.jcn9

[lilypond.git] / lily / moment.cc

diff --git a/lily/moment.cc b/lily/moment.cc
index 0e11977686cc0c144341dcfedb3c1c0a3aa94927..ff21fb5ebffbf6f5a3a9befe24a4da8bdcc6c41c 100644 (file)
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,19 +11,27 @@
 #include "lily-guile.hh"
 #include "moment.hh"
 #include "warn.hh"
+#include "ly-smobs.icc"
+
+IMPLEMENT_UNSMOB(Moment,moment);
+IMPLEMENT_SIMPLE_SMOBS(Moment);
+IMPLEMENT_TYPE_P (Moment, "moment?");
 
 SCM
-Moment::mark_smob (SCM s)
+Moment::mark_smob (SCM)
 {
   return SCM_EOL;
 }
 
 
-Moment::~Moment()
+SCM
+Moment::make_scm () const
 {
-  self_scm_ = SCM_EOL;
+  Moment * m = new Moment (*this);
+  return m->smobbed_self();
 }
 
+
 int
 Moment::print_smob (SCM s, SCM port, scm_print_state *)
 {
@@ -37,33 +45,29 @@ Moment::print_smob (SCM s, SCM port, scm_print_state *)
   return 1;
 }
 
-void
-Moment::do_smobify_self ()
-{}
-
 SCM
 make_rational (SCM n, SCM d)
 {
+  Moment m (1,1);
+
   if (SCM_INUMP (n) && SCM_INUMP(d))
     {
-      Moment *r = new Moment (gh_scm2int (n), gh_scm2int (d));
-      return r->smobify_self ();
+      m =  Moment (gh_scm2int (n), gh_scm2int (d));
     }
   else
     {
-      ::error ("Not a number");
-      assert(false);
+      ::error ("make-moment takes two integer arguments. Using 1/1");
     }
-}
 
-#include "ly-smobs.icc"
+  return m.make_scm ();
+}
 
-IMPLEMENT_SMOBS(Moment);
 
 void
 init_moments ()
 {
-  scm_make_gsubr ("make-moment", 2 , 0, 0,  (SCM(*)(...)) make_rational);
+  scm_make_gsubr ("make-moment", 2 , 0, 0, (Scheme_function_unknown) make_rational);
+  scm_make_gsubr ("make-moment", 2 , 0, 0, (Scheme_function_unknown) make_rational);  
 }
 
 ADD_SCM_INIT_FUNC(moms,init_moments);
@@ -71,8 +75,9 @@ ADD_SCM_INIT_FUNC(moms,init_moments);
 SCM
 Moment::equal_p (SCM a, SCM b)
 {
-  Moment *m1 = SMOB_TO_TYPE(Moment, a);
-  Moment *m2 = SMOB_TO_TYPE(Moment, b);
+  Moment *m1 = unsmob_moment (a);
+  Moment *m2 = unsmob_moment (b);
       
   return (*m1 == *m2) ? SCM_BOOL_T : SCM_BOOL_F;
 }
+