Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/grob-array-scheme.cc b/lily/grob-array-scheme.cc
index b242addf9b82ff162260eea895f2dff8f921a998..49fac4c21ae76e5897de6815aecb30653821ba1a 100644 (file)
--- a/lily/grob-array-scheme.cc
+++ b/lily/grob-array-scheme.cc
@@ -13,10 +13,11 @@
 LY_DEFINE (ly_grob_array_length, "ly:grob-array-length",
           1, 0, 0,
           (SCM grob_arr),
-          "Return the grob_array length.")
+          "Return the length of @var{grob-arr}.")
 {
+  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 ());
 }
 
@@ -24,11 +25,11 @@ LY_DEFINE (ly_grob_array_length, "ly:grob-array-length",
 LY_DEFINE (ly_grob_array_ref, "ly:grob-array-ref",
           2, 0, 0,
           (SCM grob_arr, SCM index),
-          "Retrieve the @code{index} element of @code{grob-arr}.")
+          "Retrieve the @var{index}th element of @var{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 ())