* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index bcfc85c40b369c0c6e35521cf9e3e93d70d94d64..48005225d18c895bc4f3bf781d24df77ab1a55cb 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -13,7 +13,7 @@
 #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"
@@ -58,6 +58,7 @@ static Keyword_ent the_key_tab[]={
   {"lyrics", LYRICS},
   {"key", KEY},
   {"mark", MARK},
+  {"once", ONCE},
   {"pitch", PITCH},
   {"time", TIME_T},
   {"times", TIMES},
@@ -95,29 +96,29 @@ static Keyword_ent the_key_tab[]={
 
 My_lily_lexer::My_lily_lexer ()
 {
-  keytable_p_ = new Keyword_table (the_key_tab);
+  keytable_ = new Keyword_table (the_key_tab);
   toplevel_variable_tab_ = new Scheme_hash_table ;
-  scope_l_arr_.push (toplevel_variable_tab_);
+  scopes_.push (toplevel_variable_tab_);
   
-  errorlevel_i_ = 0;
+  errorlevel_ = 0;
   main_input_b_ = false;
 }
 
 int
 My_lily_lexer::lookup_keyword (String s)
 {
-  return keytable_p_->lookup (s.ch_C ());
+  return keytable_->lookup (s.to_str0 ());
 }
 
 SCM
 My_lily_lexer::lookup_identifier (String s)
 {
-  SCM sym = ly_symbol2scm (s.ch_C ());
+  SCM sym = ly_symbol2scm (s.to_str0 ());
   
-  for (int i = scope_l_arr_.size (); i--;)
+  for (int i = scopes_.size (); i--;)
     {
       SCM val = SCM_UNSPECIFIED;
-      if (scope_l_arr_[i]->try_retrieve (sym, &val))
+      if (scopes_[i]->try_retrieve (sym, &val))
        return val;
     }
   return SCM_UNSPECIFIED;
@@ -126,7 +127,7 @@ My_lily_lexer::lookup_identifier (String s)
 void
 My_lily_lexer::start_main_input ()
 {  
-  new_input (main_input_str_, source_global_l);
+  new_input (main_input_string_, &global_input_file->sources_);
   allow_includes_b_ = allow_includes_b_ &&  ! (safe_global_b);
 }
 
@@ -143,12 +144,12 @@ My_lily_lexer::set_identifier (SCM name, SCM s)
       free  (str);
     }
   
-  scope_l_arr_.top ()->set (scm_string_to_symbol (name), s);
+  scopes_.top ()->set (scm_string_to_symbol (name), s);
 }
 
 My_lily_lexer::~My_lily_lexer ()
 {
-  delete keytable_p_;
+  delete keytable_;
   scm_gc_unprotect_object (toplevel_variable_tab_->self_scm ());
 }
 
@@ -163,8 +164,8 @@ My_lily_lexer::LexerError (char const *s)
     }
   else
     {
-      errorlevel_i_ |= 1;
-      Input spot (source_file_l (),here_ch_C ());
+      errorlevel_ |= 1;
+      Input spot (get_source_file (),here_str0 ());
       spot.error (s);
     }
 }
@@ -190,6 +191,6 @@ My_lily_lexer::escaped_char (char c) const
 Input
 My_lily_lexer::here_input () const
 {
-  Source_file * f_l= source_file_l ();
-  return Input (f_l, (char*)here_ch_C ());
+  Source_file * f= get_source_file ();
+  return Input (f, (char*)here_str0 ());
 }