X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-scheme.cc;h=d3e2d65803e03ccc68b24342ebbb3eeca7a9e027;hb=d2ad2a1a19ce018d741466a108caf2f87bf147fc;hp=c24d2ed1b0d3e0cddfe8786daa81b6a0bb63c56f;hpb=0fee6eb672cef04454e02856412f9bcea3f4115b;p=lilypond.git

diff --git a/lily/input-scheme.cc b/lily/input-scheme.cc
index c24d2ed1b0..d3e2d65803 100644
--- a/lily/input-scheme.cc
+++ b/lily/input-scheme.cc
@@ -1,9 +1,20 @@
 /*
-  input-scheme.cc -- implement Input 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 "std-string.hh"
@@ -11,7 +22,7 @@
 
 /* We don't use IMPLEMENT_TYPE_P, since the smobification part is
    implemented separately from the class.  */
-LY_DEFINE (ly_input, "ly:input-location?", 1, 0, 0,
+LY_DEFINE (ly_input_location_p, "ly:input-location?", 1, 0, 0,
 	   (SCM x),
 	   "Is @var{x} an @code{input-location}?")
 {
@@ -19,12 +30,14 @@ LY_DEFINE (ly_input, "ly:input-location?", 1, 0, 0,
 }
 
 LY_DEFINE (ly_input_message, "ly:input-message", 2, 0, 1, (SCM sip, SCM msg, SCM rest),
-	   "Print @var{msg} as a GNU compliant error message, pointing to the "
-	   "location in @var{sip}. @var{msg} is interpreted similar to @code{format}'s argument\n")
+	   "Print @var{msg} as a GNU compliant error message, pointing"
+	   " to the location in @var{sip}.  @var{msg} is interpreted"
+	   " similar to @code{format}'s argument, using @var{rest}.")
 {
   Input *ip = unsmob_input (sip);
-  SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location");
-  SCM_ASSERT_TYPE (scm_is_string (msg), msg, SCM_ARG2, __FUNCTION__, "string");
+
+  LY_ASSERT_TYPE (unsmob_input, sip, 1);
+  LY_ASSERT_TYPE (scm_is_string, msg,2);
 
   msg = scm_simple_format (SCM_BOOL_F, msg, rest);
 
@@ -35,19 +48,18 @@ LY_DEFINE (ly_input_message, "ly:input-message", 2, 0, 1, (SCM sip, SCM msg, SCM
 }
 
 
-LY_DEFINE (ly_input_file_line_column,
+LY_DEFINE (ly_input_file_line_char_column,
 	   "ly:input-file-line-char-column",
 	   1, 0, 0, (SCM sip),
-	   "Return input location in @var{sip} as (file-name line char column).")
+	   "Return input location in @var{sip} as"
+	   " @code{(file-name line char column)}.")
 {
+  LY_ASSERT_TYPE (unsmob_input, sip, 1);
   Input *ip = unsmob_input (sip);
-  SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location");
 
-  int l = 0;
-  int ch = 0;
-  int col = 0;
-  ip->get_counts (&l, &ch, &col);
-  return scm_list_4 (scm_makfrom0str (ip->file_string ().c_str ()),
+  int l, ch, col, offset = 0;
+  ip->get_counts (&l, &ch, &col, &offset);
+  return scm_list_4 (ly_string2scm (ip->file_string ()),
 		     scm_from_int (l),
 		     scm_from_int (ch),
 		     scm_from_int (col));
@@ -56,12 +68,14 @@ LY_DEFINE (ly_input_file_line_column,
 LY_DEFINE (ly_input_both_locations,
 	   "ly:input-both-locations",
 	   1, 0, 0, (SCM sip),
-	   "Return input location in @var{sip} as "
-	   "(file-name first-line first-column last-line last-column).")
+	   "Return input location in @var{sip} as"
+	   " @code{(file-name first-line first-column last-line last-column)}.")
 {
+  
+  LY_ASSERT_TYPE (unsmob_input, sip, 1);
   Input *ip = unsmob_input (sip);
-  SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location");
-  return scm_list_5 (scm_makfrom0str (ip->file_string ().c_str ()),
+  
+  return scm_list_5 (ly_string2scm (ip->file_string ()),
 		     scm_from_int (ip->line_number ()),
 		     scm_from_int (ip->column_number ()),
 		     scm_from_int (ip->end_line_number ()),