* The grand 2005-2006 replace.

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

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 050f8dd7b2c545bc9a60ead5e81689eeaf8996a9..00d68102e62ea38adb567c9ac65938db6f881c4e 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -23,10 +23,10 @@
 #include "source.hh"
 #include "warn.hh"
 
+#include "ly-smobs.icc"
+
 Lily_parser::Lily_parser (Sources *sources)
 {
-  book_count_ = 0;
-  score_count_ = 0;
   lexer_ = 0;
   sources_ = sources;
   default_duration_ = Duration (2, 0);
@@ -35,34 +35,28 @@ 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 ()
 {
 }
 
-#include "ly-smobs.icc"
-
-IMPLEMENT_SMOBS (Lily_parser);
-IMPLEMENT_TYPE_P (Lily_parser, "ly:lily-parser?");
-IMPLEMENT_DEFAULT_EQUAL_P (Lily_parser);
 
 SCM
 Lily_parser::mark_smob (SCM s)
@@ -76,7 +70,10 @@ Lily_parser::print_smob (SCM s, SCM port, scm_print_state*)
 {
   scm_puts ("#<Lily_parser ", port);
   Lily_parser *parser = (Lily_parser *) SCM_CELL_WORD_1 (s);
-  scm_display (parser->lexer_->self_scm (), port);
+  if (parser->lexer_)
+    scm_display (parser->lexer_->self_scm (), port);
+  else
+    scm_puts ("(no lexer yet)", port);
   scm_puts (" >", port);
   return 1;
 }
@@ -86,9 +83,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"),
@@ -106,7 +101,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
@@ -114,8 +109,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"));
@@ -129,10 +132,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;
 
@@ -142,7 +145,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 ()
@@ -173,7 +176,16 @@ Lily_parser::parser_error (Input const &i, String s)
   error_level_ = 1;
 }
 
-/****************************************************************/
+
+
+IMPLEMENT_SMOBS (Lily_parser);
+IMPLEMENT_TYPE_P (Lily_parser, "ly:lily-parser?");
+IMPLEMENT_DEFAULT_EQUAL_P (Lily_parser);
+
+
+/****************************************************************
+  OUTPUT-DEF 
+ ****************************************************************/
 
 Output_def *
 get_layout (Lily_parser *parser)
@@ -207,3 +219,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;
+}