/*
- input.cc -- implement Input
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the LilyPond music typesetter
+ Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 1997--2006 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "input.hh"
using namespace std;
#include "international.hh"
+#include "program-option.hh"
#include "source-file.hh"
-#include "source.hh"
+#include "sources.hh"
#include "warn.hh"
Input::Input (Input const &i)
[file:line:column:][warning:]message
*/
-void
-Input::message (string s) const
+string
+Input::message_string (const string &msg) const
{
if (source_file_)
- s = location_string () + ": " + s + "\n"
- + source_file_->quote_input (start_);
- ::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 (const 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
+Input::programming_error (const string &s) const
{
- 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 (const string &s) const
+{
+ ::non_fatal_error (message_string (s), message_location ());
+}
void
-Input::warning (string s) const
+Input::warning (const string &s) const
{
- message (_f ("warning: %s", s));
+ ::warning (message_string (s), message_location ());
}
void
-Input::error (string s) const
+Input::message (const 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 (const string &s) const
{
- message (_f ("error: %s", s));
+ ::debug_output (message_string (s), true, message_location ());
}
string
Input::line_number_string () const
{
if (source_file_)
- return to_string (source_file_->get_line (start_));
+ return ::to_string (source_file_->get_line (start_));
return "?";
}
int
Input::column_number () const
{
- int line, chr, col = 0;
- source_file_->get_counts (start_, &line, &chr, &col);
+ int line, chr, col, offset = 0;
+ source_file_->get_counts (start_, &line, &chr, &col, &offset);
return col;
}
int
Input::end_column_number () const
{
- int line, chr, col = 0;
- source_file_->get_counts (end_, &line, &chr, &col);
+ int line, chr, col, offset = 0;
+ source_file_->get_counts (end_, &line, &chr, &col, &offset);
return col;
}
void
-Input::get_counts (int *line, int *chr, int *col) const
+Input::get_counts (int *line, int *chr, int *col, int *offset) const
{
- source_file_->get_counts (start_, line, chr, col);
+ source_file_->get_counts (start_, line, chr, col, offset);
}
void