From: David Kastrup <dak@gnu.org>
Date: Thu, 9 Aug 2012 15:48:12 +0000 (+0200)
Subject: Issue 2729: When cloning a lexer/parser, don't copy the scopes.
X-Git-Tag: release/2.17.6-1~46^2~3^2~41
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b455c62eeff33f6014a7f8c1ddc690047ae011ec;p=lilypond.git

Issue 2729: When cloning a lexer/parser, don't copy the scopes.
---

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index 71533da700..39aeb78dd1 100644
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -113,27 +113,16 @@ Lily_lexer::Lily_lexer (Lily_lexer const &src, Lily_parser *parser)
   chordmodifier_tab_ = src.chordmodifier_tab_;
   pitchname_tab_stack_ = src.pitchname_tab_stack_;
   sources_ = src.sources_;
+  scopes_ = src.scopes_;
   start_module_ = SCM_EOL;
 
   error_level_ = 0;
   is_main_input_ = src.is_main_input_;
 
-  scopes_ = SCM_EOL;
   extra_tokens_ = SCM_EOL;
 
   smobify_self ();
 
-  SCM scopes = SCM_EOL;
-  SCM *tail = &scopes;
-  for (SCM s = src.scopes_; scm_is_pair (s); s = scm_cdr (s))
-    {
-      SCM newmod = ly_make_module (false);
-      ly_module_copy (newmod, scm_car (s));
-      *tail = scm_cons (newmod, SCM_EOL);
-      tail = SCM_CDRLOC (*tail);
-    }
-
-  scopes_ = scopes;
   push_note_state (SCM_EOL);
 }
 
diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index cec4893d8d..c21180c31b 100644
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -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;
 
@@ -139,16 +138,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_;
@@ -158,10 +156,6 @@ SCM
 Lily_parser::parse_string_expression (string ly_code, string filename,
                                       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_);
@@ -170,11 +164,14 @@ Lily_parser::parse_string_expression (string ly_code, string filename,
       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_;