release: 1.3.146

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index a20e1df14a7662d8909cc02a2707b97bee7b9323..3a41467abcf1bac7d78492a01159c4410cbdbf72 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -3,14 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <strstream.h>
 #include <ctype.h>
 
+#include "lily-proto.hh"
+#include "scm-hash.hh"
 #include "interval.hh"
-#include "identifier.hh"
+
 #include "lily-guile.hh"
 #include "parser.hh"
 #include "keyword.hh"
@@ -23,8 +25,10 @@
 #include "moment.hh"
 
 static Keyword_ent the_key_tab[]={
-  {"autochange", AUTOCHANGE},
+  {"alias", ALIAS},
+  {"apply", APPLY},
   {"arpeggio", ARPEGGIO },
+  {"autochange", AUTOCHANGE},
   {"spanrequest", SPANREQUEST},
   {"commandspanrequest", COMMANDSPANREQUEST},  
   {"simultaneous", SIMULTANEOUS},
@@ -41,27 +45,31 @@ static Keyword_ent the_key_tab[]={
   {"consists", CONSISTS},
   {"consistsend", CONSISTSEND},
   {"context", CONTEXT},
+  {"default", DEFAULT},
   {"denies", DENIES},
   {"duration", DURATION},
   {"dynamicscript", DYNAMICSCRIPT},
+  {"elementdescriptions", ELEMENTDESCRIPTIONS},
   {"font", FONT},
   {"grace", GRACE},
+  {"glissando", GLISSANDO},
   {"header", HEADER},
   {"in", IN_T},
   {"lyrics", LYRICS},
   {"key", KEY},
   {"mark", MARK},
-  {"musicalpitch", MUSICAL_PITCH},
+  {"pitch", PITCH},
   {"time", TIME_T},
   {"times", TIMES},
   {"midi", MIDI},
   {"mm", MM_T},
   {"name", NAME},
-  {"notenames", NOTENAMES},
+  {"pitchnames", PITCHNAMES},
   {"notes", NOTES},
   {"outputproperty", OUTPUTPROPERTY},
-  {"push", PUSH},
-  {"pop", POP},
+  {"override", OVERRIDE},
+  {"set", SET},
+  {"revert", REVERT},
   {"partial", PARTIAL},
   {"paper", PAPER},
   {"penalty", PENALTY},
@@ -74,20 +82,24 @@ static Keyword_ent the_key_tab[]={
   {"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_);
+  toplevel_variable_tab_ = new Scheme_hash_table ;
+  scope_p_ = new Scope (toplevel_variable_tab_);
+  
+  scope_l_arr_.push (scope_p_);
+  
   errorlevel_i_ = 0;
   main_input_b_ = false;
 }
@@ -101,9 +113,9 @@ My_lily_lexer::lookup_keyword (String s)
 SCM
 My_lily_lexer::lookup_identifier (String s)
 {
-  SCM sym = ly_symbol2scm (s.ch_C());
+  SCM sym = ly_symbol2scm (s.ch_C ());
   
-  for (int i = scope_l_arr_.size (); i--; )
+  for (int i = scope_l_arr_.size (); i--;)
     {
       SCM val = SCM_UNSPECIFIED;
       if (scope_l_arr_[i]->try_retrieve (sym, &val))
@@ -116,7 +128,7 @@ void
 My_lily_lexer::start_main_input ()
 {  
   new_input (main_input_str_, source_global_l);
-  allow_includes_b_ = allow_includes_b_ &&  !(safe_global_b);
+  allow_includes_b_ = allow_includes_b_ &&  ! (safe_global_b);
 }
 
 void
@@ -124,16 +136,17 @@ My_lily_lexer::set_identifier (String name_str, SCM s)
 {
   if (lookup_keyword (name_str) >= 0)
     {
-      warning (  _f ("Identifier name is a keyword: `%s'", name_str));
+      warning (_f ("Identifier name is a keyword: `%s'", name_str));
     }
   
   scope_l_arr_.top ()->set (name_str, s);
 }
 
-My_lily_lexer::~My_lily_lexer()
+My_lily_lexer::~My_lily_lexer ()
 {
   delete keytable_p_;
-  delete toplevel_scope_p_ ;
+  scm_unprotect_object (toplevel_variable_tab_->self_scm ());
+  delete scope_p_ ;
 }
 
 
@@ -141,22 +154,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());
+      Input spot (source_file_l (),here_ch_C ());
       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';