X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-scheme.cc;h=42d35816c31b1f9dc81fdc9ce534b039dd7d96c0;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=d3e2d65803e03ccc68b24342ebbb3eeca7a9e027;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/input-scheme.cc b/lily/input-scheme.cc
index d3e2d65803..42d35816c3 100644
--- a/lily/input-scheme.cc
+++ b/lily/input-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 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
@@ -20,24 +20,33 @@
 #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_location_p, "ly:input-location?", 1, 0, 0,
-	   (SCM x),
-	   "Is @var{x} an @code{input-location}?")
+LY_DEFINE (ly_input_warning, "ly:input-warning", 2, 0, 1, (SCM sip, SCM msg, SCM rest),
+           "Print @var{msg} as a GNU compliant warning message, pointing"
+           " to the location in @var{sip}.  @var{msg} is interpreted"
+           " similar to @code{format}'s argument, using @var{rest}.")
 {
-  return unsmob_input (x) ? SCM_BOOL_T : SCM_BOOL_F;
+  Input *ip = unsmob<Input> (sip);
+
+  LY_ASSERT_SMOB (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->warning (m);
+
+  return SCM_UNSPECIFIED;
 }
 
 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}.")
+           "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);
+  Input *ip = unsmob<Input> (sip);
 
-  LY_ASSERT_TYPE (unsmob_input, sip, 1);
-  LY_ASSERT_TYPE (scm_is_string, msg,2);
+  LY_ASSERT_SMOB (Input, sip, 1);
+  LY_ASSERT_TYPE (scm_is_string, msg, 2);
 
   msg = scm_simple_format (SCM_BOOL_F, msg, rest);
 
@@ -47,37 +56,36 @@ LY_DEFINE (ly_input_message, "ly:input-message", 2, 0, 1, (SCM sip, SCM msg, SCM
   return SCM_UNSPECIFIED;
 }
 
-
 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: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);
+  LY_ASSERT_SMOB (Input, sip, 1);
+  Input *ip = unsmob<Input> (sip);
 
   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));
+                     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"
-	   " @code{(file-name first-line first-column last-line last-column)}.")
+           "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);
-  
+
+  LY_ASSERT_SMOB (Input, sip, 1);
+  Input *ip = unsmob<Input> (sip);
+
   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 ()));
+                     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 ()));
 }