X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser.cc;h=d9af8cbb7e43126bc8a8a51c288907532935a1bc;hb=c618987255838a2af9813a69eb1f4f20a8df6315;hp=6d3e13072ad0c48bb753fd7f49ecf454b4250dff;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc index 6d3e13072a..d9af8cbb7e 100644 --- a/lily/lily-parser.cc +++ b/lily/lily-parser.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2010 Han-Wen Nienhuys + Copyright (C) 1997--2011 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -44,6 +44,7 @@ Lily_parser::Lily_parser (Sources *sources) sources_ = sources; default_duration_ = Duration (2, 0); error_level_ = 0; + local_environment_ = SCM_UNDEFINED; smobify_self (); @@ -51,20 +52,21 @@ Lily_parser::Lily_parser (Sources *sources) lexer_->unprotect (); } -Lily_parser::Lily_parser (Lily_parser const &src) +Lily_parser::Lily_parser (Lily_parser const &src, SCM env) { lexer_ = 0; sources_ = src.sources_; default_duration_ = src.default_duration_; error_level_ = src.error_level_; output_basename_ = src.output_basename_; + local_environment_ = env; smobify_self (); if (src.lexer_) { lexer_ = new Lily_lexer (*src.lexer_, this); } - + lexer_->unprotect (); } @@ -72,16 +74,16 @@ Lily_parser::~Lily_parser () { } - SCM Lily_parser::mark_smob (SCM s) { Lily_parser *parser = (Lily_parser *) SCM_CELL_WORD_1 (s); + scm_gc_mark (parser->local_environment_); return (parser->lexer_) ? parser->lexer_->self_scm () : SCM_EOL; } int -Lily_parser::print_smob (SCM s, SCM port, scm_print_state*) +Lily_parser::print_smob (SCM s, SCM port, scm_print_state *) { scm_puts ("#set_identifier (ly_symbol2scm ("parser"), self_scm ()); output_basename_ = out_name; @@ -124,7 +126,7 @@ 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); + SCM_EOL); ly_reexport_module (scm_current_module ()); scm_set_current_module (mod); @@ -142,12 +144,12 @@ Lily_parser::parse_file (string init, string name, string out_name) void Lily_parser::parse_string (string ly_code) { - // TODO: use $parser + // TODO: use $parser lexer_->set_identifier (ly_symbol2scm ("parser"), - self_scm ()); + self_scm ()); lexer_->main_input_name_ = ""; - lexer_->is_main_input_ = true; + lexer_->is_main_input_ = true; lexer_->new_input (lexer_->main_input_name_, ly_code, sources_); SCM mod = lexer_->set_current_scope (); @@ -157,23 +159,59 @@ Lily_parser::parse_string (string ly_code) if (!define_spots_.empty ()) { if (define_spots_.empty () - && !error_level_) - programming_error ("define_spots_ don't match, but error_level_ not set."); + && !error_level_) + programming_error ("define_spots_ don't match, but error_level_ not set."); } error_level_ = error_level_ | lexer_->error_level_; } +SCM +Lily_parser::parse_string_expression (string ly_code) +{ + // TODO: use $parser + lexer_->set_identifier (ly_symbol2scm ("parser"), + self_scm ()); + + 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 (); + lexer_->push_extra_token (EMBEDDED_LILY); + do_yyparse (); + SCM result = lexer_->lookup_identifier_symbol (ly_symbol2scm ("parseStringResult")); + // parseStringResult is set in the grammar rule for embedded_lilypond + + scm_set_current_module (mod); + + if (!define_spots_.empty ()) + { + if (define_spots_.empty () + && !error_level_) + programming_error ("define_spots_ don't match, but error_level_ not set."); + } + + error_level_ = error_level_ | lexer_->error_level_; + return result; +} + +void +Lily_parser::include_string (string ly_code) +{ + lexer_->add_string_include (ly_code); +} + void Lily_parser::clear () { if (lexer_) { while (lexer_->has_scope ()) - lexer_->remove_scope (); + lexer_->remove_scope (); } - lexer_ = 0; + lexer_ = 0; } char const * @@ -196,15 +234,12 @@ Lily_parser::parser_error (Input const &i, string 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 ****************************************************************/ Output_def * @@ -214,7 +249,7 @@ 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); - + return layout; } @@ -234,8 +269,8 @@ Output_def * get_paper (Lily_parser *parser) { SCM papers = parser->lexer_->lookup_identifier ("$papers"); - Output_def *layout = ((papers == SCM_UNDEFINED) || scm_is_null (papers)) ? - 0 : unsmob_output_def (scm_car (papers)); + Output_def *layout = ((papers == SCM_UNDEFINED) || scm_is_null (papers)) + ? 0 : unsmob_output_def (scm_car (papers)); SCM default_paper = parser->lexer_->lookup_identifier ("$defaultpaper"); layout = layout ? layout : unsmob_output_def (default_paper); @@ -264,7 +299,7 @@ push_paper (Lily_parser *parser, Output_def *paper) void pop_paper (Lily_parser *parser) { - if (! scm_is_null (parser->lexer_->lookup_identifier ("$papers"))) + if (scm_is_pair (parser->lexer_->lookup_identifier ("$papers"))) parser->lexer_->set_identifier (ly_symbol2scm ("$papers"), scm_cdr (parser->lexer_->lookup_identifier ("$papers"))); } @@ -288,13 +323,13 @@ get_header (Lily_parser *parser) ly_module_copy (nid, id); id = nid; } - + return id; } -SCM +SCM Lily_parser::make_scope () const { - SCM module = ly_make_anonymous_module (be_safe_global); - return module; + SCM module = ly_make_module (be_safe_global); + return module; }