/*
- 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 <hanwen@xs4all.nl>
- (c) 1997--2007 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"
#include "lily-parser.hh"
static Keyword_ent the_key_tab[]
-= {
+=
+{
{"accepts", ACCEPTS},
{"addlyrics", ADDLYRICS},
{"alias", ALIAS},
{"name", NAME},
{"new", NEWCONTEXT},
{"notemode", NOTEMODE},
- {"objectid", OBJECTID},
{"once", ONCE},
{"override", OVERRIDE},
{"paper", PAPER},
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);
}
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_;
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);
{
if (!keytable_)
return SCM_EOL;
-
+
SCM l = SCM_EOL;
SCM *tail = &l;
for (vsize i = 0; i < keytable_->table_.size (); i++)
{
*tail = scm_acons (scm_from_locale_string (keytable_->table_[i].name_),
- scm_from_int (keytable_->table_[i].tokcode_),
- SCM_EOL);
+ scm_from_int (keytable_->table_[i].tokcode_),
+ SCM_EOL);
tail = SCM_CDRLOC (*tail);
}
{
SCM var = ly_module_lookup (scm_car (s), sym);
if (var != SCM_BOOL_F)
- return scm_variable_ref (var);
+ return scm_variable_ref (var);
}
return SCM_UNDEFINED;
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_),
- ly_symbol2scm ("input-file-name"),
- ly_string2scm (main_input_name_));
+ ly_symbol2scm ("input-file-name"),
+ ly_string2scm (main_input_name_));
}
void
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))
{
if (lookup_keyword (ly_symbol2string (sym)) >= 0)
- {
- string symstr = ly_symbol2string (sym);
- warning (_f ("identifier name is a keyword: `%s'", symstr.c_str ()));
- }
+ {
+ string symstr = ly_symbol2string (sym);
+ warning (_f ("identifier name is a keyword: `%s'", symstr.c_str ()));
+ }
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");
Lily_lexer::LexerError (char const *s)
{
if (include_stack_.empty ())
- message (_f ("error at EOF: %s", s) + "\n");
+ non_fatal_error (s, _f ("%s:EOF", s));
else
{
error_level_ |= 1;
- Input spot (*lexloc);
+ Input spot (*lexloc_);
spot.error (s);
}
}
+void
+Lily_lexer::LexerWarning (char const *s)
+{
+ if (include_stack_.empty ())
+ warning (s, _f ("%s:EOF", s));
+ else
+ {
+ Input spot (*lexloc_);
+ spot.warning (s);
+ }
+}
+
char
Lily_lexer::escaped_char (char c) const
{
Input
Lily_lexer::here_input () const
{
- return Input (*lexloc);
+ return Input (*lexloc_);
}
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;
}
Lily_lexer::mark_smob (SCM s)
{
ASSERT_LIVE_IS_ALLOWED ();
-
+
Lily_lexer *lexer = (Lily_lexer *) SCM_CELL_WORD_1 (s);
scm_gc_mark (lexer->chordmodifier_tab_);
}
int
-Lily_lexer::print_smob (SCM s, SCM port, scm_print_state*)
+Lily_lexer::print_smob (SCM s, SCM port, scm_print_state *)
{
Lily_lexer *lexer = Lily_lexer::unsmob (s);
scm_puts (" >", port);
return 1;
}
+
+bool
+Lily_lexer::is_clean () const
+{
+ return include_stack_.empty ();
+}
projects / lilypond.git / blobdiff