X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser.cc;h=e0722fd9800fbc9167c27abaaece0151a6be709d;hb=f8159a57125bbf52e96cad584d6c3756a39d5fc9;hp=e71176c873e51b570d7136cb23e4f18dd1d366a9;hpb=023604318fe8e1ec89eb9c9e222e0dd21f103d18;p=lilypond.git diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc index e71176c873..e0722fd980 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--2010 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 (); } @@ -86,12 +97,8 @@ Lily_parser::print_smob (SCM s, SCM port, scm_print_state*) void Lily_parser::parse_file (string init, string name, string out_name) { - if (output_backend_global == "tex") - try_load_text_metrics (out_name); - - // TODO: use $parser - lexer_->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 +112,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). */ @@ -124,7 +131,7 @@ Lily_parser::parse_file (string init, string name, string out_name) if (!define_spots_.empty ()) { - define_spots_.back ().warning (_ ("braces don't match")); + define_spots_.back ().warning (_ ("braces do not match")); error_level_ = 1; } @@ -135,13 +142,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 ()); 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 (); @@ -158,6 +164,12 @@ Lily_parser::parse_string (string ly_code) error_level_ = error_level_ | lexer_->error_level_; } +void +Lily_parser::include_string (string ly_code) +{ + lexer_->add_string_include (ly_code); +} + void Lily_parser::clear () { @@ -167,7 +179,7 @@ Lily_parser::clear () lexer_->remove_scope (); } - lexer_ = 0; + lexer_ = 0; } char const * @@ -198,7 +210,7 @@ IMPLEMENT_DEFAULT_EQUAL_P (Lily_parser); /**************************************************************** - OUTPUT-DEF + OUTPUT-DEF ****************************************************************/ Output_def * @@ -208,8 +220,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 +231,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_null (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; +}