/*
- 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--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 1997--2009 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"
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_;
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))
{
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");