Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / lily / lily-parser.cc

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 39e5c197a633ec08c07d4c3bc17a7ef34adc7362..ae3943dbdb3e89061ba30ee53600b43215ad9123 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -36,7 +36,7 @@ Lily_parser::Lily_parser (Sources *sources)
 
   smobify_self ();
 
-  lexer_ = new Lily_lexer (sources_);
+  lexer_ = new Lily_lexer (sources_, this);
   lexer_->unprotect ();
 }
 
@@ -50,8 +50,10 @@ Lily_parser::Lily_parser (Lily_parser const &src)
 
   smobify_self ();
   if (src.lexer_)
-    lexer_ = new Lily_lexer (*src.lexer_);
-
+    {
+      lexer_ = new Lily_lexer (*src.lexer_, this);
+    }
+  
   lexer_->unprotect ();
 }
 
@@ -82,7 +84,7 @@ Lily_parser::print_smob (SCM s, SCM port, scm_print_state*)
 
 /* Process one .ly file, or book.  */
 void
-Lily_parser::parse_file (std::string init, std::string name, std::string out_name)
+Lily_parser::parse_file (string init, string name, string out_name)
 {
   if (output_backend_global == "tex")
     try_load_text_metrics (out_name);
@@ -95,14 +97,13 @@ Lily_parser::parse_file (std::string init, std::string name, std::string out_nam
   lexer_->main_input_name_ = name;
 
   message (_ ("Parsing..."));
-  //  progress_indication ("\n");
 
   set_yydebug (0);
 
   lexer_->new_input (init, sources_);
 
   File_name f (name);
-  std::string s = global_path.find (f.base_ + ".twy");
+  string s = global_path.find (f.base_ + ".twy");
   s = gulp_file_to_string (s, false, -1);
   scm_eval_string (scm_makfrom0str (s.c_str ()));
 
@@ -121,18 +122,18 @@ Lily_parser::parse_file (std::string init, std::string name, std::string out_nam
 
   scm_set_current_module (mod);
 
-  if (!define_spots_.is_empty ())
+  if (!define_spots_.empty ())
     {
-      define_spots_.top ().warning (_ ("braces don't match"));
+      define_spots_.back ().warning (_ ("braces do not match"));
       error_level_ = 1;
     }
 
   error_level_ = error_level_ | lexer_->error_level_;
-  lexer_ = 0;
+  clear ();
 }
 
 void
-Lily_parser::parse_string (std::string ly_code)
+Lily_parser::parse_string (string ly_code)
 {
   // TODO: use $parser 
   lexer_->set_identifier (ly_symbol2scm ("parser"),
@@ -141,16 +142,15 @@ Lily_parser::parse_string (std::string ly_code)
   lexer_->main_input_name_ = "<string>";
   lexer_->is_main_input_ = true;
 
-  set_yydebug (0);
   lexer_->new_input (lexer_->main_input_name_, ly_code, sources_);
 
   SCM mod = lexer_->set_current_scope ();
   do_yyparse ();
   scm_set_current_module (mod);
 
-  if (!define_spots_.is_empty ())
+  if (!define_spots_.empty ())
     {
-      if (define_spots_.is_empty ()
+      if (define_spots_.empty ()
          && !error_level_)
        programming_error ("define_spots_ don't match, but error_level_ not set.");
     }
@@ -158,6 +158,18 @@ Lily_parser::parse_string (std::string ly_code)
   error_level_ = error_level_ | lexer_->error_level_;
 }
 
+void
+Lily_parser::clear ()
+{
+  if (lexer_)
+    {
+      while (lexer_->has_scope ())
+       lexer_->remove_scope ();
+    }
+
+  lexer_ = 0;  
+}
+
 char const *
 Lily_parser::here_str0 () const
 {
@@ -165,14 +177,14 @@ Lily_parser::here_str0 () const
 }
 
 void
-Lily_parser::parser_error (std::string s)
+Lily_parser::parser_error (string s)
 {
   lexer_->here_input ().error (_ (s.c_str ()));
   error_level_ = 1;
 }
 
 void
-Lily_parser::parser_error (Input const &i, std::string s)
+Lily_parser::parser_error (Input const &i, string s)
 {
   i.error (s);
   error_level_ = 1;