X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-lexer.cc;h=1160fe69f6e18b0af582a74789c95eb412b57dc5;hb=941dff9d2a67080e0dd8474f1e70f0c72ace6424;hp=97d515aaaa278237c88de3722973588b21bf1984;hpb=e42585017a01fd02f6353b994cf0c87b03a7bb2e;p=lilypond.git diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc index 97d515aaaa..1160fe69f6 100644 --- a/lily/lily-lexer.cc +++ b/lily/lily-lexer.cc @@ -1,9 +1,20 @@ /* - lily-lexer.cc -- implement Lily_lexer + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2011 Han-Wen Nienhuys - (c) 1997--2006 Han-Wen Nienhuys + 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-lexer.hh" @@ -12,6 +23,7 @@ #include using namespace std; +#include "context.hh" // for nested_property_alist #include "international.hh" #include "interval.hh" #include "keyword.hh" @@ -31,6 +43,7 @@ static Keyword_ent the_key_tab[] {"alias", ALIAS}, {"alternative", ALTERNATIVE}, {"book", BOOK}, + {"bookpart", BOOKPART}, {"change", CHANGE}, {"chordmode", CHORDMODE}, {"chords", CHORDS}, @@ -53,11 +66,11 @@ static Keyword_ent the_key_tab[] {"lyricsto", LYRICSTO}, {"mark", MARK}, {"markup", MARKUP}, + {"markuplines", MARKUPLINES}, {"midi", MIDI}, {"name", NAME}, {"new", NEWCONTEXT}, {"notemode", NOTEMODE}, - {"objectid", OBJECTID}, {"once", ONCE}, {"override", OVERRIDE}, {"paper", PAPER}, @@ -93,9 +106,10 @@ Lily_lexer::Lily_lexer (Sources *sources, Lily_parser *parser) error_level_ = 0; is_main_input_ = false; start_module_ = SCM_EOL; + chord_repetition_ = Chord_repetition (); smobify_self (); - add_scope (ly_make_anonymous_module (false)); + add_scope (ly_make_module (false)); push_note_state (scm_c_make_hash_table (0)); chordmodifier_tab_ = scm_make_vector (scm_from_int (1), SCM_EOL); } @@ -103,12 +117,13 @@ Lily_lexer::Lily_lexer (Sources *sources, Lily_parser *parser) Lily_lexer::Lily_lexer (Lily_lexer const &src, Lily_parser *parser) : Includable_lexer () { - parser_ = parser; + parser_ = parser; keytable_ = (src.keytable_) ? new Keyword_table (*src.keytable_) : 0; chordmodifier_tab_ = src.chordmodifier_tab_; pitchname_tab_stack_ = src.pitchname_tab_stack_; sources_ = src.sources_; start_module_ = SCM_EOL; + chord_repetition_ = src.chord_repetition_; error_level_ = src.error_level_; is_main_input_ = src.is_main_input_; @@ -121,7 +136,7 @@ Lily_lexer::Lily_lexer (Lily_lexer const &src, Lily_parser *parser) SCM *tail = &scopes; for (SCM s = src.scopes_; scm_is_pair (s); s = scm_cdr (s)) { - SCM newmod = ly_make_anonymous_module (false); + SCM newmod = ly_make_module (false); ly_module_copy (newmod, scm_car (s)); *tail = scm_cons (newmod, SCM_EOL); tail = SCM_CDRLOC (*tail); @@ -188,7 +203,7 @@ Lily_lexer::keyword_list () const { if (!keytable_) return SCM_EOL; - + SCM l = SCM_EOL; SCM *tail = &l; for (vsize i = 0; i < keytable_->table_.size (); i++) @@ -197,7 +212,7 @@ Lily_lexer::keyword_list () const scm_from_int (keytable_->table_[i].tokcode_), SCM_EOL); - tail = SCM_CDRLOC(*tail); + tail = SCM_CDRLOC (*tail); } return l; @@ -228,7 +243,6 @@ Lily_lexer::start_main_input () yy_flex_debug = get_program_option ("debug-lexer"); parser_->set_yydebug (get_program_option ("debug-parser")); - new_input (main_input_name_, sources_); scm_module_define (scm_car (scopes_), @@ -254,12 +268,20 @@ Lily_lexer::new_input (string str, Sources *ss) Includable_lexer::new_input (str, ss); } +// PATH is either a single symbol (or string) or a list of symbols +// giving the path to a nested property. A symbol is treated the same +// as a list of length 1. void -Lily_lexer::set_identifier (SCM name, SCM s) +Lily_lexer::set_identifier (SCM path, SCM val) { - SCM sym = name; - if (scm_is_string (name)) - sym = scm_string_to_symbol (name); + SCM sym = path; + if (scm_is_string (path)) + sym = scm_string_to_symbol (path); + else if (scm_is_pair (path)) + { + sym = scm_car (path); + path = scm_cdr (path); + } if (scm_is_symbol (sym)) { @@ -271,7 +293,13 @@ Lily_lexer::set_identifier (SCM name, SCM s) SCM mod = scm_car (scopes_); - scm_module_define (mod, sym, s); + if (scm_is_pair (path)) + { + SCM prev = ly_module_lookup (mod, sym); + if (prev != SCM_BOOL_F) + val = nested_property_alist (scm_variable_ref (prev), path, val); + } + scm_module_define (mod, sym, val); } else programming_error ("identifier is not a symbol"); @@ -285,7 +313,7 @@ Lily_lexer::LexerError (char const *s) else { error_level_ |= 1; - Input spot (*lexloc); + Input spot (*lexloc_); spot.error (s); } } @@ -310,7 +338,7 @@ Lily_lexer::escaped_char (char c) const Input Lily_lexer::here_input () const { - return Input (*lexloc); + return Input (*lexloc_); } void @@ -327,8 +355,8 @@ void Lily_lexer::add_lexed_char (int count) { char const *start = here_str0 (); - lexloc->set (get_source_file (), - start, start + count); + lexloc_->set (get_source_file (), + start, start + count); char_count_stack_.back () += count; } @@ -341,8 +369,8 @@ IMPLEMENT_DEFAULT_EQUAL_P (Lily_lexer); SCM Lily_lexer::mark_smob (SCM s) { - ASSERT_LIVE_IS_ALLOWED(); - + ASSERT_LIVE_IS_ALLOWED (); + Lily_lexer *lexer = (Lily_lexer *) SCM_CELL_WORD_1 (s); scm_gc_mark (lexer->chordmodifier_tab_); @@ -363,3 +391,9 @@ Lily_lexer::print_smob (SCM s, SCM port, scm_print_state*) scm_puts (" >", port); return 1; } + +bool +Lily_lexer::is_clean () const +{ + return include_stack_.empty (); +}