X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-scheme.cc;h=ad2cdbeaed3d1aaadaf918e5e395eb2dc8b8965a;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=58c4eb338f29b2f68f0085cc7a8ed51f29aa4dfc;hpb=634ad74db688a5305f001917453c5cd15305c539;p=lilypond.git

diff --git a/lily/input-scheme.cc b/lily/input-scheme.cc
index 58c4eb338f..ad2cdbeaed 100644
--- a/lily/input-scheme.cc
+++ b/lily/input-scheme.cc
@@ -3,54 +3,72 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "string.hh"
-#include "input-smob.hh"
+#include "std-string.hh"
+#include "input.hh"
 
 /* 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),
-	   "Return #t if @var{x} is an input location.")
+	   "Is @var{x} an @code{input-location}?")
 {
   return unsmob_input (x) ? SCM_BOOL_T : SCM_BOOL_F;
 }
 
-LY_DEFINE (ly_input_message, "ly:input-message", 2, 0, 0, (SCM sip, SCM msg),
-	  "Print @var{msg} as a GNU compliant error message, pointing to the"
-	   "location in @var{sip}.\n")
+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, 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");
 
-  String m = ly_scm2string (msg);
+  LY_ASSERT_TYPE (unsmob_input, sip, 1);
+  LY_ASSERT_TYPE (scm_is_string, msg,2);
+
+  msg = scm_simple_format (SCM_BOOL_F, msg, rest);
+
+  string m = ly_scm2string (msg);
   ip->message (m);
 
   return SCM_UNSPECIFIED;
 }
 
-LY_DEFINE (ly_input_file_line_column, "ly:input-file-line-column", 1, 0, 0, (SCM sip),
-	  "Return input location in @var{sip} as (file-name 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"
+	   " @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");
-  return scm_list_3 (scm_makfrom0str (ip->file_string ().to_str0 ()),
-		     scm_int2num (ip->line_number ()),
-		     scm_int2num (ip->column_number ()));
+
+  int l = 0;
+  int ch = 0;
+  int col = 0;
+  ip->get_counts (&l, &ch, &col);
+  return scm_list_4 (ly_string2scm (ip->file_string ()),
+		     scm_from_int (l),
+		     scm_from_int (ch),
+		     scm_from_int (col));
 }
 
-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).")
+LY_DEFINE (ly_input_both_locations,
+	   "ly:input-both-locations",
+	   1, 0, 0, (SCM sip),
+	   "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 ().to_str0 ()),
-		     scm_int2num (ip->line_number ()),
-		     scm_int2num (ip->column_number ()),
-		     scm_int2num (ip->end_line_number ()),
-		     scm_int2num (ip->end_column_number ()));
+  
+  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 ()),
+		     scm_from_int (ip->end_column_number ()));
 }