X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmy-lily-lexer.cc;h=44843e402adc9850319b45cae997752afe73fee5;hb=f988425624a6f6d1a48aea0ac0c1c84ff0857e56;hp=c1051d60191501cc9cc7ccf7af1e4a28b2f17370;hpb=76014fe170f4217374f4726d54c2a46c60f73e67;p=lilypond.git

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index c1051d6019..44843e402a 100644
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -3,14 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <strstream.h>
 #include <ctype.h>
-#include "notename-table.hh"
+
 #include "interval.hh"
 #include "identifier.hh"
+#include "lily-guile.hh"
 #include "parser.hh"
 #include "keyword.hh"
 #include "my-lily-lexer.hh"
@@ -19,16 +20,19 @@
 #include "main.hh"
 #include "scope.hh"
 #include "input.hh"
+#include "moment.hh"
 
 static Keyword_ent the_key_tab[]={
+  {"autochange", AUTOCHANGE},
   {"spanrequest", SPANREQUEST},
+  {"commandspanrequest", COMMANDSPANREQUEST},  
   {"simultaneous", SIMULTANEOUS},
   {"sequential", SEQUENTIAL},
   {"accepts", ACCEPTS},
   {"alternative", ALTERNATIVE},
   {"bar", BAR},
   {"breathe", BREATHE},
-  {"cadenza", CADENZA},
+  {"char", CHAR_T},
   {"chordmodifiers", CHORDMODIFIERS},
   {"chords", CHORDS},
   {"clef", CLEF},
@@ -36,6 +40,7 @@ static Keyword_ent the_key_tab[]={
   {"consists", CONSISTS},
   {"consistsend", CONSISTSEND},
   {"context", CONTEXT},
+  {"denies", DENIES},
   {"duration", DURATION},
   {"font", FONT},
   {"grace", GRACE},
@@ -43,7 +48,6 @@ static Keyword_ent the_key_tab[]={
   {"in", IN_T},
   {"lyrics", LYRICS},
   {"key", KEY},
-  {"keysignature", KEYSIGNATURE},
   {"mark", MARK},
   {"musicalpitch", MUSICAL_PITCH},
   {"time", TIME_T},
@@ -53,6 +57,11 @@ static Keyword_ent the_key_tab[]={
   {"name", NAME},
   {"notenames", NOTENAMES},
   {"notes", NOTES},
+  {"outputproperty", OUTPUTPROPERTY},
+  {"pushproperty", PUSHPROPERTY},
+  {"popproperty", POPPROPERTY},
+  {"push", PUSH},
+  {"pop", POP},
   {"partial", PARTIAL},
   {"paper", PAPER},
   {"penalty", PENALTY},
@@ -61,20 +70,16 @@ static Keyword_ent the_key_tab[]={
   {"relative", RELATIVE},
   {"remove", REMOVE},
   {"repeat", REPEAT},
-  {"repetitions", REPETITIONS},
   {"addlyrics", ADDLYRICS},
-  {"scm", SCM_T},
-  {"scmfile", SCMFILE},
+  {"partcombine", PARTCOMBINE},
   {"score", SCORE},
   {"script", SCRIPT},
-  {"shape", SHAPE},
   {"skip", SKIP},
   {"textscript", TEXTSCRIPT},
   {"tempo", TEMPO},
   {"translator", TRANSLATOR},
   {"transpose", TRANSPOSE},
   {"type", TYPE},
-  {"version", VERSION},
   {0,0}
 };
 
@@ -84,8 +89,6 @@ My_lily_lexer::My_lily_lexer()
   toplevel_scope_p_ = new Scope;
   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;
 }
 
@@ -95,81 +98,52 @@ My_lily_lexer::lookup_keyword (String s)
   return keytable_p_->lookup (s.ch_C ());
 }
 
-Identifier*
+SCM
 My_lily_lexer::lookup_identifier (String s)
 {
-  SCM sym = ly_symbol (s.ch_C());
+  SCM sym = ly_symbol2scm (s.ch_C());
   
   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;
+    {
+      SCM val = SCM_UNSPECIFIED;
+      if (scope_l_arr_[i]->try_retrieve (sym, &val))
+	return val;
+    }
+  return SCM_UNSPECIFIED;
 }
 
 void
 My_lily_lexer::start_main_input ()
 {  
-  if (!lily_monitor->silent_b ("InitDeclarations") && check_debug)
-    print_declarations (true);
-  if (!lily_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);
+  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 (String name_str, SCM s)
 {
-  Identifier *old =0;
-  if (scope_l_arr_.top ()->elem_b (name_str))
-    old = scope_l_arr_.top ()->elem(name_str);
- 
-   
-  if  (old)
-    {
-#if 0
-      if (unique_b)
-	old->warning(_f ("redeclaration of `\\%s\'", name_str));
-#endif
-      delete old;
-    }
   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 ()->elem (name_str) = i;
+  scope_l_arr_.top ()->set (name_str, s);
 }
 
 My_lily_lexer::~My_lily_lexer()
 {
-  delete chordmodifier_tab_p_;
   delete keytable_p_;
   delete toplevel_scope_p_ ;
-  delete note_tab_p_;
 }
 
-void
-My_lily_lexer::print_declarations (bool ) const
-{
-  for (int i=scope_l_arr_.size (); i--; )
-    {
-      DOUT << "Scope no. " << i << '\n';
-      scope_l_arr_[i]->print ();
-    }
-}
+
 
 void
 My_lily_lexer::LexerError (char const *s)
 {
   if (include_stack_.empty())
     {
-      *mlog << _f ("error at EOF: %s", s) << endl;
+      progress_indication (_f ("error at EOF: %s", s)+ String ("\n"));
     }
   else
     {
@@ -179,44 +153,6 @@ My_lily_lexer::LexerError (char const *s)
     }
 }
 
-Musical_pitch
-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
-{
-  return note_tab_p_->elem_b (s);
-}
-
-void
-My_lily_lexer::set_notename_table (Notename_table *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_chordmodifier_table (Notename_table *p)
-{
-  delete chordmodifier_tab_p_;
-  chordmodifier_tab_p_ = p;
-}
-
 char
 My_lily_lexer::escaped_char(char c) const
 {