release: 1.1.13

[lilypond.git] / lily / my-lily-lexer.cc

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index c37ec26b09bace28f0921e693eb9f7699b81643b..6446083926c2f2afbb43fd690eb6d4fb9ac7c100 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -25,8 +25,11 @@
 static Keyword_ent the_key_tab[]={
   {"absdynamic", ABSDYNAMIC},
   {"accepts", ACCEPTS},
+  {"alternative", ALTERNATIVE},
   {"bar", BAR},
   {"cadenza", CADENZA},
+  {"chordmodifiers", CHORDMODIFIERS},
+  {"chords", CHORDS},
   {"clef", CLEF},
   {"cm", CM_T},
   {"consists", CONSISTS},
@@ -35,17 +38,18 @@ static Keyword_ent the_key_tab[]={
   {"grouping", GROUPING},
   {"header", HEADER},
   {"in", IN_T},
-  {"lyric", LYRIC},
+  {"lyrics", LYRICS},
   {"key", KEY},
   {"keysignature", KEYSIGNATURE},
   {"mark", MARK},
   {"musicalpitch", MUSICAL_PITCH},
   {"time", TIME_T},
+  {"times", TIMES},
   {"midi", MIDI},
   {"mm", MM_T},
+  {"name", NAME},
   {"notenames", NOTENAMES},
   {"notes" , NOTES},
-  {"output", OUTPUT},
   {"partial", PARTIAL},
   {"paper", PAPER},
   {"penalty", PENALTY},
@@ -53,6 +57,9 @@ static Keyword_ent the_key_tab[]={
   {"pt", PT_T},
   {"relative", RELATIVE},
   {"remove", REMOVE},
+  {"repeat", REPEAT},
+  {"scm", SCM_T},
+  {"scmfile", SCMFILE},
   {"score", SCORE},
   {"script", SCRIPT},
   {"shape", SHAPE},
@@ -75,6 +82,8 @@ My_lily_lexer::My_lily_lexer()
   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;
 }
 
 int
@@ -100,15 +109,22 @@ My_lily_lexer::start_main_input ()
   if (!monitor->silent_b ("InitLexer") && check_debug)
     set_debug (1);
 
+
   new_input (main_input_str_, source_global_l);
+  if (safe_global_b)
+    allow_includes_b_ = false;
   
   print_declarations(true);
 }
 
 void
-My_lily_lexer::set_identifier (String name_str, Identifier* i, bool unique_b)
+My_lily_lexer::set_identifier (String name_str, Identifier* i, bool )
 {
-  Identifier *old = lookup_identifier (name_str);
+  Identifier *old =0;
+  if (scope_l_arr_.top ()->elem_b (name_str))
+    old = scope_l_arr_.top ()->elem(name_str);
+ 
+   
   if  (old)
     {
 #if 0
@@ -133,7 +149,7 @@ My_lily_lexer::~My_lily_lexer()
 }
 
 void
-My_lily_lexer::print_declarations (bool init_b) const
+My_lily_lexer::print_declarations (bool ) const
 {
   for (int i=scope_l_arr_.size (); i--; )
     {
@@ -158,11 +174,17 @@ My_lily_lexer::LexerError (char const *s)
 }
 
 Musical_pitch
-My_lily_lexer::lookup_pitch (String s)
+My_lily_lexer::lookup_notename (String s)
 {
   return (*note_tab_p_)[s];
 }
 
+Musical_pitch
+My_lily_lexer::lookup_chordmodifier (String s)
+{
+  return (*chordmodifier_tab_p_)[s];
+}
+
 bool
 My_lily_lexer::notename_b (String s) const
 {
@@ -170,16 +192,23 @@ My_lily_lexer::notename_b (String s) const
 }
 
 void
-My_lily_lexer::add_notename (String s, Musical_pitch p)
+My_lily_lexer::set_notename_table (Notename_table *p)
 {
-  (*note_tab_p_)[s] = p;
+  delete note_tab_p_;
+  note_tab_p_ = p;
+}
+
+bool
+My_lily_lexer::chordmodifier_b (String s) const
+{
+  return chordmodifier_tab_p_->elem_b (s);
 }
 
 void
-My_lily_lexer::set_notename_table(Notename_table *p)
+My_lily_lexer::set_chordmodifier_table (Notename_table *p)
 {
-  delete note_tab_p_;
-  note_tab_p_ = p;
+  delete chordmodifier_tab_p_;
+  chordmodifier_tab_p_ = p;
 }
 
 char