release: 1.1.1

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 8abc8beb465181f0db36359c30a5bfa78e3ad757..df3634bce5b5f832217ac1f283148c786783d790 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@cs.uu.nl>
 */
 
 #include <strstream.h>
@@ -19,60 +19,64 @@
 #include "debug.hh"
 #include "source-file.hh"
 #include "parseconstruct.hh"
+#include "main.hh"
+#include "scope.hh"
 
 static Keyword_ent the_key_tab[]={
+  {"absdynamic", ABSDYNAMIC},
   {"accepts", ACCEPTS},
   {"bar", BAR},
   {"cadenza", CADENZA},
-  {"clear", CLEAR},
   {"clef", CLEF},
   {"cm", CM_T},
   {"consists", CONSISTS},
-  {"contains", CONTAINS},
   {"duration", DURATION},
-  {"absdynamic", ABSDYNAMIC},
+  {"font", FONT},
+  {"grouping", GROUPING},
+  {"header", HEADER},
   {"in", IN_T},
-  {"translator", TRANSLATOR},
-  {"type", TYPE},
-  {"lyric", LYRIC},
+  {"lyrics", LYRICS},
   {"key", KEY},
-  {"melodic" , MELODIC},
-  {"melodic_request", MELODIC_REQUEST},
-  {"meter", METER},
+  {"keysignature", KEYSIGNATURE},
+  {"mark", MARK},
+  {"musicalpitch", MUSICAL_PITCH},
+  {"time", TIME_T},
+  {"times", TIMES},
   {"midi", MIDI},
   {"mm", MM_T},
-  {"multi", MULTI},
-  {"header", HEADER},
+  {"name", NAME},
   {"notenames", NOTENAMES},
-  {"octave", OCTAVE},
+  {"notes" , NOTES},
   {"output", OUTPUT},
   {"partial", PARTIAL},
   {"paper", PAPER},
-  {"plet", PLET},
+  {"penalty", PENALTY},
   {"property", PROPERTY},
   {"pt", PT_T},
+  {"relative", RELATIVE},
+  {"remove", REMOVE},
+  {"scm", SCHEME},
   {"score", SCORE},
   {"script", SCRIPT},
+  {"shape", SHAPE},
   {"skip", SKIP},
-  {"staff", STAFF},
   {"table", TABLE},
-  {"spandynamic", SPANDYNAMIC}, 
+  {"spandynamic", SPANDYNAMIC},
   {"symboltables", SYMBOLTABLES},
   {"tempo", TEMPO},
-  {"texid", TEXID},
-  {"textstyle", TEXTSTYLE},
+  {"translator", TRANSLATOR},
+  {"type", TYPE},
   {"transpose", TRANSPOSE},
   {"version", VERSION},
-  {"grouping", GROUPING},
   {0,0}
 };
 
 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;
 }
 
@@ -85,60 +89,74 @@ 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]->elem_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 )
 {
-  Identifier *old = lookup_identifier (name_str);
-  if  (old) 
+  Identifier *old =0;
+  if (scope_l_arr_.top ()->elem_b (name_str))
+    old = scope_l_arr_.top ()->elem(name_str);
+ 
+   
+  if  (old)
     {
-      old->warning("redeclaration of \\" + name_str);
+#if 0
+      if (unique_b)
+       old->warning(_f ("redeclaration of `\\%s\'", name_str));
+#endif
       delete old;
     }
-  (*identifier_p_dict_p_)[name_str] = i;
+  if (lookup_keyword (name_str) >= 0)
+    {
+      warning (  _f ("Identifier name is a keyword (`%s')", name_str));
+    }
+  
+  (*scope_l_arr_.top ())[name_str] = i;
 }
 
 My_lily_lexer::~My_lily_lexer()
 {
   delete keytable_p_;
-
-  for (Assoc_iter<String,Identifier*>
-        ai (*identifier_p_dict_p_); ai.ok(); ai++) 
-    {
-      DOUT << "deleting: " << ai.key()<<'\n';
-      delete ai.val();
-    }
+  delete toplevel_scope_p_ ;
   delete note_tab_p_;
-  delete identifier_p_dict_p_;
 }
+
 void
-My_lily_lexer::print_declarations (bool init_b) const
+My_lily_lexer::print_declarations (bool ) 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 ();
     }
 }
 
 void
 My_lily_lexer::LexerError (char const *s)
 {
-  if (include_stack_.empty()) 
+  if (include_stack_.empty())
     {
-      *mlog << "error at EOF" << s << '\n';
+      *mlog << _f ("error at EOF: %s", s) << endl;
     }
-  else 
+  else
     {
       errorlevel_i_ |= 1;
       Input spot (source_file_l(),here_ch_C());
@@ -146,23 +164,29 @@ 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_->elem_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
-My_lily_lexer::clear_notenames()
+My_lily_lexer::set_notename_table(Notename_table *p)
 {
   delete note_tab_p_;
-  note_tab_p_ = new Notename_table;
+  note_tab_p_ = p;
 }
 
 char
@@ -174,7 +198,7 @@ My_lily_lexer::escaped_char(char c) const
       return '\n';
     case 't':
       return '\t';
-      
+
     case '\'':
     case '\"':
     case '\\':