(parse_string): switch module too.

diff --git a/ChangeLog b/ChangeLog
index 0e8ce2a87733a4695c526335264b1364d291de8f..20da753d7a322d608eeea2b12708b0e6b13850a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-24  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * lily/my-lily-parser.cc (parse_string): switch module too.
+
 2004-06-24  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * Documentation/topdocs/INSTALL.texi (Top): Add guile, python and

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index 7032ed78ba09893f7af966e1b2e6f2c64715a11d..2af2dd14585438587105bb1037f0e303cc09f485 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -121,6 +121,10 @@ My_lily_parser::parse_string (String ly_code)
   lexer_ = (parent == 0 ? new My_lily_lexer (sources_)
            : new My_lily_lexer (*parent));
 
+
+  SCM oldmod = scm_current_module ();
+  scm_set_current_module (ly_car (lexer_->scopes_));
+  
   // TODO: use $parser 
   lexer_->set_identifier (ly_symbol2scm ("parser"),
                          self_scm ());
@@ -152,6 +156,7 @@ My_lily_parser::parse_string (String ly_code)
       parent->main_input_b_ = lexer_->main_input_b_;
     }
 
+  scm_set_current_module (oldmod);
   delete lexer_;
   lexer_ = 0;
 }