Imported Upstream version 2.16.0

[lilypond.git] / lily / input.cc

diff --git a/lily/input.cc b/lily/input.cc
index cbb609941fb6924d0a0b9cd33e475da78f5b79d9..bc1e79b373554cc5dd2b720ddf444ddd4610a701 100644 (file)
--- a/lily/input.cc
+++ b/lily/input.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 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
@@ -78,49 +78,56 @@ Input::set_location (Input const &i_start, Input const &i_end)
 
   [file:line:column:][warning:]message
 */
-void
-Input::message (string s) const
+string
+Input::message_string (string msg) const
 {
   if (source_file_)
-    s = location_string () + ": " + s + "\n"
-      + source_file_->quote_input (start_) + "\n";
-  ::message (s);
+    return msg + "\n" + source_file_->quote_input (start_);
+  else
+    return msg;
 }
 
+string
+Input::message_location () const
+{
+  return (source_file_) ? location_string () : "";
+}
+void
+Input::error (string s) const
+{
+  ::non_fatal_error (message_string (s), message_location ());
+  // UGH, fix naming or usage (use non_fatal_error in most places, instead)
+  // exit (1);
+}
 
 void
 Input::programming_error (string s) const
 {
-  if (get_program_option ("warning-as-error"))
-    ::error (s);
-  else {
-    message (_f ("programming error: %s", s.c_str ()));
-    message (_ ("continuing, cross fingers") + "\n");
-  }
+  ::programming_error (message_string (s), message_location ());
 }
 
+void
+Input::non_fatal_error (string s) const
+{
+  ::non_fatal_error (message_string (s), message_location ());
+}
 
 void
 Input::warning (string s) const
 {
-  if (get_program_option ("warning-as-error"))
-    ::error (s);
-  else
-    message (_f ("warning: %s", s));
+  ::warning (message_string (s), message_location ());
 }
 
 void
-Input::error (string s) const
+Input::message (string s) const
 {
-  message (_f ("error: %s", s));
-  // UGH, fix naming or usage
-  // exit (1);
+  ::message (message_string (s), true, message_location ());
 }
 
 void
-Input::non_fatal_error (string s) const
+Input::debug_output (string s) const
 {
-  message (_f ("error: %s", s));
+  ::debug_output (message_string (s), true, message_location ());
 }
 
 string