release: 1.3.0

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 8fd2081c208f3870223e660b60920f01c967a42f..de4ea2373a3faea701568a660891cd17200c36d7 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -11,17 +11,22 @@
 #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"
 #include "debug.hh"
 #include "source-file.hh"
-#include "parseconstruct.hh"
 #include "main.hh"
 #include "scope.hh"
+#include "input.hh"
+#include "moment.hh"
 
 static Keyword_ent the_key_tab[]={
+  {"autochange", AUTOCHANGE},
   {"spanrequest", SPANREQUEST},
+  {"simultaneous", SIMULTANEOUS},
+  {"sequential", SEQUENTIAL},
   {"accepts", ACCEPTS},
   {"alternative", ALTERNATIVE},
   {"bar", BAR},
@@ -36,7 +41,6 @@ static Keyword_ent the_key_tab[]={
   {"context", CONTEXT},
   {"duration", DURATION},
   {"font", FONT},
-  {"grouping", GROUPING},
   {"grace", GRACE},
   {"header", HEADER},
   {"in", IN_T},
@@ -51,7 +55,7 @@ static Keyword_ent the_key_tab[]={
   {"mm", MM_T},
   {"name", NAME},
   {"notenames", NOTENAMES},
-  {"notes" , NOTES},
+  {"notes", NOTES},
   {"partial", PARTIAL},
   {"paper", PAPER},
   {"penalty", PENALTY},
@@ -61,8 +65,7 @@ static Keyword_ent the_key_tab[]={
   {"remove", REMOVE},
   {"repeat", REPEAT},
   {"repetitions", REPETITIONS},
-  {"scm", SCM_T},
-  {"scmfile", SCMFILE},
+  {"addlyrics", ADDLYRICS},
   {"score", SCORE},
   {"script", SCRIPT},
   {"shape", SHAPE},
@@ -107,9 +110,9 @@ My_lily_lexer::lookup_identifier (String s)
 void
 My_lily_lexer::start_main_input ()
 {  
-  if (!monitor->silent_b ("InitDeclarations") && check_debug)
+  if (flower_dstream && !flower_dstream->silent_b ("InitDeclarations") && flower_dstream)
     print_declarations (true);
-  if (!monitor->silent_b ("InitLexer") && check_debug)
+  if (flower_dstream && !flower_dstream->silent_b ("InitLexer") && flower_dstream)
     set_debug (1);
 
 
@@ -132,13 +135,13 @@ My_lily_lexer::set_identifier (String name_str, Identifier* i, bool )
     {
 #if 0
       if (unique_b)
-       old->warning(_f ("redeclaration of `\\%s\'", name_str));
+       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;
@@ -157,7 +160,7 @@ My_lily_lexer::print_declarations (bool ) const
 {
   for (int i=scope_l_arr_.size (); i--; )
     {
-      DOUT << "Scope no. " << i << '\n';
+      DEBUG_OUT << "Scope no. " << i << '\n';
       scope_l_arr_[i]->print ();
     }
 }
@@ -232,3 +235,10 @@ My_lily_lexer::escaped_char(char c) const
     }
   return 0;
 }
+
+Input
+My_lily_lexer::here_input () const
+{
+  Source_file * f_l= source_file_l ();
+  return Input (f_l, (char*)here_ch_C ());
+}