X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Flily-parser.cc;h=1f073fb07a3b7cff5a0bf60efe519fd16b3b46bf;hb=e21e3fd69d0204424e93983460926bc0b90f448c;hp=39e5c197a633ec08c07d4c3bc17a7ef34adc7362;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc index 39e5c197a6..1f073fb07a 100644 --- a/lily/lily-parser.cc +++ b/lily/lily-parser.cc @@ -82,7 +82,7 @@ Lily_parser::print_smob (SCM s, SCM port, scm_print_state*) /* Process one .ly file, or book. */ void -Lily_parser::parse_file (std::string init, std::string name, std::string out_name) +Lily_parser::parse_file (string init, string name, string out_name) { if (output_backend_global == "tex") try_load_text_metrics (out_name); @@ -102,7 +102,7 @@ Lily_parser::parse_file (std::string init, std::string name, std::string out_nam lexer_->new_input (init, sources_); File_name f (name); - std::string s = global_path.find (f.base_ + ".twy"); + string s = global_path.find (f.base_ + ".twy"); s = gulp_file_to_string (s, false, -1); scm_eval_string (scm_makfrom0str (s.c_str ())); @@ -121,9 +121,9 @@ Lily_parser::parse_file (std::string init, std::string name, std::string out_nam scm_set_current_module (mod); - if (!define_spots_.is_empty ()) + if (!define_spots_.empty ()) { - define_spots_.top ().warning (_ ("braces don't match")); + define_spots_.back ().warning (_ ("braces don't match")); error_level_ = 1; } @@ -132,7 +132,7 @@ Lily_parser::parse_file (std::string init, std::string name, std::string out_nam } void -Lily_parser::parse_string (std::string ly_code) +Lily_parser::parse_string (string ly_code) { // TODO: use $parser lexer_->set_identifier (ly_symbol2scm ("parser"), @@ -141,16 +141,15 @@ Lily_parser::parse_string (std::string ly_code) lexer_->main_input_name_ = ""; lexer_->is_main_input_ = true; - set_yydebug (0); lexer_->new_input (lexer_->main_input_name_, ly_code, sources_); SCM mod = lexer_->set_current_scope (); do_yyparse (); scm_set_current_module (mod); - if (!define_spots_.is_empty ()) + if (!define_spots_.empty ()) { - if (define_spots_.is_empty () + if (define_spots_.empty () && !error_level_) programming_error ("define_spots_ don't match, but error_level_ not set."); } @@ -165,14 +164,14 @@ Lily_parser::here_str0 () const } void -Lily_parser::parser_error (std::string s) +Lily_parser::parser_error (string s) { lexer_->here_input ().error (_ (s.c_str ())); error_level_ = 1; } void -Lily_parser::parser_error (Input const &i, std::string s) +Lily_parser::parser_error (Input const &i, string s) { i.error (s); error_level_ = 1;