/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2015 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
#include "warn.hh"
#include "program-option.hh"
#include "lily-parser.hh"
+#include "ly-module.hh"
static Keyword_ent the_key_tab[]
-= {
+=
+{
{"accepts", ACCEPTS},
{"addlyrics", ADDLYRICS},
{"alias", ALIAS},
{"description", DESCRIPTION},
{"drummode", DRUMMODE},
{"drums", DRUMS},
+ {"etc", ETC},
{"figuremode", FIGUREMODE},
{"figures", FIGURES},
- {"grobdescriptions", GROBDESCRIPTIONS},
{"header", HEADER},
- {"key", KEY},
{"layout", LAYOUT},
{"lyricmode", LYRICMODE},
{"lyrics", LYRICS},
{"lyricsto", LYRICSTO},
- {"mark", MARK},
{"markup", MARKUP},
- {"markuplines", MARKUPLINES},
+ {"markuplist", MARKUPLIST},
{"midi", MIDI},
{"name", NAME},
{"new", NEWCONTEXT},
{"notemode", NOTEMODE},
- {"once", ONCE},
{"override", OVERRIDE},
{"paper", PAPER},
- {"partial", PARTIAL},
- {"relative", RELATIVE},
{"remove", REMOVE},
{"repeat", REPEAT},
{"rest", REST},
{"sequential", SEQUENTIAL},
{"set", SET},
{"simultaneous", SIMULTANEOUS},
- {"skip", SKIP},
{"tempo", TEMPO},
- {"time", TIME_T},
- {"times", TIMES},
- {"transpose", TRANSPOSE},
{"type", TYPE},
{"unset", UNSET},
{"with", WITH},
scopes_ = SCM_EOL;
error_level_ = 0;
is_main_input_ = false;
+ main_input_level_ = 0;
start_module_ = SCM_EOL;
- chord_repetition_ = Chord_repetition ();
+ extra_tokens_ = SCM_EOL;
smobify_self ();
add_scope (ly_make_module (false));
- push_note_state (scm_c_make_hash_table (0));
+ push_note_state (SCM_EOL);
chordmodifier_tab_ = scm_make_vector (scm_from_int (1), SCM_EOL);
}
-Lily_lexer::Lily_lexer (Lily_lexer const &src, Lily_parser *parser)
+Lily_lexer::Lily_lexer (Lily_lexer const &src, Lily_parser *parser,
+ SCM override_input)
: Includable_lexer ()
{
parser_ = parser;
chordmodifier_tab_ = src.chordmodifier_tab_;
pitchname_tab_stack_ = src.pitchname_tab_stack_;
sources_ = src.sources_;
+ scopes_ = src.scopes_;
start_module_ = SCM_EOL;
- chord_repetition_ = src.chord_repetition_;
- error_level_ = src.error_level_;
+ error_level_ = 0;
is_main_input_ = src.is_main_input_;
+ main_input_level_ = 0;
- scopes_ = SCM_EOL;
+ extra_tokens_ = SCM_EOL;
+ if (unsmob<Input> (override_input))
+ override_input_ = *unsmob<Input> (override_input);
smobify_self ();
- SCM scopes = SCM_EOL;
- SCM *tail = &scopes;
- for (SCM s = src.scopes_; scm_is_pair (s); s = scm_cdr (s))
- {
- SCM newmod = ly_make_module (false);
- ly_module_copy (newmod, scm_car (s));
- *tail = scm_cons (newmod, SCM_EOL);
- tail = SCM_CDRLOC (*tail);
- }
-
- scopes_ = scopes;
- push_note_state (scm_c_make_hash_table (0));
+ push_note_state (SCM_EOL);
}
Lily_lexer::~Lily_lexer ()
}
int
-Lily_lexer::lookup_keyword (string s)
+Lily_lexer::lookup_keyword (const string &s)
{
return keytable_->lookup (s.c_str ());
}
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);
+ *tail = scm_acons (scm_from_utf8_string (keytable_->table_[i].name_),
+ scm_from_int (keytable_->table_[i].tokcode_),
+ SCM_EOL);
tail = SCM_CDRLOC (*tail);
}
for (SCM s = scopes_; scm_is_pair (s); s = scm_cdr (s))
{
SCM var = ly_module_lookup (scm_car (s), sym);
- if (var != SCM_BOOL_F)
- return scm_variable_ref (var);
+ if (scm_is_true (var))
+ return scm_variable_ref (var);
}
return SCM_UNDEFINED;
}
SCM
-Lily_lexer::lookup_identifier (string name)
+Lily_lexer::lookup_identifier (const string &name)
{
return lookup_identifier_symbol (ly_symbol2scm (name.c_str ()));
}
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
-Lily_lexer::new_input (string str, string d, Sources *ss)
+Lily_lexer::new_input (const string &str, string d, Sources *ss)
{
Includable_lexer::new_input (str, d, ss);
}
void
-Lily_lexer::new_input (string str, Sources *ss)
+Lily_lexer::new_input (const string &str, Sources *ss)
{
if (is_main_input_ && be_safe_global)
{
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_);
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 prev = ly_module_lookup (mod, sym);
+ if (scm_is_true (prev))
+ val = nested_property_alist (scm_variable_ref (prev), path, val);
+ else
+ val = nested_create_alist (path, val);
+ }
scm_module_define (mod, sym, val);
}
else
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_);
- spot.error (s);
+ spot.non_fatal_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);
}
}
return Input (*lexloc_);
}
+Input const &
+Lily_lexer::override_input (Input const &in) const
+{
+ return override_input_.get_source_file ()
+ ? override_input_ : in;
+}
+
void
Lily_lexer::prepare_for_next_token ()
{
{
char const *start = here_str0 ();
lexloc_->set (get_source_file (),
- start, start + count);
+ start, start + count);
char_count_stack_.back () += count;
}
-#include "ly-smobs.icc"
-IMPLEMENT_SMOBS (Lily_lexer);
-IMPLEMENT_TYPE_P (Lily_lexer, "ly:lily-lexer?");
-IMPLEMENT_DEFAULT_EQUAL_P (Lily_lexer);
+const char * const Lily_lexer::type_p_name_ = "ly:lily-lexer?";
SCM
-Lily_lexer::mark_smob (SCM s)
+Lily_lexer::mark_smob () const
{
- ASSERT_LIVE_IS_ALLOWED ();
-
- Lily_lexer *lexer = (Lily_lexer *) SCM_CELL_WORD_1 (s);
-
- scm_gc_mark (lexer->chordmodifier_tab_);
- if (lexer->parser_)
- scm_gc_mark (lexer->parser_->self_scm ());
- scm_gc_mark (lexer->pitchname_tab_stack_);
- scm_gc_mark (lexer->start_module_);
- return lexer->scopes_;
+ ASSERT_LIVE_IS_ALLOWED (self_scm ());
+
+ scm_gc_mark (chordmodifier_tab_);
+ if (parser_)
+ scm_gc_mark (parser_->self_scm ());
+ scm_gc_mark (pitchname_tab_stack_);
+ scm_gc_mark (start_module_);
+ scm_gc_mark (extra_tokens_);
+ return scopes_;
}
int
-Lily_lexer::print_smob (SCM s, SCM port, scm_print_state*)
+Lily_lexer::print_smob (SCM port, scm_print_state *) const
{
- Lily_lexer *lexer = Lily_lexer::unsmob (s);
-
scm_puts ("#<Lily_lexer ", port);
- scm_display (lexer->scopes_, port);
+ scm_display (scopes_, port);
scm_puts (" >", port);
return 1;
}
projects / lilypond.git / blobdiff