X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmoment-scheme.cc;h=4eb3086adf1331f816cf66659d4c86f9846fd15f;hb=5516a43e8bc85c3f58b3c004a9a7fde626408939;hp=b19259e6b2505d36c30034282cc3caf55abfcdb9;hpb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;p=lilypond.git

diff --git a/lily/moment-scheme.cc b/lily/moment-scheme.cc
index b19259e6b2..4eb3086adf 100644
--- a/lily/moment-scheme.cc
+++ b/lily/moment-scheme.cc
@@ -21,20 +21,20 @@ 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_is_integer (n), n, SCM_ARG1, __FUNCTION__, "integer");
-  SCM_ASSERT_TYPE (scm_is_integer (d), d, SCM_ARG2, __FUNCTION__, "integer");
+  LY_ASSERT_TYPE (scm_is_integer, n, 1);
+  LY_ASSERT_TYPE (scm_is_integer, d, 2);
 
   int grace_num = 0;
   if (gn != SCM_UNDEFINED)
     {
-      SCM_ASSERT_TYPE (scm_is_integer (gn), gn, SCM_ARG3, __FUNCTION__, "integer");
+      LY_ASSERT_TYPE (scm_is_integer, gn, 3);
       grace_num = scm_to_int (gn);
     }
 
   int grace_den = 1;
   if (gd != SCM_UNDEFINED)
     {
-      SCM_ASSERT_TYPE (scm_is_integer (gd), gd, SCM_ARG4, __FUNCTION__, "integer");
+      LY_ASSERT_TYPE (scm_is_integer, gd, 4);
       grace_den = scm_to_int (gd);
     }
 
@@ -42,14 +42,16 @@ LY_DEFINE (ly_make_moment, "ly:make-moment",
 		 Rational (grace_num, grace_den)).smobbed_copy ();
 }
 
-LY_DEFINE (ly_sub_moment, "ly:moment-sub",
+LY_DEFINE (ly_moment_sub, "ly:moment-sub",
 	   2, 0, 0, (SCM a, SCM b),
 	   "Subtract two moments.")
 {
+  LY_ASSERT_SMOB (Moment, a, 1); 
+  LY_ASSERT_SMOB (Moment, b, 2);
+  
   Moment *ma = unsmob_moment (a);
   Moment *mb = unsmob_moment (b);
-  SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
-  SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
+
   return (*ma - *mb).smobbed_copy ();
 }
 
@@ -57,10 +59,12 @@ LY_DEFINE (ly_moment_add, "ly:moment-add",
 	   2, 0, 0, (SCM a, SCM b),
 	   "Add two moments.")
 {
+  LY_ASSERT_SMOB (Moment, a, 1); 
+  LY_ASSERT_SMOB (Moment, b, 2); 
+
   Moment *ma = unsmob_moment (a);
   Moment *mb = unsmob_moment (b);
-  SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
-  SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
+
   return (*ma + *mb).smobbed_copy ();
 }
 
@@ -68,10 +72,11 @@ LY_DEFINE (ly_moment_mul, "ly:moment-mul",
 	   2, 0, 0, (SCM a, SCM b),
 	   "Multiply two moments.")
 {
+  LY_ASSERT_SMOB (Moment, a, 1); 
+  LY_ASSERT_SMOB (Moment, b, 2); 
+
   Moment *ma = unsmob_moment (a);
   Moment *mb = unsmob_moment (b);
-  SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
-  SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
   return (*ma * * mb).smobbed_copy ();
 }
 
@@ -79,10 +84,12 @@ LY_DEFINE (ly_moment_div, "ly:moment-div",
 	   2, 0, 0, (SCM a, SCM b),
 	   "Divide two moments.")
 {
+  LY_ASSERT_SMOB (Moment, a, 1); 
+  LY_ASSERT_SMOB (Moment, b, 2); 
+
   Moment *ma = unsmob_moment (a);
   Moment *mb = unsmob_moment (b);
-  SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
-  SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
+  
   return (*ma / * mb).smobbed_copy ();
 }
 
@@ -90,10 +97,11 @@ LY_DEFINE (ly_moment_mod, "ly:moment-mod",
 	   2, 0, 0, (SCM a, SCM b),
 	   "Modulo of two moments.")
 {
+  LY_ASSERT_SMOB (Moment, a, 1); 
+  LY_ASSERT_SMOB (Moment, b, 2); 
+  
   Moment *ma = unsmob_moment (a);
   Moment *mb = unsmob_moment (b);
-  SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
-  SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
   return (*ma % * mb).smobbed_copy ();
 }
 
@@ -101,8 +109,9 @@ LY_DEFINE (ly_moment_grace_numerator, "ly:moment-grace-numerator",
 	   1, 0, 0, (SCM mom),
 	   "Extract numerator from grace timing.")
 {
+  LY_ASSERT_SMOB (Moment, mom, 1);
+
   Moment *ma = unsmob_moment (mom);
-  SCM_ASSERT_TYPE (ma, mom, SCM_ARG1, __FUNCTION__, "moment");
 
   return scm_from_int (ma->grace_part_.numerator ());
 }
@@ -111,8 +120,8 @@ LY_DEFINE (ly_moment_grace_denominator, "ly:moment-grace-denominator",
 	   1, 0, 0, (SCM mom),
 	   "Extract denominator from grace timing.")
 {
+  LY_ASSERT_SMOB (Moment, mom, 1);
   Moment *ma = unsmob_moment (mom);
-  SCM_ASSERT_TYPE (ma, mom, SCM_ARG1, __FUNCTION__, "moment");
 
   return scm_from_int (ma->grace_part_.denominator ());
 }
@@ -120,8 +129,8 @@ LY_DEFINE (ly_moment_main_numerator, "ly:moment-main-numerator",
 	   1, 0, 0, (SCM mom),
 	   "Extract numerator from main timing.")
 {
+  LY_ASSERT_SMOB (Moment, mom, 1);
   Moment *ma = unsmob_moment (mom);
-  SCM_ASSERT_TYPE (ma, mom, SCM_ARG1, __FUNCTION__, "moment");
 
   return scm_from_int (ma->main_part_.numerator ());
 }
@@ -130,8 +139,8 @@ LY_DEFINE (ly_moment_main_denominator, "ly:moment-main-denominator",
 	   1, 0, 0, (SCM mom),
 	   "Extract denominator from main timing.")
 {
+  LY_ASSERT_SMOB (Moment, mom, 1);
   Moment *ma = unsmob_moment (mom);
-  SCM_ASSERT_TYPE (ma, mom, SCM_ARG1, __FUNCTION__, "moment");
 
   return scm_from_int (ma->main_part_.denominator ());
 }
@@ -140,10 +149,12 @@ LY_DEFINE (ly_moment_less_p, "ly:moment<?",
 	   2, 0, 0, (SCM a, SCM b),
 	   "Compare two moments.")
 {
+  LY_ASSERT_SMOB (Moment, a, 1); 
+  LY_ASSERT_SMOB (Moment, b, 2); 
+  
   Moment *ma = unsmob_moment (a);
   Moment *mb = unsmob_moment (b);
-  SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
-  SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
+
   return ly_bool2scm (*ma < *mb);
 }