* lily/paper-score.cc (process): Do not show progress newline.

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index d957e4b3defdf291f19b763fcd1c4c3dcfa22e94..a2ad7efaf0328c28078f70a7515645f34c6adb6f 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -12,7 +12,6 @@
 #include "lily-proto.hh"
 #include "scm-hash.hh"
 #include "interval.hh"
-#include "input-file-results.hh"
 #include "lily-guile.hh"
 #include "parser.hh"
 #include "keyword.hh"
@@ -26,19 +25,13 @@
 
 
 static Keyword_ent the_key_tab[] = {
-  {"acciaccatura", ACCIACCATURA},
   {"accepts", ACCEPTS},
-  {"addlyrics", ADDLYRICS},
   {"addquote", ADDQUOTE},
   {"alias", ALIAS},
   {"alternative", ALTERNATIVE},
-  {"apply", APPLY},
-  {"applycontext", APPLYCONTEXT},
-  {"applyoutput", APPLYOUTPUT},
-  {"appoggiatura", APPOGGIATURA},
-  {"autochange", AUTOCHANGE},
   {"bar", BAR},
-  {"breathe", BREATHE},
+  {"book", BOOK},
+  {"bookpaper", BOOKPAPER},
   {"change", CHANGE},
   {"chords", CHORDS},
   {"clef", CLEF},
@@ -50,23 +43,22 @@ static Keyword_ent the_key_tab[] = {
   {"drums", DRUMS},
   {"description", DESCRIPTION},
   {"figures",FIGURES},
-  {"grace", GRACE},
   {"grobdescriptions", GROBDESCRIPTIONS},
   {"header", HEADER},
   {"key", KEY},
   {"lyrics", LYRICS},
-  {"lyricsto", NEWADDLYRICS},
+  {"lyricsto", LYRICSTO},
   {"mark", MARK},
   {"markup", MARKUP},
   {"midi", MIDI},
   {"name", NAME},
   {"new", NEWCONTEXT},
+  {"newlyrics", NEWLYRICS},
   {"notes", NOTES},
   {"octave", OCTAVE},
   {"once", ONCE},
   {"override", OVERRIDE},
   {"paper", PAPER},
-  {"partcombine", PARTCOMBINE},
   {"partial", PARTIAL},
   {"quote", QUOTE},
   {"relative", RELATIVE},
@@ -92,35 +84,53 @@ static Keyword_ent the_key_tab[] = {
 };
 
 
-My_lily_lexer::My_lily_lexer ()
+My_lily_lexer::My_lily_lexer (Sources *sources)
 {
   keytable_ = new Keyword_table (the_key_tab);
-
+  encoding_ = SCM_EOL;
   chordmodifier_tab_ = scm_make_vector (scm_int2num (1), SCM_EOL);
   pitchname_tab_stack_ = SCM_EOL; 
-  
+  sources_ = sources;
   scopes_ = SCM_EOL;
+  error_level_ = 0; 
+  main_input_b_ = false;
   
-  add_scope (ly_make_anonymous_module ());
-  errorlevel_ = 0; 
+  add_scope (ly_make_anonymous_module (false));
+}
 
-  main_input_b_ = false;
+My_lily_lexer::My_lily_lexer (My_lily_lexer const &src)
+  : Includable_lexer ()
+{
+  keytable_ = new Keyword_table (*src.keytable_);
+  encoding_ = src.encoding_;
+  chordmodifier_tab_ = src.chordmodifier_tab_;
+  pitchname_tab_stack_ = src.pitchname_tab_stack_;
+  sources_ = src.sources_;
+  scopes_ = src.scopes_;
+  error_level_ = src.error_level_; 
+  main_input_b_ = src.main_input_b_;
 }
 
+My_lily_lexer::~My_lily_lexer ()
+{
+  delete keytable_;
+}
+
+SCM
+My_lily_lexer::encoding () const
+{
+  return encoding_ ;
+}
+
+
 void
 My_lily_lexer::add_scope (SCM module)
 {
   ly_reexport_module (scm_current_module ());
   scm_set_current_module (module);
-  for (SCM s = scopes_; ly_pair_p (s); s = ly_cdr (s))
+  for (SCM s = scopes_; ly_c_pair_p (s); s = ly_cdr (s))
     {
-      /* UGH. how to do this more neatly? */      
-      SCM expr
-       = scm_list_3 (ly_symbol2scm ("module-use!"),
-                     module,
-                     scm_list_2 (ly_symbol2scm ("module-public-interface"),
-                                 ly_car (s)));
-      scm_primitive_eval (expr);
+      ly_use_module (module, ly_car (s));
     }
   scopes_ = scm_cons (module, scopes_);
 }
@@ -143,10 +153,9 @@ My_lily_lexer::lookup_keyword (String s)
 }
 
 SCM
-My_lily_lexer::lookup_identifier (String s)
+My_lily_lexer::lookup_identifier_symbol (SCM sym)
 {
-  SCM sym = ly_symbol2scm (s.to_str0());
-  for (SCM s = scopes_; ly_pair_p (s); s = ly_cdr (s))
+  for (SCM s = scopes_; ly_c_pair_p (s); s = ly_cdr (s))
     {
       SCM var = ly_module_lookup (ly_car (s), sym);
       if (var != SCM_BOOL_F)
@@ -156,12 +165,17 @@ My_lily_lexer::lookup_identifier (String s)
   return SCM_UNDEFINED;
 }
 
+SCM
+My_lily_lexer::lookup_identifier (String name)
+{
+  return lookup_identifier_symbol ( ly_symbol2scm (name.to_str0 ()));
+}
+
 void
 My_lily_lexer::start_main_input ()
 {
   // yy_flex_debug = 1;
-
-  new_input (main_input_name_, &global_input_file->sources_);
+  new_input (main_input_name_, sources_);
   /* Do not allow \include in --safe-mode */
   allow_includes_b_ = allow_includes_b_ && ! safe_global_b;
 
@@ -173,22 +187,26 @@ My_lily_lexer::start_main_input ()
 void
 My_lily_lexer::set_identifier (SCM name, SCM s)
 {
-  assert (ly_string_p (name));
+  SCM sym = name;
+  if (ly_c_string_p (name))
+    sym =  scm_string_to_symbol (name);
   
-  if (lookup_keyword (ly_scm2string (name)) >= 0)
+  if (ly_c_symbol_p (sym))
     {
-      warning (_f ("Identifier name is a keyword: `%s'", SCM_STRING_CHARS (name)));
-    }
-
-  SCM sym = scm_string_to_symbol (name);
-  SCM mod = ly_car (scopes_);
+      if (lookup_keyword (ly_symbol2string (sym)) >= 0)
+       {
+         warning (_f ("Identifier name is a keyword: `%s'", SCM_SYMBOL_CHARS (sym)));
+       }
 
-  scm_module_define (mod, sym, s);
-}
+      SCM mod = ly_car (scopes_);
 
-My_lily_lexer::~My_lily_lexer ()
-{
-  delete keytable_;
+      scm_module_define (mod, sym, s);
+    }
+  
+  else
+    {
+      programming_error ("Identifier is not a symbol.");
+    }
 }
 
 
@@ -200,7 +218,7 @@ My_lily_lexer::LexerError (char const *s)
     progress_indication (_f ("error at EOF: %s", s) + String ("\n"));
   else
     {
-      errorlevel_ |= 1;
+      error_level_ |= 1;
       Input spot (get_source_file (), here_str0 ());
       spot.error (s);
     }
@@ -240,5 +258,8 @@ My_lily_lexer::prepare_for_next_token ()
 void
 My_lily_lexer::set_encoding (String s)
 {
-  encoding_ = s;
+  if (s.length ())
+    encoding_ = ly_symbol2scm (s.to_str0 ());
+  else
+    encoding_ = SCM_EOL;
 }