fix typos.

[lilypond.git] / lily / moment.cc

diff --git a/lily/moment.cc b/lily/moment.cc
index 54ee65c1842ec074cb034167bbe76c2b0636d8a6..a257daec741058cfd23e3bddccfb5d040c2b75af 100644 (file)
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -46,7 +46,7 @@ Moment::mark_smob (SCM)
 int
 Moment::print_smob (SCM s, SCM port, scm_print_state *)
 {
-  Moment  *r = (Moment *) ly_cdr (s);
+  Moment  *r = (Moment *) SCM_CELL_WORD_1 (s);
      
   scm_puts ("#<Mom ", port);
   String str = r->to_string ();
@@ -56,6 +56,16 @@ Moment::print_smob (SCM s, SCM port, scm_print_state *)
   return 1;
 }
 
+SCM
+Moment::as_scheme () const
+{
+  return scm_list_5 (ly_symbol2scm ("ly:make-moment"),
+                    scm_from_int (main_part_.num()),
+                    scm_from_int (main_part_.den()),
+                    scm_from_int (grace_part_.num()),
+                    scm_from_int (grace_part_.den()));
+}
+
 /* TODO: add optional factor argument. */
 LY_DEFINE (ly_make_moment, "ly:make-moment",
           2, 2, 0, (SCM n, SCM d, SCM gn, SCM gd),
@@ -69,24 +79,24 @@ LY_DEFINE (ly_make_moment, "ly:make-moment",
           "notes, and @var{g} the timing for grace notes.  "
           "In absence of grace notes, @var{g} is zero.\n")
 {
-  SCM_ASSERT_TYPE (SCM_INUMP (n), n, SCM_ARG1, __FUNCTION__, "integer");
-  SCM_ASSERT_TYPE (SCM_INUMP (d), d, SCM_ARG2, __FUNCTION__, "integer");
+  SCM_ASSERT_TYPE (scm_is_integer (n), n, SCM_ARG1, __FUNCTION__, "integer");
+  SCM_ASSERT_TYPE (scm_is_integer (d), d, SCM_ARG2, __FUNCTION__, "integer");
 
   int grace_num = 0;
   if (gn != SCM_UNDEFINED)
     {
-      SCM_ASSERT_TYPE (SCM_INUMP (gn), gn, SCM_ARG3, __FUNCTION__, "integer");
-      grace_num = ly_scm2int (gn);
+      SCM_ASSERT_TYPE (scm_is_integer (gn), gn, SCM_ARG3, __FUNCTION__, "integer");
+      grace_num = scm_to_int (gn);
     }
 
   int grace_den = 1;
   if (gd != SCM_UNDEFINED)
     {
-      SCM_ASSERT_TYPE (SCM_INUMP (gd), gd, SCM_ARG4, __FUNCTION__, "integer");
-      grace_den = ly_scm2int (gd);
+      SCM_ASSERT_TYPE (scm_is_integer (gd), gd, SCM_ARG4, __FUNCTION__, "integer");
+      grace_den = scm_to_int (gd);
     }
 
-  return Moment (Rational (ly_scm2int (n), ly_scm2int (d)),
+  return Moment (Rational (scm_to_int (n), scm_to_int (d)),
                 Rational (grace_num, grace_den)).smobbed_copy ();
 }
 
@@ -247,3 +257,21 @@ operator << (std::ostream &os, Moment const &m)
   return os;
 }
 #endif
+
+Moment
+robust_scm2moment (SCM m, Moment d)
+{
+  Moment *p = unsmob_moment (m);
+  if (!p)
+    return d;
+  else
+    return *p;
+}
+
+
+bool
+moment_less (SCM a, SCM b)
+{
+  return *unsmob_moment (a) < *unsmob_moment (b);
+}
+