* lily/parser.yy (part_combined_music): remove old PC cruft.

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index c1fe8e04b3a86aeb4c3dabf8e0debe87da71c44d..c2ee25616ee264792565ac7cccdf7e6da1db4f41 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -26,6 +26,7 @@
 
 
 static Keyword_ent the_key_tab[]={
+  {"acciaccatura", ACCIACCATURA},
   {"accepts", ACCEPTS},
   {"addlyrics", ADDLYRICS},
   {"alias", ALIAS},
@@ -33,9 +34,11 @@ static Keyword_ent the_key_tab[]={
   {"apply", APPLY},
   {"applycontext", APPLYCONTEXT},
   {"applyoutput", APPLYOUTPUT},
+  {"appoggiatura", APPOGGIATURA},
   {"autochange", AUTOCHANGE},
   {"bar", BAR},
   {"breathe", BREATHE},
+  {"change", CHANGE},
   {"chordmodifiers", CHORDMODIFIERS},
   {"chords", CHORDS},
   {"clef", CLEF},
@@ -45,27 +48,25 @@ static Keyword_ent the_key_tab[]={
   {"default", DEFAULT},
   {"denies", DENIES},
   {"description", DESCRIPTION},
-  {"duration", DURATION},
   {"figures",FIGURES},
   {"grace", GRACE},
   {"grobdescriptions", GROBDESCRIPTIONS},
   {"header", HEADER},
   {"key", KEY},
   {"lyrics", LYRICS},
+  {"lyricsto", NEWADDLYRICS},
   {"mark", MARK},
   {"markup", MARKUP},
   {"midi", MIDI},
   {"name", NAME},
-  {"newcontext", NEWCONTEXT},
+  {"new", NEWCONTEXT},
   {"notes", NOTES},
   {"octave", OCTAVE},
   {"once", ONCE},
-  {"outputproperty", OUTPUTPROPERTY},
   {"override", OVERRIDE},
   {"paper", PAPER},
   {"partcombine", PARTCOMBINE},
   {"partial", PARTIAL},
-  {"pitch", PITCH},
   {"pitchnames", PITCHNAMES},
   {"property", PROPERTY},
   {"relative", RELATIVE},
@@ -78,6 +79,7 @@ static Keyword_ent the_key_tab[]={
   {"set", SET},
   {"simultaneous", SIMULTANEOUS},
   {"skip", SKIP},
+  {"tag", TAG},
   {"tempo", TEMPO},
   {"time", TIME_T},
   {"times", TIMES},
@@ -85,13 +87,20 @@ static Keyword_ent the_key_tab[]={
   {"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());
@@ -103,7 +112,7 @@ My_lily_lexer::My_lily_lexer ()
 void
 My_lily_lexer::add_scope (SCM module)
 {
-  ly_reexport_module (scm_current_module());
+  ly_reexport_module (scm_current_module ());
   scm_set_current_module (module);
   for (SCM s = scopes_; gh_pair_p (s); s = gh_cdr (s))
     {
@@ -155,12 +164,12 @@ My_lily_lexer::lookup_identifier (String s)
 void
 My_lily_lexer::start_main_input ()
 {  
-  new_input (main_input_string_, &global_input_file->sources_);
-  allow_includes_b_ = allow_includes_b_ &&  ! (safe_global_b);
+  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_string_.to_str0()));
+                    scm_makfrom0str (main_input_name_.to_str0 ()));
 }
 
 void
@@ -234,21 +243,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