* ly/engraver-init.ly (AncientRemoveEmptyStaffContext): move

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 2c1faf4cfb3c3075b607709ff67ea08760c61c29..2a8d3e8cb567aadc936a2f4c7e2090c6a0e2e05e 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <ctype.h>
@@ -26,16 +26,19 @@
 
 
 static Keyword_ent the_key_tab[]={
+  {"acciaccatura", ACCIACCATURA},
+  {"accepts", ACCEPTS},
+  {"addlyrics", ADDLYRICS},
   {"alias", ALIAS},
+  {"alternative", ALTERNATIVE},
   {"apply", APPLY},
   {"applycontext", APPLYCONTEXT},
+  {"applyoutput", APPLYOUTPUT},
+  {"appoggiatura", APPOGGIATURA},
   {"autochange", AUTOCHANGE},
-  {"simultaneous", SIMULTANEOUS},
-  {"sequential", SEQUENTIAL},
-  {"accepts", ACCEPTS},
-  {"alternative", ALTERNATIVE},
   {"bar", BAR},
   {"breathe", BREATHE},
+  {"change", CHANGE},
   {"chordmodifiers", CHORDMODIFIERS},
   {"chords", CHORDS},
   {"clef", CLEF},
@@ -44,50 +47,61 @@ static Keyword_ent the_key_tab[]={
   {"context", CONTEXT},
   {"default", DEFAULT},
   {"denies", DENIES},
-  {"duration", DURATION},
-  {"grobdescriptions", GROBDESCRIPTIONS},
+  {"description", DESCRIPTION},
   {"figures",FIGURES},
   {"grace", GRACE},
+  {"grobdescriptions", GROBDESCRIPTIONS},
   {"header", HEADER},
-  {"lyrics", LYRICS},
   {"key", KEY},
+  {"lyrics", LYRICS},
+  {"lyricsto", NEWADDLYRICS},
   {"mark", MARK},
   {"markup", MARKUP},
-  {"once", ONCE},
-  {"pitch", PITCH},
-  {"time", TIME_T},
-  {"times", TIMES},
   {"midi", MIDI},
   {"name", NAME},
-  {"pitchnames", PITCHNAMES},
+  {"new", NEWCONTEXT},
+  {"newpartcombine", NEWPARTCOMBINE},
   {"notes", NOTES},
-  {"outputproperty", OUTPUTPROPERTY},
+  {"octave", OCTAVE},
+  {"once", ONCE},
   {"override", OVERRIDE},
-  {"set", SET},
-  {"rest", REST},
-  {"revert", REVERT},
-  {"partial", PARTIAL},
   {"paper", PAPER},
+  {"partcombine", PARTCOMBINE},
+  {"partial", PARTIAL},
+  {"pitchnames", PITCHNAMES},
   {"property", PROPERTY},
   {"relative", RELATIVE},
   {"remove", REMOVE},
   {"repeat", REPEAT},
-  {"addlyrics", ADDLYRICS},
-  {"partcombine", PARTCOMBINE},
+  {"rest", REST},
+  {"revert", REVERT},
   {"score", SCORE},
+  {"sequential", SEQUENTIAL},
+  {"set", SET},
+  {"simultaneous", SIMULTANEOUS},
   {"skip", SKIP},
+  {"tag", TAG},
   {"tempo", TEMPO},
+  {"time", TIME_T},
+  {"times", TIMES},
   {"translator", TRANSLATOR},
   {"transpose", TRANSPOSE},
   {"type", TYPE},
   {"unset", UNSET},
+  {"with", WITH},
   {0,0}
 };
 
 
 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());
@@ -145,14 +159,18 @@ My_lily_lexer::lookup_identifier (String s)
        return scm_variable_ref(var);
     }
 
-  return SCM_UNSPECIFIED;
+  return SCM_UNDEFINED;
 }
 
 void
 My_lily_lexer::start_main_input ()
 {  
-  new_input (main_input_string_, &global_input_file->sources_);
+  new_input (main_input_name_, &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_name_.to_str0()));
 }
 
 void
@@ -226,21 +244,3 @@ My_lily_lexer::prepare_for_next_token ()
 {
   last_input_ = here_input();
 }
-
-#if 0
-SCM
-My_lily_lexer::scan_markup_word (String s)
-{
-  /*
-    TODO: better implementation:
-
-    - make a table of markup functions, for quicker lookup
-
-    - error handling.
-    
-   */
-  SCM s = scm_c_eval_str ((s + "-markup").to_str0());
-  yylval.scm = s;
-  return MARKUP_HEAD;
-}
-#endif