release: 0.1.65

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 2a8760ee525c1eee49843062d259a071ad760f18..1a46c7994cd31195627f23beff14bc683dc3f873 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
 #include <strstream.h>
@@ -19,6 +19,8 @@
 #include "debug.hh"
 #include "source-file.hh"
 #include "parseconstruct.hh"
+#include "main.hh"
+#include "scope.hh"
 
 static Keyword_ent the_key_tab[]={
   {"accepts", ACCEPTS},
@@ -37,7 +39,7 @@ static Keyword_ent the_key_tab[]={
   {"lyric", LYRIC},
   {"key", KEY},
   {"melodic" , MELODIC},
-  {"melodic_request", MELODIC_REQUEST},
+  {"musical_pitch", MUSICAL_PITCH},
   {"meter", METER},
   {"midi", MIDI},
   {"mm", MM_T},
@@ -48,10 +50,13 @@ static Keyword_ent the_key_tab[]={
   {"output", OUTPUT},
   {"partial", PARTIAL},
   {"paper", PAPER},
+  {"penalty", PENALTY},
   {"property", PROPERTY},
   {"pt", PT_T},
+  {"relative", RELATIVE},
   {"score", SCORE},
   {"script", SCRIPT},
+  {"shape", SHAPE},
   {"skip", SKIP},
   {"staff", STAFF},
   {"table", TABLE},
@@ -69,9 +74,9 @@ static Keyword_ent the_key_tab[]={
 My_lily_lexer::My_lily_lexer()
 {
   keytable_p_ = new Keyword_table (the_key_tab);
-  identifier_p_dict_p_ = new Dictionary<Identifier*>;
+  toplevel_scope_p_ = new Scope;
+  scope_l_arr_.push (toplevel_scope_p_);
   errorlevel_i_ = 0;
-  post_quotes_b_ = false;
   note_tab_p_ = new Notename_table;
 }
 
@@ -84,49 +89,54 @@ My_lily_lexer::lookup_keyword (String s)
 Identifier*
 My_lily_lexer::lookup_identifier (String s)
 {
-  if (!identifier_p_dict_p_->elt_b (s))
-    return 0;
-
-  return (*identifier_p_dict_p_)[s];
+  for (int i = scope_l_arr_.size (); i--; )
+    if (scope_l_arr_[i]->elt_b (s))
+      return (*scope_l_arr_[i])[s];
+  return 0;
 }
 
+void
+My_lily_lexer::start_main_input ()
+{  
+  if (!monitor->silent_b ("InitDeclarations") && check_debug)
+    print_declarations (true);
+  if (!monitor->silent_b ("InitLexer") && check_debug)
+    set_debug (1);
+
+  new_input (main_input_str_, source_global_l);
+  
+  print_declarations(true);
+}
 
 void
-My_lily_lexer::set_identifier (String name_str, Identifier*i)
+My_lily_lexer::set_identifier (String name_str, Identifier* i, bool unique_b)
 {
   Identifier *old = lookup_identifier (name_str);
   if  (old)
     {
-      old->warning(_("redeclaration of \\") + name_str);
+      if (unique_b)
+       old->warning(_("redeclaration of \\") + name_str);
       delete old;
     }
-  (*identifier_p_dict_p_)[name_str] = i;
+  (*scope_l_arr_.top ())[name_str] = i;
 }
 
 My_lily_lexer::~My_lily_lexer()
 {
   delete keytable_p_;
+  delete toplevel_scope_p_ ;
+
 
-  for (Assoc_iter<String,Identifier*>
-        ai (*identifier_p_dict_p_); ai.ok(); ai++)
-    {
-      DOUT << "deleting: " << ai.key()<<'\n';
-      delete ai.val();
-    }
   delete note_tab_p_;
-  delete identifier_p_dict_p_;
 }
+
 void
 My_lily_lexer::print_declarations (bool init_b) const
 {
-  for (Assoc_iter<String,Identifier*> ai (*identifier_p_dict_p_);
-       ai.ok(); ai++)
+  for (int i=scope_l_arr_.size (); i--; )
     {
-      if (ai.val()->init_b_ == init_b)
-       {
-         DOUT << ai.key() << '=';
-         ai.val()->print ();
-       }
+      DOUT << "Scope no. " << i << "\n";
+      scope_l_arr_[i]->print ();
     }
 }
 
@@ -145,16 +155,22 @@ My_lily_lexer::LexerError (char const *s)
     }
 }
 
-Melodic_req*
-My_lily_lexer::lookup_melodic_req_l (String s)
+Musical_pitch
+My_lily_lexer::lookup_pitch (String s)
+{
+  return (*note_tab_p_)[s];
+}
+
+bool
+My_lily_lexer::notename_b (String s) const
 {
-  return note_tab_p_->get_l (s);
+  return note_tab_p_->elt_b (s);
 }
 
 void
-My_lily_lexer::add_notename (String s, Melodic_req *p)
+My_lily_lexer::add_notename (String s, Musical_pitch p)
 {
-  note_tab_p_->add (s,p);
+  (*note_tab_p_)[s] = p;
 }
 
 void