* lily/input-file-results.cc (do_one_file): Remove Paper_book hack.

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index a0a276ccf7ff33d8fcad1a42a0b153c1f59dcf00..6a4016e35c950818578bd101abc246e69605cb87 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -25,7 +25,7 @@
 #include "ly-module.hh"
 
 
-static Keyword_ent the_key_tab[]={
+static Keyword_ent the_key_tab[] = {
   {"acciaccatura", ACCIACCATURA},
   {"accepts", ACCEPTS},
   {"addlyrics", ADDLYRICS},
@@ -38,6 +38,7 @@ static Keyword_ent the_key_tab[]={
   {"appoggiatura", APPOGGIATURA},
   {"autochange", AUTOCHANGE},
   {"bar", BAR},
+  {"book", BOOK},
   {"breathe", BREATHE},
   {"change", CHANGE},
   {"chords", CHORDS},
@@ -88,54 +89,55 @@ static Keyword_ent the_key_tab[]={
   {"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);
+  encoding_ = SCM_EOL;
+  chordmodifier_tab_ = scm_make_vector (scm_int2num (1), SCM_EOL);
   pitchname_tab_stack_ = SCM_EOL; 
   
   scopes_ = SCM_EOL;
   
   add_scope (ly_make_anonymous_module ());
-  errorlevel_ =0; 
+  errorlevel_ = 0; 
 
   main_input_b_ = false;
 }
 
+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_; gh_pair_p (s); s = gh_cdr (s))
+  for (SCM s = scopes_; is_pair (s); s = ly_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);
-      
+      /* 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);
     }
-  
   scopes_ = scm_cons (module, scopes_);
 }
 
 SCM
 My_lily_lexer::remove_scope ()
 {
-  SCM sc = gh_car (scopes_);
-  scopes_ = gh_cdr (scopes_);
-  scm_set_current_module (gh_car (scopes_));
+  SCM sc = ly_car (scopes_);
+  scopes_ = ly_cdr (scopes_);
+  scm_set_current_module (ly_car (scopes_));
 
   return sc;
 }
@@ -151,9 +153,9 @@ SCM
 My_lily_lexer::lookup_identifier (String s)
 {
   SCM sym = ly_symbol2scm (s.to_str0());
-  for (SCM s = scopes_; gh_pair_p (s); s = gh_cdr (s))
+  for (SCM s = scopes_; is_pair (s); s = ly_cdr (s))
     {
-      SCM var = ly_module_lookup (gh_car (s), sym);
+      SCM var = ly_module_lookup (ly_car (s), sym);
       if (var != SCM_BOOL_F)
        return scm_variable_ref (var);
     }
@@ -163,11 +165,14 @@ 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_);
+  /* Do not allow \include in --safe-mode */
   allow_includes_b_ = allow_includes_b_ && ! safe_global_b;
 
-  scm_module_define (gh_car (scopes_),
+  scm_module_define (ly_car (scopes_),
                     ly_symbol2scm ("input-file-name"),
                     scm_makfrom0str (main_input_name_.to_str0 ()));
 }
@@ -175,18 +180,15 @@ My_lily_lexer::start_main_input ()
 void
 My_lily_lexer::set_identifier (SCM name, SCM s)
 {
-  assert (gh_string_p (name));
+  assert (is_string (name));
   
   if (lookup_keyword (ly_scm2string (name)) >= 0)
     {
-      size_t sz;
-      char * str = gh_scm2newstr (name, &sz) ;
-      warning (_f ("Identifier name is a keyword: `%s'", str));
-      free  (str);
+      warning (_f ("Identifier name is a keyword: `%s'", SCM_STRING_CHARS (name)));
     }
 
   SCM sym = scm_string_to_symbol (name);
-  SCM mod = gh_car (scopes_);
+  SCM mod = ly_car (scopes_);
 
   scm_module_define (mod, sym, s);
 }
@@ -202,9 +204,7 @@ void
 My_lily_lexer::LexerError (char const *s)
 {
   if (include_stack_.is_empty ())
-    {
-      progress_indication (_f ("error at EOF: %s", s)+ String ("\n"));
-    }
+    progress_indication (_f ("error at EOF: %s", s) + String ("\n"));
   else
     {
       errorlevel_ |= 1;
@@ -243,3 +243,9 @@ My_lily_lexer::prepare_for_next_token ()
 {
   last_input_ = here_input ();
 }
+
+void
+My_lily_lexer::set_encoding (String s)
+{
+  encoding_ = ly_symbol2scm (s.to_str0 ());
+}