* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index ab0bd3f3a82b295e16ec8a753acd2b7bbc05e50d..48005225d18c895bc4f3bf781d24df77ab1a55cb 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -3,26 +3,31 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include <strstream.h>
 #include <ctype.h>
 
+#include <sstream>
+
+#include "lily-proto.hh"
+#include "scm-hash.hh"
 #include "interval.hh"
-#include "identifier.hh"
+#include "input-file-results.hh"
 #include "lily-guile.hh"
 #include "parser.hh"
 #include "keyword.hh"
 #include "my-lily-lexer.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "source-file.hh"
 #include "main.hh"
-#include "scope.hh"
 #include "input.hh"
 #include "moment.hh"
 
 static Keyword_ent the_key_tab[]={
+  {"alias", ALIAS},
+  {"apply", APPLY},
+  {"arpeggio", ARPEGGIO },
   {"autochange", AUTOCHANGE},
   {"spanrequest", SPANREQUEST},
   {"commandspanrequest", COMMANDSPANREQUEST},  
@@ -40,24 +45,33 @@ static Keyword_ent the_key_tab[]={
   {"consists", CONSISTS},
   {"consistsend", CONSISTSEND},
   {"context", CONTEXT},
+  {"default", DEFAULT},
+  {"denies", DENIES},
   {"duration", DURATION},
-  {"font", FONT},
+  {"dynamicscript", DYNAMICSCRIPT},
+  {"grobdescriptions", GROBDESCRIPTIONS},
+  {"figures",FIGURES},
   {"grace", GRACE},
+  {"glissando", GLISSANDO},
   {"header", HEADER},
   {"in", IN_T},
   {"lyrics", LYRICS},
   {"key", KEY},
-  {"keysignature", KEYSIGNATURE},
   {"mark", MARK},
-  {"musicalpitch", MUSICAL_PITCH},
+  {"once", ONCE},
+  {"pitch", PITCH},
   {"time", TIME_T},
   {"times", TIMES},
   {"midi", MIDI},
   {"mm", MM_T},
   {"name", NAME},
-  {"notenames", NOTENAMES},
+  {"pitchnames", PITCHNAMES},
   {"notes", NOTES},
   {"outputproperty", OUTPUTPROPERTY},
+  {"override", OVERRIDE},
+  {"set", SET},
+  {"rest", REST},
+  {"revert", REVERT},
   {"partial", PARTIAL},
   {"paper", PAPER},
   {"penalty", PENALTY},
@@ -66,76 +80,77 @@ static Keyword_ent the_key_tab[]={
   {"relative", RELATIVE},
   {"remove", REMOVE},
   {"repeat", REPEAT},
-  {"repetitions", REPETITIONS},
   {"addlyrics", ADDLYRICS},
+  {"partcombine", PARTCOMBINE},
   {"score", SCORE},
   {"script", SCRIPT},
+  {"stylesheet", STYLESHEET},
   {"skip", SKIP},
-  {"textscript", TEXTSCRIPT},
   {"tempo", TEMPO},
   {"translator", TRANSLATOR},
   {"transpose", TRANSPOSE},
   {"type", TYPE},
+  {"unset", UNSET},
   {0,0}
 };
 
-My_lily_lexer::My_lily_lexer()
+My_lily_lexer::My_lily_lexer ()
 {
-  keytable_p_ = new Keyword_table (the_key_tab);
-  toplevel_scope_p_ = new Scope;
-  scope_l_arr_.push (toplevel_scope_p_);
-  errorlevel_i_ = 0;
+  keytable_ = new Keyword_table (the_key_tab);
+  toplevel_variable_tab_ = new Scheme_hash_table ;
+  scopes_.push (toplevel_variable_tab_);
+  
+  errorlevel_ = 0;
   main_input_b_ = false;
 }
 
 int
 My_lily_lexer::lookup_keyword (String s)
 {
-  return keytable_p_->lookup (s.ch_C ());
+  return keytable_->lookup (s.to_str0 ());
 }
 
-Identifier*
+SCM
 My_lily_lexer::lookup_identifier (String s)
 {
-  SCM sym = ly_symbol2scm (s.ch_C());
+  SCM sym = ly_symbol2scm (s.to_str0 ());
   
-  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;
+  for (int i = scopes_.size (); i--;)
+    {
+      SCM val = SCM_UNSPECIFIED;
+      if (scopes_[i]->try_retrieve (sym, &val))
+       return val;
+    }
+  return SCM_UNSPECIFIED;
 }
 
 void
 My_lily_lexer::start_main_input ()
 {  
-  new_input (main_input_str_, source_global_l);
-  allow_includes_b_ = allow_includes_b_ &&  !(safe_global_b);
+  new_input (main_input_string_, &global_input_file->sources_);
+  allow_includes_b_ = allow_includes_b_ &&  ! (safe_global_b);
 }
 
 void
-My_lily_lexer::set_identifier (String name_str, Identifier* i, bool )
+My_lily_lexer::set_identifier (SCM name, SCM s)
 {
-  Identifier *old =0;
-  if (scope_l_arr_.top ()->elem_b (name_str))
-    old = scope_l_arr_.top ()->elem(name_str);
- 
-   
-  if  (old)
-    {
-      delete old;
-    }
-  if (lookup_keyword (name_str) >= 0)
+  assert (gh_string_p (name));
+  
+  if (lookup_keyword (ly_scm2string (name)) >= 0)
     {
-      warning (  _f ("Identifier name is a keyword: `%s'", name_str));
+      size_t sz;
+      char * str = gh_scm2newstr (name, &sz) ;
+      warning (_f ("Identifier name is a keyword: `%s'", str));
+      free  (str);
     }
   
-  scope_l_arr_.top ()->elem (name_str) = i;
+  scopes_.top ()->set (scm_string_to_symbol (name), s);
 }
 
-My_lily_lexer::~My_lily_lexer()
+My_lily_lexer::~My_lily_lexer ()
 {
-  delete keytable_p_;
-  delete toplevel_scope_p_ ;
+  delete keytable_;
+  scm_gc_unprotect_object (toplevel_variable_tab_->self_scm ());
 }
 
 
@@ -143,22 +158,22 @@ My_lily_lexer::~My_lily_lexer()
 void
 My_lily_lexer::LexerError (char const *s)
 {
-  if (include_stack_.empty())
+  if (include_stack_.empty ())
     {
       progress_indication (_f ("error at EOF: %s", s)+ String ("\n"));
     }
   else
     {
-      errorlevel_i_ |= 1;
-      Input spot (source_file_l(),here_ch_C());
+      errorlevel_ |= 1;
+      Input spot (get_source_file (),here_str0 ());
       spot.error (s);
     }
 }
 
 char
-My_lily_lexer::escaped_char(char c) const
+My_lily_lexer::escaped_char (char c) const
 {
-  switch(c)
+  switch (c)
     {
     case 'n':
       return '\n';
@@ -176,6 +191,6 @@ My_lily_lexer::escaped_char(char c) const
 Input
 My_lily_lexer::here_input () const
 {
-  Source_file * f_l= source_file_l ();
-  return Input (f_l, (char*)here_ch_C ());
+  Source_file * f= get_source_file ();
+  return Input (f, (char*)here_str0 ());
 }