X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput.cc;h=cbb609941fb6924d0a0b9cd33e475da78f5b79d9;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=77c5c14b2c06fb8f42510fbbc65a52b829fc2396;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git diff --git a/lily/input.cc b/lily/input.cc index 77c5c14b2c..cbb609941f 100644 --- a/lily/input.cc +++ b/lily/input.cc @@ -1,29 +1,45 @@ /* - input.cc -- implement Input + This file is part of LilyPond, the GNU music typesetter. - source file of the LilyPond music typesetter + Copyright (C) 1997--2011 Han-Wen Nienhuys - (c) 1997--2004 Han-Wen Nienhuys -*/ + 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. -#include + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ -#include "flower-proto.hh" #include "input.hh" -#include "string.hh" -#include "source.hh" + +#include +using namespace std; + +#include "international.hh" +#include "program-option.hh" #include "source-file.hh" +#include "sources.hh" +#include "warn.hh" -Input::Input (Source_file*s, char const *cl) +Input::Input (Input const &i) { - source_file_=s; - defined_str0_=cl; + source_file_ = i.source_file_; + start_ = i.start_; + end_ = i.end_; } Input::Input () { source_file_ = 0; - defined_str0_ = 0; + start_ = 0; + end_ = 0; } Input @@ -38,110 +54,161 @@ Input::set_spot (Input const &i) *this = i; } +void +Input::step_forward () +{ + if (end_ == start_) + end_++; + start_++; +} + +void +Input::set_location (Input const &i_start, Input const &i_end) +{ + source_file_ = i_start.source_file_; + start_ = i_start.start_; + end_ = i_end.end_; +} + /* Produce GNU-compliant error message. Correcting lilypond source is such a breeze if you ('re edidor) know (s) the error column too - - Format: - [file:line:column:][warning:]message + Format: - */ + [file:line:column:][warning:]message +*/ void -Input::message (String message_string) const +Input::message (string s) const { - String str; - - /* - marked "Work in prgress" in GNU iostream - libg++ 2.7.2.8 - libstdc++ 2.8.1 - - why not just return always -1 (unknown), - iso breaking the interface? - - int col = cerr.rdbuf ()->column (); - - */ - - // well, we don't want to loose first warning... - int col = 1; - if (col > 0) - str += "\n"; - if (source_file_) - str += location_string () + String (": "); + s = location_string () + ": " + s + "\n" + + source_file_->quote_input (start_) + "\n"; + ::message (s); +} - str += message_string; - if (source_file_) - { - str += ":\n"; - str += source_file_->error_string (defined_str0_); - } - fprintf (stderr, "%s\n", str.to_str0 ()); - fflush (stderr); + +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"); + } } + void -Input::warning (String message_string) const +Input::warning (string s) const { - message (_ ("warning: ") + message_string); + if (get_program_option ("warning-as-error")) + ::error (s); + else + message (_f ("warning: %s", s)); } + void -Input::error (String s) const +Input::error (string s) const { - message (_ ("error: ")+ s); + message (_f ("error: %s", s)); + // UGH, fix naming or usage + // exit (1); } void -Input::non_fatal_error (String s) const +Input::non_fatal_error (string s) const { - message (_ ("non fatal error: ") + s); + message (_f ("error: %s", s)); } -String + +string Input::location_string () const { if (source_file_) - return source_file_->file_line_column_string (defined_str0_); - else - return " (" + _ ("position unknown") + ")"; + return source_file_->file_line_column_string (start_); + return " (" + _ ("position unknown") + ")"; } -String +string Input::line_number_string () const { if (source_file_) - return to_string (source_file_->get_line (defined_str0_)); - else - return "?"; + return to_string (source_file_->get_line (start_)); + return "?"; } -String +string Input::file_string () const { if (source_file_) return source_file_->name_string (); - else - return ""; + return ""; } - int Input::line_number () const { if (source_file_) - return source_file_->get_line (defined_str0_); - else - return 0; - + return source_file_->get_line (start_); + return 0; } int Input::column_number () const +{ + int line, chr, col, offset = 0; + source_file_->get_counts (start_, &line, &chr, &col, &offset); + + return col; +} + +int +Input::end_line_number () const { if (source_file_) - return source_file_->get_column (defined_str0_); - else - return 0; + return source_file_->get_line (end_); + return 0; +} + +int +Input::end_column_number () const +{ + 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, int *offset) const +{ + source_file_->get_counts (start_, line, chr, col, offset); +} + +void +Input::set (Source_file *sf, char const *start, char const *end) +{ + source_file_ = sf; + start_ = start; + end_ = end; +} + +Source_file * +Input::get_source_file () const +{ + return source_file_; +} + +char const * +Input::start () const +{ + return start_; +} + +char const * +Input::end () const +{ + return end_; }