* lily/my-lily-lexer.cc (set_encoding): New method.

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 9608e94ea126f2d5cb9f9ff3b8a3ccf3dfcbf2ef..941d150715f024fc9d6dae297aa5586d9ea4b5cb 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--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <ctype.h>
@@ -22,13 +22,14 @@
 #include "main.hh"
 #include "input.hh"
 #include "moment.hh"
-#include "ly-modules.hh"
+#include "ly-module.hh"
 
 
-static Keyword_ent the_key_tab[]={
+static Keyword_ent the_key_tab[] = {
   {"acciaccatura", ACCIACCATURA},
   {"accepts", ACCEPTS},
   {"addlyrics", ADDLYRICS},
+  {"addquote", ADDQUOTE},
   {"alias", ALIAS},
   {"alternative", ALTERNATIVE},
   {"apply", APPLY},
@@ -39,7 +40,6 @@ static Keyword_ent the_key_tab[]={
   {"bar", BAR},
   {"breathe", BREATHE},
   {"change", CHANGE},
-  {"chordmodifiers", CHORDMODIFIERS},
   {"chords", CHORDS},
   {"clef", CLEF},
   {"consists", CONSISTS},
@@ -47,6 +47,7 @@ static Keyword_ent the_key_tab[]={
   {"context", CONTEXT},
   {"default", DEFAULT},
   {"denies", DENIES},
+  {"drums", DRUMS},
   {"description", DESCRIPTION},
   {"figures",FIGURES},
   {"grace", GRACE},
@@ -67,8 +68,7 @@ static Keyword_ent the_key_tab[]={
   {"paper", PAPER},
   {"partcombine", PARTCOMBINE},
   {"partial", PARTIAL},
-  {"pitchnames", PITCHNAMES},
-  {"property", PROPERTY},
+  {"quote", QUOTE},
   {"relative", RELATIVE},
   {"remove", REMOVE},
   {"repeat", REPEAT},
@@ -83,28 +83,26 @@ static Keyword_ent the_key_tab[]={
   {"tempo", TEMPO},
   {"time", TIME_T},
   {"times", TIMES},
-  {"translator", TRANSLATOR},
   {"transpose", TRANSPOSE},
+  {"transposition", TRANSPOSITION},
   {"type", TYPE},
   {"unset", UNSET},
   {"with", WITH},
-  {0,0}
+  {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);
+  pitchname_tab_stack_ = SCM_EOL; 
   
   scopes_ = SCM_EOL;
   
-  add_scope(ly_make_anonymous_module());
-  errorlevel_ =0; 
+  add_scope (ly_make_anonymous_module ());
+  errorlevel_ = 0; 
 
   main_input_b_ = false;
 }
@@ -112,21 +110,18 @@ 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))
     {
-      /*
-       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),
-                            SCM_UNDEFINED);
-      
-      scm_primitive_eval(expr);
+      /* 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"),
+                                 gh_car (s)));
+      scm_primitive_eval (expr);
     }
-  
   scopes_ = scm_cons (module, scopes_);
 }
 
@@ -155,7 +150,7 @@ My_lily_lexer::lookup_identifier (String s)
     {
       SCM var = ly_module_lookup (gh_car (s), sym);
       if (var != SCM_BOOL_F)
-       return scm_variable_ref(var);
+       return scm_variable_ref (var);
     }
 
   return SCM_UNDEFINED;
@@ -163,13 +158,16 @@ My_lily_lexer::lookup_identifier (String s)
 
 void
 My_lily_lexer::start_main_input ()
-{  
+{
+  // yy_flex_debug = 1;
+
   new_input (main_input_name_, &global_input_file->sources_);
-  allow_includes_b_ = allow_includes_b_ &&  ! (safe_global_b);
+  /* Do not allow \include in --safe-mode */
+  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()));
+                    scm_makfrom0str (main_input_name_.to_str0 ()));
 }
 
 void
@@ -201,10 +199,8 @@ My_lily_lexer::~My_lily_lexer ()
 void
 My_lily_lexer::LexerError (char const *s)
 {
-  if (include_stack_.empty ())
-    {
-      progress_indication (_f ("error at EOF: %s", s)+ String ("\n"));
-    }
+  if (include_stack_.is_empty ())
+    progress_indication (_f ("error at EOF: %s", s) + String ("\n"));
   else
     {
       errorlevel_ |= 1;
@@ -241,5 +237,11 @@ My_lily_lexer::here_input () const
 void
 My_lily_lexer::prepare_for_next_token ()
 {
-  last_input_ = here_input();
+  last_input_ = here_input ();
+}
+
+void
+My_lily_lexer::set_encoding (String s)
+{
+  encoding_ = s;
 }