Merge with master

[lilypond.git] / lily / grob-array-scheme.cc

diff --git a/lily/grob-array-scheme.cc b/lily/grob-array-scheme.cc
index d9f7d20e98145ff20d1466c467b9323e741b3c1e..b74b10fc51aab43d39907c8ab8455c49c2f34cfe 100644 (file)
--- a/lily/grob-array-scheme.cc
+++ b/lily/grob-array-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
@@ -15,8 +15,9 @@ LY_DEFINE (ly_grob_array_length, "ly:grob-array-length",
           (SCM grob_arr),
           "Return the grob_array length.")
 {
+  LY_ASSERT_SMOB (Grob_array, grob_arr, 1);
+
   Grob_array *me = unsmob_grob_array (grob_arr);
-  SCM_ASSERT_TYPE (me, grob_arr, SCM_ARG1, __FUNCTION__, "Grob_array");
   return  scm_from_int (me->size ());
 }
 
@@ -27,8 +28,8 @@ LY_DEFINE (ly_grob_array_ref, "ly:grob-array-ref",
           "Retrieve the @code{index} element of @code{grob-arr}.")
 {
   Grob_array *me = unsmob_grob_array (grob_arr);
-  SCM_ASSERT_TYPE (me, grob_arr, SCM_ARG1, __FUNCTION__, "Grob_array");
-  SCM_ASSERT_TYPE (scm_is_integer (index), index, SCM_ARG2, __FUNCTION__, "integer");
+  LY_ASSERT_SMOB (Grob_array, grob_arr, 1);
+  LY_ASSERT_TYPE(scm_is_integer,index, 2);
 
   vsize i = scm_to_unsigned (index);
   if (i == VPOS || i >= me->size ())