source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "lily-lexer.hh"
#include <cctype>
#include <sstream>
+using namespace std;
-#include "scm-hash.hh"
+#include "international.hh"
#include "interval.hh"
-#include "parser.hh"
#include "keyword.hh"
-#include "warn.hh"
-#include "source-file.hh"
#include "main.hh"
#include "moment.hh"
+#include "parser.hh"
+#include "scm-hash.hh"
+#include "source-file.hh"
+#include "warn.hh"
+#include "program-option.hh"
+#include "lily-parser.hh"
static Keyword_ent the_key_tab[]
= {
{"accepts", ACCEPTS},
- {"addquote", ADDQUOTE},
{"addlyrics", ADDLYRICS},
{"alias", ALIAS},
{"alternative", ALTERNATIVE},
- {"bar", BAR},
{"book", BOOK},
+ {"bookpart", BOOKPART},
{"change", CHANGE},
- {"chords", CHORDS},
{"chordmode", CHORDMODE},
- {"clef", CLEF},
+ {"chords", CHORDS},
{"consists", CONSISTS},
{"context", CONTEXT},
{"default", DEFAULT},
+ {"defaultchild", DEFAULTCHILD},
{"denies", DENIES},
+ {"description", DESCRIPTION},
{"drummode", DRUMMODE},
{"drums", DRUMS},
- {"description", DESCRIPTION},
- {"figures", FIGURES},
{"figuremode", FIGUREMODE},
+ {"figures", FIGURES},
{"grobdescriptions", GROBDESCRIPTIONS},
{"header", HEADER},
{"key", KEY},
{"layout", LAYOUT},
{"lyricmode", LYRICMODE},
- {"lyricsto", LYRICSTO},
{"lyrics", LYRICS},
+ {"lyricsto", LYRICSTO},
{"mark", MARK},
{"markup", MARKUP},
+ {"markuplines", MARKUPLINES},
{"midi", MIDI},
{"name", NAME},
{"new", NEWCONTEXT},
- {"objectid", OBJECTID},
{"notemode", NOTEMODE},
- {"octave", OCTAVE},
+ {"objectid", OBJECTID},
{"once", ONCE},
{"override", OVERRIDE},
{"paper", PAPER},
{"set", SET},
{"simultaneous", SIMULTANEOUS},
{"skip", SKIP},
- {"tag", TAG},
{"tempo", TEMPO},
{"time", TIME_T},
{"times", TIMES},
{"transpose", TRANSPOSE},
- {"transposition", TRANSPOSITION},
{"type", TYPE},
{"unset", UNSET},
{"with", WITH},
{0, 0}
};
-Lily_lexer::Lily_lexer (Sources *sources)
+Lily_lexer::Lily_lexer (Sources *sources, Lily_parser *parser)
{
+ parser_ = parser;
keytable_ = new Keyword_table (the_key_tab);
chordmodifier_tab_ = SCM_EOL;
pitchname_tab_stack_ = SCM_EOL;
scopes_ = SCM_EOL;
error_level_ = 0;
is_main_input_ = false;
-
+ start_module_ = SCM_EOL;
smobify_self ();
add_scope (ly_make_anonymous_module (false));
push_note_state (scm_c_make_hash_table (0));
- chordmodifier_tab_ = scm_make_vector (scm_int2num (1), SCM_EOL);
+ chordmodifier_tab_ = scm_make_vector (scm_from_int (1), SCM_EOL);
}
-Lily_lexer::Lily_lexer (Lily_lexer const &src)
+Lily_lexer::Lily_lexer (Lily_lexer const &src, Lily_parser *parser)
: Includable_lexer ()
{
+ 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;
error_level_ = src.error_level_;
is_main_input_ = src.is_main_input_;
Lily_lexer::add_scope (SCM module)
{
ly_reexport_module (scm_current_module ());
- scm_set_current_module (module);
+ if (!scm_is_pair (scopes_))
+ start_module_ = scm_current_module ();
+
for (SCM s = scopes_; scm_is_pair (s); s = scm_cdr (s))
- {
- ly_use_module (module, scm_car (s));
- }
+ ly_use_module (module, scm_car (s));
scopes_ = scm_cons (module, scopes_);
+
+ set_current_scope ();
+}
+bool
+Lily_lexer::has_scope () const
+{
+ return scm_is_pair (scopes_);
}
SCM
{
SCM sc = scm_car (scopes_);
scopes_ = scm_cdr (scopes_);
- scm_set_current_module (scm_car (scopes_));
-
+ set_current_scope ();
return sc;
}
+SCM
+Lily_lexer::set_current_scope ()
+{
+ SCM old = scm_current_module ();
+
+ if (scm_is_pair (scopes_))
+ scm_set_current_module (scm_car (scopes_));
+ else
+ scm_set_current_module (start_module_);
+
+ return old;
+}
+
int
-Lily_lexer::lookup_keyword (String s)
+Lily_lexer::lookup_keyword (string s)
{
- return keytable_->lookup (s.to_str0 ());
+ return keytable_->lookup (s.c_str ());
+}
+
+SCM
+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++)
+ {
+ *tail = scm_acons (scm_from_locale_string (keytable_->table_[i].name_),
+ scm_from_int (keytable_->table_[i].tokcode_),
+ SCM_EOL);
+
+ tail = SCM_CDRLOC (*tail);
+ }
+
+ return l;
}
SCM
}
SCM
-Lily_lexer::lookup_identifier (String name)
+Lily_lexer::lookup_identifier (string name)
{
- return lookup_identifier_symbol (ly_symbol2scm (name.to_str0 ()));
+ return lookup_identifier_symbol (ly_symbol2scm (name.c_str ()));
}
void
Lily_lexer::start_main_input ()
{
- // yy_flex_debug = 1;
- new_input (main_input_name_, sources_);
+ yy_flex_debug = get_program_option ("debug-lexer");
+ parser_->set_yydebug (get_program_option ("debug-parser"));
- /* Do not allow \include in --safe-mode */
- allow_includes_b_ = allow_includes_b_ && !be_safe_global;
+
+ new_input (main_input_name_, sources_);
scm_module_define (scm_car (scopes_),
ly_symbol2scm ("input-file-name"),
- scm_makfrom0str (main_input_name_.to_str0 ()));
+ 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::new_input (string str, Sources *ss)
+{
+ 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);
}
void
{
if (lookup_keyword (ly_symbol2string (sym)) >= 0)
{
- String symstr = ly_symbol2string (sym);
- warning (_f ("Identifier name is a keyword: `%s'", symstr.to_str0 ()));
+ 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);
}
else
- {
- programming_error ("Identifier is not a symbol.");
- }
+ programming_error ("identifier is not a symbol");
}
void
Lily_lexer::LexerError (char const *s)
{
- if (include_stack_.is_empty ())
- progress_indication (_f ("error at EOF: %s", s) + String ("\n"));
+ if (include_stack_.empty ())
+ message (_f ("error at EOF: %s", s) + "\n");
else
{
error_level_ |= 1;
Input
Lily_lexer::here_input () const
{
- return Input(*lexloc);
+ return Input (*lexloc);
}
void
void
Lily_lexer::add_lexed_char (int count)
{
- lexloc->source_file_ = get_source_file ();
- lexloc->start_ = here_str0 ();
- lexloc->end_ = lexloc->start_ + count;
- char_count_stack_.top () += count;
+ char const *start = here_str0 ();
+ lexloc->set (get_source_file (),
+ start, start + count);
+ char_count_stack_.back () += count;
}
#include "ly-smobs.icc"
SCM
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_);
+ 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_;
}
int
-Lily_lexer::print_smob (SCM, 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 ("#<Lily_lexer ", port);
+ scm_display (lexer->scopes_, port);
scm_puts (" >", port);
return 1;
}
projects / lilypond.git / blobdiff