replace SCM_ASSERT_TYPE with LY_ASSERT_TYPE and friends

[lilypond.git] / lily / simple-spacer-scheme.cc

diff --git a/lily/simple-spacer-scheme.cc b/lily/simple-spacer-scheme.cc
index 24b6d1c76351f3830d105651c75eb46644332ba8..2d702edcd0d2a30d8d308212d2efdd10a80a8b58 100644 (file)
--- a/lily/simple-spacer-scheme.cc
+++ b/lily/simple-spacer-scheme.cc
@@ -23,14 +23,15 @@ LY_DEFINE (ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem",
           "negative for compressing and #f for non-satisfied constraints) "
           "followed by the @var{spring-count}+1 positions of the objects. ")
 {
+  LY_FUNC_NOTE_FIRST_ARG(springs);
+  
   int len = scm_ilength (springs);
   if (len == 0)
     return scm_list_2 (scm_from_double (0.0), scm_from_double (0.0));
 
   SCM_ASSERT_TYPE (len >= 0, springs, SCM_ARG1, __FUNCTION__, "list of springs");
-  SCM_ASSERT_TYPE (scm_ilength (rods) >= 0, rods, SCM_ARG2, __FUNCTION__, "list of rods");
-  SCM_ASSERT_TYPE (scm_is_number (length) || length == SCM_BOOL_F,
-                  length, SCM_ARG3, __FUNCTION__, "number or #f");
+  SCM_ASSERT_TYPE (scm_ilength (rods)  > 0, rods, SCM_ARG1, __FUNCTION__, "list of rods");
+  LY_ASSERT_TYPE(scm_is_number, 3);
 
   bool is_ragged = ragged == SCM_BOOL_T;
   Simple_spacer spacer;