* po/fr.po: update

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

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index c63f6c531c2239468a90a48c906237f401f53da5..28f8b5146cdc9620fc5809043ffbeda3b76e6719 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -31,9 +31,11 @@ Lily_parser::Lily_parser (Sources *sources)
   sources_ = sources;
   default_duration_ = Duration (2, 0);
   error_level_ = 0;
-  last_beam_start_ = SCM_EOL;
 
   smobify_self ();
+
+  lexer_ = new Lily_lexer (sources_);
+  scm_gc_unprotect_object (lexer_->self_scm ());
 }
 
 Lily_parser::Lily_parser (Lily_parser const &src)
@@ -44,7 +46,6 @@ Lily_parser::Lily_parser (Lily_parser const &src)
   sources_ = src.sources_;
   default_duration_ = src.default_duration_;
   error_level_ = src.error_level_;
-  last_beam_start_ = src.last_beam_start_;
 
   smobify_self ();
   if (src.lexer_)
@@ -73,9 +74,12 @@ Lily_parser::mark_smob (SCM s)
 int
 Lily_parser::print_smob (SCM s, SCM port, scm_print_state*)
 {
-  scm_puts ("#<my_lily_parser ", port);
+  scm_puts ("#<Lily_parser ", port);
   Lily_parser *parser = (Lily_parser *) SCM_CELL_WORD_1 (s);
-  (void) parser;
+  if (parser->lexer_)
+    scm_display (parser->lexer_->self_scm (), port);
+  else
+    scm_puts ("(no lexer yet)", port);
   scm_puts (" >", port);
   return 1;
 }
@@ -89,8 +93,6 @@ Lily_parser::parse_file (String init, String name, String out_name)
       try_load_text_metrics (out_name);
     }
 
-  lexer_ = new Lily_lexer (sources_);
-  scm_gc_unprotect_object (lexer_->self_scm ());
   // TODO: use $parser 
   lexer_->set_identifier (ly_symbol2scm ("parser"),
                          self_scm ());
@@ -112,8 +114,20 @@ Lily_parser::parse_file (String init, String name, String out_name)
 
   /* Read .ly IN_FILE, lex, parse, write \score blocks from IN_FILE to
      OUT_FILE (unless IN_FILE redefines output file name).  */
+
+  SCM mod = lexer_->set_current_scope ();
   do_yyparse ();
 
+  /*
+    Don't mix cyclic pointers with weak tables.
+   */
+  lexer_->set_identifier (ly_symbol2scm ("parser"),
+                         SCM_EOL);
+  ly_reexport_module (scm_current_module ());
+  
+
+    scm_set_current_module (mod);
+ 
   if (!define_spots_.is_empty ())
     {
       define_spots_.top ().warning (_ ("braces don't match"));
@@ -127,25 +141,20 @@ Lily_parser::parse_file (String init, String name, String out_name)
 void
 Lily_parser::parse_string (String ly_code)
 {
-  Lily_lexer *parent = lexer_;
-  lexer_ = (parent == 0 ? new Lily_lexer (sources_)
-           : new Lily_lexer (*parent));
-  scm_gc_unprotect_object (lexer_->self_scm ());
-
-  SCM oldmod = scm_current_module ();
-  scm_set_current_module (scm_car (lexer_->scopes_));
-
-  // TODO: use $parser 
+   // TODO: use $parser 
   lexer_->set_identifier (ly_symbol2scm ("parser"),
                          self_scm ());
-
+  
   lexer_->main_input_name_ = "<string>";
   lexer_->is_main_input_ = true;
 
   set_yydebug (0);
   lexer_->new_input (lexer_->main_input_name_, ly_code, sources_);
-  do_yyparse ();
 
+  SCM mod = lexer_->set_current_scope ();
+  do_yyparse ();
+  scm_set_current_module (mod);
+  
   if (!define_spots_.is_empty ())
     {
       if (define_spots_.is_empty ()
@@ -154,9 +163,6 @@ Lily_parser::parse_string (String ly_code)
     }
 
   error_level_ = error_level_ | lexer_->error_level_;
-
-  scm_set_current_module (oldmod);
-  lexer_ = 0;
 }
 
 char const *
@@ -168,8 +174,6 @@ Lily_parser::here_str0 () const
 void
 Lily_parser::parser_error (String s)
 {
-  /* FIXME: cannot otherwise internationalize this bison warning.  */
-  (void) _i ("syntax error, unexpected ");
   lexer_->here_input ().error (_ (s.to_str0 ()));
   error_level_ = 1;
 }