* lily/auto-beam-engraver.cc (process_music): end/junk beam if

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 5dcab4430bb88f34893a46cfcbc1cd6c3340c4a0..bd57eb0899ddb7e365d0d8f27d9ef4fabf7d1cd1 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -3,11 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <ctype.h>
-
 #include <sstream>
 
 #include "lily-proto.hh"
@@ -23,70 +22,65 @@
 #include "main.hh"
 #include "input.hh"
 #include "moment.hh"
+#include "ly-modules.hh"
+
 
 static Keyword_ent the_key_tab[]={
+  {"acciaccatura", ACCIACCATURA},
+  {"accepts", ACCEPTS},
+  {"addlyrics", ADDLYRICS},
   {"alias", ALIAS},
+  {"alternative", ALTERNATIVE},
   {"apply", APPLY},
-  {"arpeggio", ARPEGGIO },
+  {"applycontext", APPLYCONTEXT},
+  {"applyoutput", APPLYOUTPUT},
+  {"appoggiatura", APPOGGIATURA},
   {"autochange", AUTOCHANGE},
-  {"spanrequest", SPANREQUEST},
-  {"commandspanrequest", COMMANDSPANREQUEST},  
-  {"simultaneous", SIMULTANEOUS},
-  {"sequential", SEQUENTIAL},
-  {"accepts", ACCEPTS},
-  {"alternative", ALTERNATIVE},
   {"bar", BAR},
   {"breathe", BREATHE},
-  {"char", CHAR_T},
   {"chordmodifiers", CHORDMODIFIERS},
   {"chords", CHORDS},
   {"clef", CLEF},
-  {"cm", CM_T},
   {"consists", CONSISTS},
   {"consistsend", CONSISTSEND},
   {"context", CONTEXT},
   {"default", DEFAULT},
   {"denies", DENIES},
-  {"duration", DURATION},
-  {"dynamicscript", DYNAMICSCRIPT},
-  {"grobdescriptions", GROBDESCRIPTIONS},
+  {"description", DESCRIPTION},
   {"figures",FIGURES},
   {"grace", GRACE},
-  {"glissando", GLISSANDO},
+  {"grobdescriptions", GROBDESCRIPTIONS},
   {"header", HEADER},
-  {"in", IN_T},
-  {"lyrics", LYRICS},
   {"key", KEY},
+  {"lyrics", LYRICS},
   {"mark", MARK},
-  {"once", ONCE},
-  {"pitch", PITCH},
-  {"time", TIME_T},
-  {"times", TIMES},
+  {"markup", MARKUP},
   {"midi", MIDI},
-  {"mm", MM_T},
   {"name", NAME},
-  {"pitchnames", PITCHNAMES},
+  {"new", NEWCONTEXT},
   {"notes", NOTES},
-  {"outputproperty", OUTPUTPROPERTY},
+  {"octave", OCTAVE},
+  {"once", ONCE},
   {"override", OVERRIDE},
-  {"set", SET},
-  {"rest", REST},
-  {"revert", REVERT},
-  {"partial", PARTIAL},
   {"paper", PAPER},
-  {"penalty", PENALTY},
+  {"partcombine", PARTCOMBINE},
+  {"partial", PARTIAL},
+  {"pitchnames", PITCHNAMES},
   {"property", PROPERTY},
-  {"pt", PT_T},
   {"relative", RELATIVE},
   {"remove", REMOVE},
   {"repeat", REPEAT},
-  {"addlyrics", ADDLYRICS},
-  {"partcombine", PARTCOMBINE},
+  {"rest", REST},
+  {"revert", REVERT},
   {"score", SCORE},
-  {"script", SCRIPT},
-  {"stylesheet", STYLESHEET},
+  {"sequential", SEQUENTIAL},
+  {"set", SET},
+  {"simultaneous", SIMULTANEOUS},
   {"skip", SKIP},
+  {"tag", TAG},
   {"tempo", TEMPO},
+  {"time", TIME_T},
+  {"times", TIMES},
   {"translator", TRANSLATOR},
   {"transpose", TRANSPOSE},
   {"type", TYPE},
@@ -97,10 +91,17 @@ static Keyword_ent the_key_tab[]={
 
 My_lily_lexer::My_lily_lexer ()
 {
+  //  yy_flex_debug = 1;
+  
   keytable_ = new Keyword_table (the_key_tab);
+
+  chordmodifier_tab_ = scm_make_vector (gh_int2scm (1), SCM_EOL);
+  pitchname_tab_ = scm_make_vector (gh_int2scm (1), SCM_EOL);
+  
   scopes_ = SCM_EOL;
   
   add_scope(ly_make_anonymous_module());
+  errorlevel_ =0; 
 
   main_input_b_ = false;
 }
@@ -108,9 +109,13 @@ My_lily_lexer::My_lily_lexer ()
 void
 My_lily_lexer::add_scope (SCM module)
 {
+  ly_reexport_module (scm_current_module());
   scm_set_current_module (module);
   for (SCM s = scopes_; gh_pair_p (s); s = gh_cdr (s))
     {
+      /*
+       UGH. how to do this more neatly? 
+      */      
       SCM expr = scm_list_n (ly_symbol2scm ("module-use!"),
                             module, scm_list_n (ly_symbol2scm ("module-public-interface"),
                                                 gh_car (s), SCM_UNDEFINED),
@@ -120,7 +125,6 @@ My_lily_lexer::add_scope (SCM module)
     }
   
   scopes_ = scm_cons (module, scopes_);
-  scm_display (scm_current_module(), scm_current_output_port());
 }
 
 SCM
@@ -145,12 +149,13 @@ My_lily_lexer::lookup_identifier (String s)
 {
   SCM sym = ly_symbol2scm (s.to_str0());
   for (SCM s = scopes_; gh_pair_p (s); s = gh_cdr (s))
-  {
-    SCM var = scm_module_lookup (gh_car (s), sym);
-    return scm_variable_ref (var);
-  }
+    {
+      SCM var = ly_module_lookup (gh_car (s), sym);
+      if (var != SCM_BOOL_F)
+       return scm_variable_ref(var);
+    }
 
-  return SCM_UNSPECIFIED;
+  return SCM_UNDEFINED;
 }
 
 void
@@ -158,6 +163,10 @@ My_lily_lexer::start_main_input ()
 {  
   new_input (main_input_string_, &global_input_file->sources_);
   allow_includes_b_ = allow_includes_b_ &&  ! (safe_global_b);
+
+  scm_module_define (gh_car (scopes_),
+                    ly_symbol2scm ("input-file-name"),
+                    scm_makfrom0str (main_input_string_.to_str0()));
 }
 
 void
@@ -175,11 +184,8 @@ My_lily_lexer::set_identifier (SCM name, SCM s)
 
   SCM sym = scm_string_to_symbol (name);
   SCM mod = gh_car (scopes_);
-  SCM var = scm_module_lookup (mod, ly_symbol2scm ("symbols-defined-here"));
 
-  scm_variable_set_x (var, gh_cons (sym,  scm_variable_ref (var)));
   scm_module_define (mod, sym, s);
-  scm_c_export (ly_symbol2string(sym).to_str0(), NULL);
 }
 
 My_lily_lexer::~My_lily_lexer ()
@@ -199,7 +205,7 @@ My_lily_lexer::LexerError (char const *s)
   else
     {
       errorlevel_ |= 1;
-      Input spot (get_source_file (),here_str0 ());
+      Input spot (get_source_file (), here_str0 ());
       spot.error (s);
     }
 }
@@ -228,3 +234,9 @@ My_lily_lexer::here_input () const
   Source_file * f= get_source_file ();
   return Input (f, (char*)here_str0 ());
 }
+
+void
+My_lily_lexer::prepare_for_next_token ()
+{
+  last_input_ = here_input();
+}