source file of the LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2007 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 "source.hh"
#include "warn.hh"
Input::Input (Input const &i)
[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::programming_error (string s) const
+{
+ message (_f ("programming error: %s", s.c_str ()));
+ message (_ ("continuing, cross fingers") + "\n");
+}
+
+
void
-Input::warning (String s) const
+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
}
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_)
return " (" + _ ("position unknown") + ")";
}
-String
+string
Input::line_number_string () const
{
if (source_file_)
return "?";
}
-String
+string
Input::file_string () const
{
if (source_file_)