/*
- 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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ 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 <http://www.gnu.org/licenses/>.
*/
#include "lily-lexer.hh"
#include <sstream>
using namespace std;
+#include "context.hh" // for nested_property_alist
#include "international.hh"
#include "interval.hh"
#include "keyword.hh"
{"alias", ALIAS},
{"alternative", ALTERNATIVE},
{"book", BOOK},
+ {"bookpart", BOOKPART},
{"change", CHANGE},
{"chordmode", CHORDMODE},
{"chords", CHORDS},
{"lyricsto", LYRICSTO},
{"mark", MARK},
{"markup", MARKUP},
+ {"markuplines", MARKUPLINES},
{"midi", MIDI},
{"name", NAME},
{"new", NEWCONTEXT},
error_level_ = 0;
is_main_input_ = false;
start_module_ = SCM_EOL;
+ chord_repetition_ = Chord_repetition ();
smobify_self ();
add_scope (ly_make_anonymous_module (false));
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_;
SCM *tail = &l;
for (vsize i = 0; i < keytable_->table_.size (); i++)
{
- *tail = scm_acons (scm_makfrom0str (keytable_->table_[i].name_),
+ *tail = scm_acons (scm_from_locale_string (keytable_->table_[i].name_),
scm_from_int (keytable_->table_[i].tokcode_),
SCM_EOL);
- tail = SCM_CDRLOC(*tail);
+ tail = SCM_CDRLOC (*tail);
}
return l;
new_input (main_input_name_, sources_);
- /* Do not allow \include in --safe-mode */
- allow_includes_b_ = allow_includes_b_ && !be_safe_global;
-
scm_module_define (scm_car (scopes_),
ly_symbol2scm ("input-file-name"),
- scm_makfrom0str (main_input_name_.c_str ()));
+ ly_string2scm (main_input_name_));
+}
+
+void
+Lily_lexer::new_input (string str, string d, Sources *ss)
+{
+ Includable_lexer::new_input (str, d, ss);
}
void
-Lily_lexer::set_identifier (SCM name, SCM s)
+Lily_lexer::new_input (string str, Sources *ss)
{
- SCM sym = name;
- if (scm_is_string (name))
- sym = scm_string_to_symbol (name);
+ if (is_main_input_ && be_safe_global)
+ {
+ LexerError (_ ("include files are not allowed in safe mode").c_str ());
+ return;
+ }
+
+ 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 path, SCM val)
+{
+ 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))
{
SCM mod = scm_car (scopes_);
- scm_module_define (mod, sym, s);
+ if (scm_is_pair (path))
+ {
+ SCM prev = scm_module_lookup (mod, sym);
+ if (prev != SCM_UNDEFINED)
+ val = nested_property_alist (prev, path, val);
+ }
+ scm_module_define (mod, sym, val);
}
else
programming_error ("identifier is not a symbol");
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);