(GUILE_ELLIPSIS): define to get clean

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

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index df42f0ae9ace5ffbca379c74c65d8be0a9b191b0..b0949fb664d33b4ce5f49db3aaeb092fff421020 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -25,8 +25,6 @@
 
 Lily_parser::Lily_parser (Sources *sources)
 {
-  book_count_ = 0;
-  score_count_ = 0;
   lexer_ = 0;
   sources_ = sources;
   default_duration_ = Duration (2, 0);
@@ -35,23 +33,22 @@ Lily_parser::Lily_parser (Sources *sources)
   smobify_self ();
 
   lexer_ = new Lily_lexer (sources_);
-  scm_gc_unprotect_object (lexer_->self_scm ());
+  lexer_->unprotect ();
 }
 
 Lily_parser::Lily_parser (Lily_parser const &src)
 {
-  book_count_ = src.book_count_;
-  score_count_ = src.score_count_;
   lexer_ = 0;
   sources_ = src.sources_;
   default_duration_ = src.default_duration_;
   error_level_ = src.error_level_;
+  output_basename_ = src.output_basename_;
 
   smobify_self ();
   if (src.lexer_)
     lexer_ = new Lily_lexer (*src.lexer_);
 
-  scm_gc_unprotect_object (lexer_->self_scm ());
+  lexer_->unprotect ();
 }
 
 Lily_parser::~Lily_parser ()
@@ -89,9 +86,7 @@ void
 Lily_parser::parse_file (String init, String name, String out_name)
 {
   if (output_backend_global == "tex")
-    {
-      try_load_text_metrics (out_name);
-    }
+    try_load_text_metrics (out_name);
 
   // TODO: use $parser 
   lexer_->set_identifier (ly_symbol2scm ("parser"),
@@ -109,7 +104,7 @@ Lily_parser::parse_file (String init, String name, String out_name)
 
   File_name f (name);
   String s = global_path.find (f.base_ + ".twy");
-  s = gulp_file_to_string (s, false);
+  s = gulp_file_to_string (s, false, -1);
   scm_eval_string (scm_makfrom0str (s.to_str0 ()));
 
   /* Read .ly IN_FILE, lex, parse, write \score blocks from IN_FILE to
@@ -117,8 +112,16 @@ Lily_parser::parse_file (String init, String name, String out_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"));
@@ -132,10 +135,10 @@ Lily_parser::parse_file (String init, String name, String out_name)
 void
 Lily_parser::parse_string (String ly_code)
 {
-   // TODO: use $parser 
+  // TODO: use $parser 
   lexer_->set_identifier (ly_symbol2scm ("parser"),
                          self_scm ());
-  
+
   lexer_->main_input_name_ = "<string>";
   lexer_->is_main_input_ = true;
 
@@ -145,7 +148,7 @@ Lily_parser::parse_string (String ly_code)
   SCM mod = lexer_->set_current_scope ();
   do_yyparse ();
   scm_set_current_module (mod);
-  
+
   if (!define_spots_.is_empty ())
     {
       if (define_spots_.is_empty ()
@@ -210,3 +213,18 @@ get_paper (Lily_parser *parser)
   return layout;
 }
 
+SCM
+get_header (Lily_parser *parser)
+{
+  SCM id = parser->lexer_->lookup_identifier ("$defaultheader");
+  if (!ly_is_module (id))
+    id = ly_make_anonymous_module (be_safe_global);
+  else
+    {
+      SCM nid = ly_make_anonymous_module (false);
+      ly_module_copy(nid,id);
+      id = nid;
+    }
+  
+  return id;
+}