Proper loglevels: cmd-line option --loglevel=NONE/ERROR/WARN/BASIC/PROGRESS/DEBUG

[lilypond.git] / lily / input.cc

diff --git a/lily/input.cc b/lily/input.cc
index 9b4e88d69486077ceb6d078ea393d5cde8ab67e2..292e06a44950fc623eab74d985faacd6f9534a39 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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2011 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
@@ -79,48 +79,61 @@ Input::set_location (Input const &i_start, Input const &i_end)
   [file:line:column:][warning:]message
 */
 void
-Input::message (string s) const
+Input::print_message (int level, string s) const
 {
+  string location;
   if (source_file_)
-    s = location_string () + ": " + s + "\n"
-      + source_file_->quote_input (start_) + "\n";
-  ::message (s);
+    ::print_message (level, location_string (),
+                     s + "\n" + source_file_->quote_input (start_) + "\n");
+  else
+    ::print_message (level, "", s);
 }
 
+void
+Input::error (string s) const
+{
+  print_message (LOG_ERROR, _f ("error: %s", s));
+  // 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");
-  }
+    error (s);
+  else
+    {
+      print_message (LOG_ERROR, _f ("programming error: %s", s));
+      print_message (LOG_ERROR, _ ("continuing, cross fingers") + "\n");
+    }
 }
 
+void
+Input::non_fatal_error (string s) const
+{
+  print_message (LOG_ERROR, _f ("error: %s", s));
+}
 
 void
 Input::warning (string s) const
 {
   if (get_program_option ("warning-as-error"))
-    ::error (s);
+    error (s);
   else
-    message (_f ("warning: %s", s));
+    print_message (LOG_WARN, _f ("warning: %s", s));
 }
 
 void
-Input::error (string s) const
+Input::message (string s) const
 {
-  message (_f ("error: %s", s));
-  // UGH, fix naming or usage
-  // exit (1);
+  print_message (LOG_INFO, s);
 }
 
 void
-Input::non_fatal_error (string s) const
+Input::debug_output (string s) const
 {
-  message (_f ("error: %s", s));
+  print_message (LOG_DEBUG, s);
 }
 
 string