#include <strstream.h>
#include <ctype.h>
-#include "notename-table.hh"
+
#include "interval.hh"
#include "identifier.hh"
#include "lily-guile.hh"
{"consists", CONSISTS},
{"consistsend", CONSISTSEND},
{"context", CONTEXT},
+ {"denies", DENIES},
{"duration", DURATION},
{"font", FONT},
{"grace", GRACE},
{"in", IN_T},
{"lyrics", LYRICS},
{"key", KEY},
- {"keysignature", KEYSIGNATURE},
{"mark", MARK},
{"musicalpitch", MUSICAL_PITCH},
{"time", TIME_T},
{"notenames", NOTENAMES},
{"notes", NOTES},
{"outputproperty", OUTPUTPROPERTY},
+ {"pushproperty", PUSHPROPERTY},
+ {"popproperty", POPPROPERTY},
{"partial", PARTIAL},
{"paper", PAPER},
{"penalty", PENALTY},
{"relative", RELATIVE},
{"remove", REMOVE},
{"repeat", REPEAT},
- {"repetitions", REPETITIONS},
{"addlyrics", ADDLYRICS},
+ {"partcombine", PARTCOMBINE},
{"score", SCORE},
{"script", SCRIPT},
{"skip", SKIP},
toplevel_scope_p_ = new Scope;
scope_l_arr_.push (toplevel_scope_p_);
errorlevel_i_ = 0;
- note_tab_p_ = new Notename_table;
- chordmodifier_tab_p_ = new Notename_table;
main_input_b_ = false;
}
return keytable_p_->lookup (s.ch_C ());
}
-Identifier*
+SCM
My_lily_lexer::lookup_identifier (String s)
{
SCM sym = ly_symbol2scm (s.ch_C());
for (int i = scope_l_arr_.size (); i--; )
if (scope_l_arr_[i]->elem_b (sym))
- return scope_l_arr_[i]->elem(sym);
- return 0;
+ return scope_l_arr_[i]->scm_elem(sym);
+ return SCM_UNSPECIFIED;
}
void
My_lily_lexer::start_main_input ()
{
- if (flower_dstream && !flower_dstream->silent_b ("InitDeclarations") && flower_dstream)
- print_declarations (true);
- if (flower_dstream && !flower_dstream->silent_b ("InitLexer") && flower_dstream)
- set_debug (1);
-
-
new_input (main_input_str_, source_global_l);
allow_includes_b_ = allow_includes_b_ && !(safe_global_b);
-
-
- print_declarations(true);
}
void
-My_lily_lexer::set_identifier (String name_str, Identifier* i, bool )
+My_lily_lexer::set_identifier (String name_str, SCM s)
{
- Identifier *old =0;
- if (scope_l_arr_.top ()->elem_b (name_str))
- old = scope_l_arr_.top ()->elem(name_str);
-
-
- if (old)
- {
-#if 0
- if (unique_b)
- old->warning(_f ("redeclaration of `\\%s'", name_str));
-#endif
- delete old;
- }
if (lookup_keyword (name_str) >= 0)
{
warning ( _f ("Identifier name is a keyword: `%s'", name_str));
}
- scope_l_arr_.top ()->elem (name_str) = i;
+ scope_l_arr_.top ()->set (name_str, s);
}
My_lily_lexer::~My_lily_lexer()
{
- delete chordmodifier_tab_p_;
delete keytable_p_;
delete toplevel_scope_p_ ;
- delete note_tab_p_;
}
-void
-My_lily_lexer::print_declarations (bool ) const
-{
- for (int i=scope_l_arr_.size (); i--; )
- {
- DEBUG_OUT << "Scope no. " << i << '\n';
- scope_l_arr_[i]->print ();
- }
-}
+
void
My_lily_lexer::LexerError (char const *s)
}
}
-Musical_pitch
-My_lily_lexer::lookup_notename (String s)
-{
- return note_tab_p_->get_pitch (s);
-}
-
-Musical_pitch
-My_lily_lexer::lookup_chordmodifier (String s)
-{
- return chordmodifier_tab_p_->get_pitch (s);
-}
-
-
-void
-My_lily_lexer::set_notename_table (Notename_table *p)
-{
- delete note_tab_p_;
- note_tab_p_ = p;
-}
-
-
-
-void
-My_lily_lexer::set_chordmodifier_table (Notename_table *p)
-{
- delete chordmodifier_tab_p_;
- chordmodifier_tab_p_ = p;
-}
-
char
My_lily_lexer::escaped_char(char c) const
{