X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser.cc;h=67b7bcac1fe7a473471cdf71be42d718d7eb5c37;hb=30f457de4178d3e049336aaf50afe17b3b3a1135;hp=8159c3dae7ca677c01324bad4632a3317b5bb200;hpb=a42aaa559b71ce5776795fa11a7e1df9110d85b7;p=lilypond.git

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 8159c3dae7..67b7bcac1f 100644
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -100,7 +100,6 @@ Lily_parser::print_smob (SCM s, SCM port, scm_print_state *)
 void
 Lily_parser::parse_file (string init, string name, string out_name)
 {
-  // TODO: use $parser
   lexer_->set_identifier (ly_symbol2scm ("parser"), self_scm ());
   output_basename_ = out_name;
 
@@ -121,7 +120,11 @@ Lily_parser::parse_file (string init, string name, string out_name)
      OUT_FILE (unless IN_FILE redefines output file name).  */
 
   SCM mod = lexer_->set_current_scope ();
-  do_yyparse ();
+  do
+    {
+      do_yyparse ();
+    }
+  while (!lexer_->is_clean ());
 
   /*
     Don't mix cyclic pointers with weak tables.
@@ -139,16 +142,15 @@ Lily_parser::parse_file (string init, string name, string out_name)
 void
 Lily_parser::parse_string (string ly_code)
 {
-  // TODO: use $parser
-  lexer_->set_identifier (ly_symbol2scm ("parser"),
-                          self_scm ());
-
   lexer_->main_input_name_ = "<string>";
   lexer_->is_main_input_ = true;
   lexer_->new_input (lexer_->main_input_name_, ly_code, sources_);
 
   SCM mod = lexer_->set_current_scope ();
+  SCM parser = lexer_->lookup_identifier_symbol (ly_symbol2scm ("parser"));
+  lexer_->set_identifier (ly_symbol2scm ("parser"), self_scm ());
   do_yyparse ();
+  lexer_->set_identifier (ly_symbol2scm ("parser"), parser);
   scm_set_current_module (mod);
 
   error_level_ = error_level_ | lexer_->error_level_;
@@ -156,24 +158,24 @@ Lily_parser::parse_string (string ly_code)
 
 SCM
 Lily_parser::parse_string_expression (string ly_code, string filename,
-				      int line)
+                                      int line)
 {
-  // TODO: use $parser
-  lexer_->set_identifier (ly_symbol2scm ("parser"),
-                          self_scm ());
-
   lexer_->main_input_name_ = filename;
   lexer_->is_main_input_ = true;
   lexer_->new_input (lexer_->main_input_name_, ly_code, sources_);
-  if (line) {
-    lexer_->get_source_file ()->set_line (0, line);
-  }
+  if (line)
+    {
+      lexer_->get_source_file ()->set_line (0, line);
+    }
   SCM mod = lexer_->set_current_scope ();
+  SCM parser = lexer_->lookup_identifier_symbol (ly_symbol2scm ("parser"));
+  lexer_->set_identifier (ly_symbol2scm ("parser"), self_scm ());
   lexer_->push_extra_token (EMBEDDED_LILY);
   do_yyparse ();
   SCM result = lexer_->lookup_identifier_symbol (ly_symbol2scm ("parseStringResult"));
   // parseStringResult is set in the grammar rule for embedded_lilypond
-  
+
+  lexer_->set_identifier (ly_symbol2scm ("parser"), parser);
   scm_set_current_module (mod);
 
   error_level_ = error_level_ | lexer_->error_level_;