X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput.cc;h=b6aed9e2d1296b74182d9aca7f2921c6f9a04001;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=3d998b384e6d806761ce122ede378e69cf200c8e;hpb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;p=lilypond.git diff --git a/lily/input.cc b/lily/input.cc index 3d998b384e..b6aed9e2d1 100644 --- a/lily/input.cc +++ b/lily/input.cc @@ -1,9 +1,20 @@ /* - input.cc -- implement Input + This file is part of LilyPond, the GNU music typesetter. - source file of the LilyPond music typesetter + Copyright (C) 1997--2015 Han-Wen Nienhuys - (c) 1997--2007 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. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "input.hh" @@ -12,8 +23,10 @@ using namespace std; #include "international.hh" +#include "lily-imports.hh" +#include "program-option.hh" #include "source-file.hh" -#include "source.hh" +#include "sources.hh" #include "warn.hh" Input::Input (Input const &i) @@ -66,42 +79,55 @@ 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 (const 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::programming_error (string s) const +Input::error (const string &s) const { - message (_f ("programming error: %s", s.c_str ())); - message (_ ("continuing, cross fingers") + "\n"); + ::error (message_string (s), message_location ()); } +void +Input::programming_error (const string &s) const +{ + ::programming_error (message_string (s), message_location ()); +} void -Input::warning (string s) const +Input::non_fatal_error (const string &s) const { - message (_f ("warning: %s", s)); + ::non_fatal_error (message_string (s), message_location ()); } void -Input::error (string s) const +Input::warning (const string &s) const { - message (_f ("error: %s", s)); - // UGH, fix naming or usage - // exit (1); + ::warning (message_string (s), message_location ()); } void -Input::non_fatal_error (string s) const +Input::message (const string &s) const { - message (_f ("error: %s", s)); + ::message (message_string (s), true, message_location ()); +} + +void +Input::debug_output (const string &s) const +{ + ::debug_output (message_string (s), true, message_location ()); } string @@ -116,7 +142,7 @@ 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 "?"; } @@ -139,8 +165,8 @@ Input::line_number () const 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; } @@ -156,16 +182,16 @@ Input::end_line_number () const 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 @@ -193,3 +219,104 @@ Input::end () const { return end_; } + +static SCM +with_location_hook_0 (void *it) +{ + SCM *args = static_cast (it); + return scm_call_0 (args[0]); +} + +SCM +with_location (SCM loc, SCM proc) +{ + return scm_c_with_fluid (Lily::f_location, + unsmob (loc) ? loc : SCM_BOOL_F, + with_location_hook_0, + static_cast (&proc)); +} + +static SCM +with_location_hook_1 (void *it) +{ + SCM *args = static_cast (it); + return scm_call_1 (args[0], args[1]); +} + +SCM +with_location (SCM loc, SCM proc, SCM arg1) +{ + SCM args[] = { proc, arg1 }; + return scm_c_with_fluid (Lily::f_location, + unsmob (loc) ? loc : SCM_BOOL_F, + with_location_hook_1, + static_cast (&args)); +} + +static SCM +with_location_hook_2 (void *it) +{ + SCM *args = static_cast (it); + return scm_call_2 (args[0], args[1], args[2]); +} + +SCM +with_location (SCM loc, SCM proc, SCM arg1, SCM arg2) +{ + SCM args[] = { proc, arg1, arg2 }; + return scm_c_with_fluid (Lily::f_location, + unsmob (loc) ? loc : SCM_BOOL_F, + with_location_hook_2, + static_cast (&args)); +} + +static SCM +with_location_hook_3 (void *it) +{ + SCM *args = static_cast (it); + return scm_call_3 (args[0], args[1], args[2], args[3]); +} + +SCM +with_location (SCM loc, SCM proc, SCM arg1, SCM arg2, SCM arg3) +{ + SCM args[] = { proc, arg1, arg2, arg3 }; + return scm_c_with_fluid (Lily::f_location, + unsmob (loc) ? loc : SCM_BOOL_F, + with_location_hook_3, + static_cast (&args)); +} + +static SCM +with_location_hook_4 (void *it) +{ + SCM *args = static_cast (it); + return scm_call_4 (args[0], args[1], args[2], args[3], args[4]); +} + +SCM +with_location (SCM loc, SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM arg4) +{ + SCM args[] = { proc, arg1, arg2, arg3, arg4 }; + return scm_c_with_fluid (Lily::f_location, + unsmob (loc) ? loc : SCM_BOOL_F, + with_location_hook_4, + static_cast (&args)); +} + +static SCM +with_location_hook_n (void *it) +{ + SCM *args = static_cast (it); + return scm_apply_0 (args[0], args[1]); +} + +SCM +with_location (SCM loc, SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM arg4, SCM arg5) +{ + SCM args[] = { proc, scm_list_5 (arg1, arg2, arg3, arg4, arg5) }; + return scm_c_with_fluid (Lily::f_location, + unsmob (loc) ? loc : SCM_BOOL_F, + with_location_hook_n, + static_cast (&args)); +}