X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser.cc;h=12646bb3b450e3c6a65313b52a520fc36b4dfe41;hb=9446d6a4f83a94754f584d2d973195fd800d1af6;hp=ae3943dbdb3e89061ba30ee53600b43215ad9123;hpb=af770f3440264c18ce01525dce1aa76b86ace0d5;p=lilypond.git diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc index ae3943dbdb..12646bb3b4 100644 --- a/lily/lily-parser.cc +++ b/lily/lily-parser.cc @@ -1,10 +1,21 @@ /* - lily-parser.cc -- implement Lily_parser + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1997--2006 Han-Wen Nienhuys + Copyright (C) 1997--2011 Han-Wen Nienhuys Jan Nieuwenhuizen + + 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 "lily-parser.hh" @@ -15,15 +26,15 @@ #include "international.hh" #include "lily-lexer.hh" #include "lily-version.hh" -#include "lilypond-key.hh" +#include "ly-module.hh" #include "main.hh" #include "output-def.hh" #include "paper-book.hh" #include "parser.hh" #include "score.hh" -#include "source.hh" -#include "text-metrics.hh" +#include "sources.hh" #include "warn.hh" +#include "program-option.hh" #include "ly-smobs.icc" @@ -53,7 +64,7 @@ Lily_parser::Lily_parser (Lily_parser const &src) { lexer_ = new Lily_lexer (*src.lexer_, this); } - + lexer_->unprotect (); } @@ -61,7 +72,6 @@ Lily_parser::~Lily_parser () { } - SCM Lily_parser::mark_smob (SCM s) { @@ -70,7 +80,7 @@ Lily_parser::mark_smob (SCM s) } 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 ()); + // TODO: use $parser + lexer_->set_identifier (ly_symbol2scm ("parser"), self_scm ()); output_basename_ = out_name; lexer_->main_input_name_ = name; @@ -105,7 +111,7 @@ Lily_parser::parse_file (string init, string name, string out_name) File_name f (name); string s = global_path.find (f.base_ + ".twy"); s = gulp_file_to_string (s, false, -1); - scm_eval_string (scm_makfrom0str (s.c_str ())); + 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). */ @@ -117,7 +123,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); @@ -135,27 +141,62 @@ 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_->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_.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_; +} + +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_) + 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 @@ -164,10 +205,10 @@ Lily_parser::clear () if (lexer_) { while (lexer_->has_scope ()) - lexer_->remove_scope (); + lexer_->remove_scope (); } - lexer_ = 0; + lexer_ = 0; } char const * @@ -190,15 +231,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 * @@ -208,8 +246,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); - layout->parser_ = parser; - + return layout; } @@ -220,34 +257,76 @@ 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; } +/* Return a copy of the top of $papers stack, or $defaultpaper if the + * stack is empty */ Output_def * get_paper (Lily_parser *parser) { - SCM id = parser->lexer_->lookup_identifier ("$defaultpaper"); - Output_def *layout = unsmob_output_def (id); + SCM papers = parser->lexer_->lookup_identifier ("$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); layout = layout ? dynamic_cast (layout->clone ()) : new Output_def; layout->set_variable (ly_symbol2scm ("is-paper"), SCM_BOOL_T); - layout->parser_ = parser; return layout; } +/* Initialize (reset) the $papers stack */ +void +init_papers (Lily_parser *parser) +{ + parser->lexer_->set_identifier (ly_symbol2scm ("$papers"), SCM_EOL); +} + +/* Push a paper on top of $papers stack */ +void +push_paper (Lily_parser *parser, Output_def *paper) +{ + parser->lexer_->set_identifier (ly_symbol2scm ("$papers"), + scm_cons (paper->self_scm (), + parser->lexer_->lookup_identifier ("$papers"))); +} + +/* Pop a paper from $papers stack */ +void +pop_paper (Lily_parser *parser) +{ + if (scm_is_pair (parser->lexer_->lookup_identifier ("$papers"))) + parser->lexer_->set_identifier (ly_symbol2scm ("$papers"), + scm_cdr (parser->lexer_->lookup_identifier ("$papers"))); +} + +/* Change the paper on top of $papers stack */ +void +set_paper (Lily_parser *parser, Output_def *paper) +{ + scm_set_car_x (parser->lexer_->lookup_identifier ("$papers"), paper->self_scm ()); +} + SCM get_header (Lily_parser *parser) { SCM id = parser->lexer_->lookup_identifier ("$defaultheader"); if (!ly_is_module (id)) - id = ly_make_anonymous_module (be_safe_global); + id = parser->make_scope (); else { - SCM nid = ly_make_anonymous_module (false); - ly_module_copy(nid,id); + SCM nid = parser->make_scope (); + ly_module_copy (nid, id); id = nid; } - + return id; } + +SCM +Lily_parser::make_scope () const +{ + SCM module = ly_make_module (be_safe_global); + return module; +}