Run `make grand-replace'.

[lilypond.git] / lily / input.cc

diff --git a/lily/input.cc b/lily/input.cc
index a9ad1c970e56b239c4c3d41339badd5c16602271..b6378af67f1d1761bfea7a44a29cb1a15da24b5c 100644 (file)
--- a/lily/input.cc
+++ b/lily/input.cc
@@ -3,15 +3,17 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "input.hh"
 
 #include <cstdio>
+using namespace std;
 
-#include "source.hh"
+#include "international.hh"
 #include "source-file.hh"
+#include "sources.hh"
 #include "warn.hh"
 
 Input::Input (Input const &i)
@@ -65,22 +67,31 @@ Input::set_location (Input const &i_start, Input const &i_end)
   [file:line:column:][warning:]message
 */
 void
-Input::message (String s) const
+Input::message (string s) const
 {
   if (source_file_)
     s = location_string () + ": " + s + "\n"
-      + source_file_->quote_input (start_);
+      + source_file_->quote_input (start_) + "\n";
   ::message (s);
 }
 
+
 void
-Input::warning (String s) const
+Input::programming_error (string s) const
+{
+  message (_f ("programming error: %s", s.c_str ()));
+  message (_ ("continuing, cross fingers") + "\n");
+}
+
+
+void
+Input::warning (string s) const
 {
   message (_f ("warning: %s", s));
 }
 
 void
-Input::error (String s) const
+Input::error (string s) const
 {
   message (_f ("error: %s", s));
   // UGH, fix naming or usage
@@ -88,12 +99,12 @@ Input::error (String s) const
 }
 
 void
-Input::non_fatal_error (String s) const
+Input::non_fatal_error (string s) const
 {
   message (_f ("error: %s", s));
 }
 
-String
+string
 Input::location_string () const
 {
   if (source_file_)
@@ -101,7 +112,7 @@ Input::location_string () const
   return " (" + _ ("position unknown") + ")";
 }
 
-String
+string
 Input::line_number_string () const
 {
   if (source_file_)
@@ -109,7 +120,7 @@ Input::line_number_string () const
   return "?";
 }
 
-String
+string
 Input::file_string () const
 {
   if (source_file_)
@@ -152,7 +163,7 @@ Input::end_column_number () const
 }
 
 void
-Input::get_counts (int *line, int *chr, int*col) const
+Input::get_counts (int *line, int *chr, int *col) const
 {
   source_file_->get_counts (start_, line, chr, col);
 }
@@ -162,23 +173,22 @@ Input::set (Source_file *sf, char const *start, char const *end)
 {
   source_file_ = sf;
   start_ = start;
-  end_ = end;  
+  end_ = end;
 }
 
-Source_file* 
+Source_file *
 Input::get_source_file () const
 {
   return source_file_;
 }
 
-
-char const * 
+char const *
 Input::start () const
 {
   return start_;
 }
 
-char const * 
+char const *
 Input::end () const
 {
   return end_;