* The grand 2005-2006 replace.

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

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 76915d07e8664763310621d56aab6c0e3d7c93f3..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,43 +23,40 @@
 #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);
   error_level_ = 0;
 
   smobify_self ();
+
+  lexer_ = new Lily_lexer (sources_);
+  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)
@@ -71,9 +68,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;
 }
@@ -83,14 +83,8 @@ void
 Lily_parser::parse_file (String init, String name, String out_name)
 {
   if (output_backend_global == "tex")
-    {
-      try_load_text_metrics (out_name);
-    }
-
-  SCM oldmod = scm_current_module ();
+    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 ());
@@ -107,13 +101,24 @@ 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
      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"));
@@ -122,29 +127,24 @@ Lily_parser::parse_file (String init, String name, String out_name)
 
   error_level_ = error_level_ | lexer_->error_level_;
   lexer_ = 0;
-
-  scm_set_current_module (oldmod);
 }
 
 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 ();
   // 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_);
+
+  SCM mod = lexer_->set_current_scope ();
   do_yyparse ();
+  scm_set_current_module (mod);
 
   if (!define_spots_.is_empty ())
     {
@@ -154,9 +154,6 @@ Lily_parser::parse_string (String ly_code)
     }
 
   error_level_ = error_level_ | lexer_->error_level_;
-
-  scm_set_current_module (oldmod);
-  lexer_ = 0;
 }
 
 char const *
@@ -179,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)
@@ -213,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;
+}