Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...

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

diff --git a/lily/grob-array-scheme.cc b/lily/grob-array-scheme.cc
index 5788ef9dda243c696a2574933fd1a4684df54a44..1c10f6488a9b9c74250b64fcdcd0192d5cfa26d5 100644 (file)
--- a/lily/grob-array-scheme.cc
+++ b/lily/grob-array-scheme.cc
@@ -1,10 +1,21 @@
 /*
-  grob-array-scheme.cc -- implement Grob_array bindings.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "grob-array.hh"
@@ -13,10 +24,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,17 +36,15 @@ 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");
-
-  int i = scm_to_int (index);
-  if (i < 0 || i >= me->size ())
-    {
-      scm_out_of_range (NULL, scm_from_int (i)); 
-    }
+  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 ())
+    scm_out_of_range (NULL, scm_from_unsigned (i)); 
   
   return me->grob (i)->self_scm ();
 }