X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser.cc;h=cfa8d3f9400d51466db40aa57e005c5d2d5cb03c;hb=d194ee9f637a200ac26b59e818acf5ca37985dc9;hp=2c39ea6da347edb371a7553a071cb85d61025859;hpb=84c9074729c7a0b36d27be81794ca25a8829f9f3;p=lilypond.git diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc index 2c39ea6da3..cfa8d3f940 100644 --- a/lily/lily-parser.cc +++ b/lily/lily-parser.cc @@ -3,26 +3,30 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include "lily-parser.hh" -#include "text-metrics.hh" + #include "book.hh" -#include "lilypond-key.hh" +#include "file-name.hh" +#include "file-path.hh" +#include "international.hh" +#include "lily-lexer.hh" #include "lily-version.hh" +#include "lilypond-key.hh" #include "main.hh" -#include "lily-lexer.hh" #include "output-def.hh" #include "paper-book.hh" #include "parser.hh" #include "score.hh" -#include "file-name.hh" -#include "file-path.hh" #include "source.hh" +#include "text-metrics.hh" #include "warn.hh" +#include "ly-smobs.icc" + Lily_parser::Lily_parser (Sources *sources) { lexer_ = 0; @@ -32,8 +36,8 @@ Lily_parser::Lily_parser (Sources *sources) smobify_self (); - lexer_ = new Lily_lexer (sources_); - scm_gc_unprotect_object (lexer_->self_scm ()); + lexer_ = new Lily_lexer (sources_, this); + lexer_->unprotect (); } Lily_parser::Lily_parser (Lily_parser const &src) @@ -42,23 +46,21 @@ Lily_parser::Lily_parser (Lily_parser const &src) sources_ = src.sources_; default_duration_ = src.default_duration_; error_level_ = src.error_level_; + output_basename_ = src.output_basename_; smobify_self (); if (src.lexer_) - lexer_ = new Lily_lexer (*src.lexer_); - - scm_gc_unprotect_object (lexer_->self_scm ()); + { + lexer_ = new Lily_lexer (*src.lexer_, this); + } + + lexer_->unprotect (); } Lily_parser::~Lily_parser () { } -#include "ly-smobs.icc" - -IMPLEMENT_SMOBS (Lily_parser); -IMPLEMENT_TYPE_P (Lily_parser, "ly:lily-parser?"); -IMPLEMENT_DEFAULT_EQUAL_P (Lily_parser); SCM Lily_parser::mark_smob (SCM s) @@ -82,12 +84,10 @@ Lily_parser::print_smob (SCM s, SCM port, scm_print_state*) /* Process one .ly file, or book. */ void -Lily_parser::parse_file (String init, String name, 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); - } + try_load_text_metrics (out_name); // TODO: use $parser lexer_->set_identifier (ly_symbol2scm ("parser"), @@ -97,16 +97,15 @@ Lily_parser::parse_file (String init, String name, String out_name) lexer_->main_input_name_ = name; message (_ ("Parsing...")); - // progress_indication ("\n"); set_yydebug (0); lexer_->new_input (init, sources_); File_name f (name); - String s = global_path.find (f.base_ + ".twy"); - s = gulp_file_to_string (s, false); - scm_eval_string (scm_makfrom0str (s.to_str0 ())); + string s = global_path.find (f.base_ + ".twy"); + s = gulp_file_to_string (s, false, -1); + scm_eval_string (ly_string2scm (s)); /* Read .ly IN_FILE, lex, parse, write \score blocks from IN_FILE to OUT_FILE (unless IN_FILE redefines output file name). */ @@ -116,44 +115,41 @@ Lily_parser::parse_file (String init, String name, String out_name) /* Don't mix cyclic pointers with weak tables. - */ + */ lexer_->set_identifier (ly_symbol2scm ("parser"), SCM_EOL); ly_reexport_module (scm_current_module ()); - - scm_set_current_module (mod); - - if (!define_spots_.is_empty ()) + scm_set_current_module (mod); + + if (!define_spots_.empty ()) { - define_spots_.top ().warning (_ ("braces don't match")); + define_spots_.back ().warning (_ ("braces do not match")); error_level_ = 1; } error_level_ = error_level_ | lexer_->error_level_; - lexer_ = 0; + clear (); } void -Lily_parser::parse_string (String ly_code) +Lily_parser::parse_string (string ly_code) { - // TODO: use $parser + // TODO: use $parser lexer_->set_identifier (ly_symbol2scm ("parser"), self_scm ()); - - lexer_->main_input_name_ = ""; - lexer_->is_main_input_ = true; - set_yydebug (0); + lexer_->main_input_name_ = ""; + lexer_->is_main_input_ = true; 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."); } @@ -161,6 +157,18 @@ Lily_parser::parse_string (String ly_code) error_level_ = error_level_ | lexer_->error_level_; } +void +Lily_parser::clear () +{ + if (lexer_) + { + while (lexer_->has_scope ()) + lexer_->remove_scope (); + } + + lexer_ = 0; +} + char const * Lily_parser::here_str0 () const { @@ -168,20 +176,29 @@ Lily_parser::here_str0 () const } void -Lily_parser::parser_error (String s) +Lily_parser::parser_error (string s) { - lexer_->here_input ().error (_ (s.to_str0 ())); + lexer_->here_input ().error (_ (s.c_str ())); error_level_ = 1; } void -Lily_parser::parser_error (Input const &i, String s) +Lily_parser::parser_error (Input const &i, string s) { i.error (s); error_level_ = 1; } -/****************************************************************/ + + +IMPLEMENT_SMOBS (Lily_parser); +IMPLEMENT_TYPE_P (Lily_parser, "ly:lily-parser?"); +IMPLEMENT_DEFAULT_EQUAL_P (Lily_parser); + + +/**************************************************************** + OUTPUT-DEF + ****************************************************************/ Output_def * get_layout (Lily_parser *parser) @@ -190,7 +207,8 @@ get_layout (Lily_parser *parser) Output_def *layout = unsmob_output_def (id); layout = layout ? layout->clone () : new Output_def; layout->set_variable (ly_symbol2scm ("is-layout"), SCM_BOOL_T); - + layout->parser_ = parser; + return layout; } @@ -201,6 +219,7 @@ get_midi (Lily_parser *parser) Output_def *layout = unsmob_output_def (id); layout = layout ? layout->clone () : new Output_def; layout->set_variable (ly_symbol2scm ("is-midi"), SCM_BOOL_T); + layout->parser_ = parser; return layout; } @@ -212,6 +231,28 @@ get_paper (Lily_parser *parser) layout = layout ? dynamic_cast (layout->clone ()) : new Output_def; layout->set_variable (ly_symbol2scm ("is-paper"), SCM_BOOL_T); + layout->parser_ = parser; return layout; } +SCM +get_header (Lily_parser *parser) +{ + SCM id = parser->lexer_->lookup_identifier ("$defaultheader"); + if (!ly_is_module (id)) + id = parser->make_scope (); + else + { + SCM nid = parser->make_scope (); + ly_module_copy (nid, id); + id = nid; + } + + return id; +} + +SCM +Lily_parser::make_scope () const +{ + return ly_make_anonymous_module (be_safe_global); +}