X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-scheme.cc;h=42d35816c31b1f9dc81fdc9ce534b039dd7d96c0;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=1325c8e1514e2fa76852d7eb45fe181b314e04f2;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git

diff --git a/lily/input-scheme.cc b/lily/input-scheme.cc
index 1325c8e151..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--2011 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,13 +20,22 @@
 #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),
@@ -34,9 +43,9 @@ LY_DEFINE (ly_input_message, "ly:input-message", 2, 0, 1, (SCM sip, SCM msg, SCM
            " 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_SMOB (Input, sip, 1);
   LY_ASSERT_TYPE (scm_is_string, msg, 2);
 
   msg = scm_simple_format (SCM_BOOL_F, msg, rest);
@@ -53,8 +62,8 @@ LY_DEFINE (ly_input_file_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);
+  LY_ASSERT_SMOB (Input, sip, 1);
+  Input *ip = unsmob<Input> (sip);
 
   int l, ch, col, offset = 0;
   ip->get_counts (&l, &ch, &col, &offset);
@@ -71,8 +80,8 @@ LY_DEFINE (ly_input_both_locations,
            " @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 ()),