* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / lily / score.cc

diff --git a/lily/score.cc b/lily/score.cc
index b31c673f813e8a46e04a7b449ca2093b838421b7..ceb327d9ec228e7506adf664793ad5f566604a14 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -6,17 +6,18 @@
   (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include <stdio.h>
+
 #include "ly-smobs.icc"
 
-#include "scm-hash.hh"
 #include "score.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "music-output-def.hh"
 #include "music-output.hh"
 #include "music-iterator.hh"
 #include "music.hh"
 #include "global-translator.hh"
-#include "scope.hh"
+#include "scm-hash.hh"
 #include "cpu-timer.hh"
 #include "main.hh"
 #include "paper-def.hh"
@@ -25,13 +26,14 @@
 /*
   TODO: junkme.
  */
-
 Score::Score ()
   : Input ()
 {
-  header_p_ = 0;
+  input_file_ = 0;
+  header_ = 0;
   music_ = SCM_EOL;
-  errorlevel_i_ = 0;
+  errorlevel_ = 0;
+
   smobify_self ();
 }
 
@@ -45,26 +47,21 @@ Score::Score (Score const &s)
   : Input (s)
 {
   music_ = SCM_EOL;
-  header_p_ = 0;
+  header_ = 0;
   smobify_self ();
 
-  /*
-    TODO: this is not very elegant.... 
-   */
-  store_locations_global_b = (gh_eval_str ("point-and-click") !=  SCM_BOOL_F);
-
   Music * m =unsmob_music (s.music_);
   music_ =  m?m->clone ()->self_scm () : SCM_EOL;
   scm_gc_unprotect_object (music_);
   
-  for (int i=0; i < s.def_p_arr_.size (); i++)
-    def_p_arr_.push (s.def_p_arr_[i]->clone ());
-  errorlevel_i_ = s.errorlevel_i_;
-  if (s.header_p_)
+  for (int i=0; i < s.defs_.size (); i++)
+    defs_.push (s.defs_[i]->clone ());
+  errorlevel_ = s.errorlevel_;
+  if (s.header_)
     {
-      header_p_ = (s.header_p_) ? new Scheme_hash_table (*s.header_p_): 0;
+      header_ = (s.header_) ? new Scheme_hash_table (*s.header_): 0;
 
-      scm_gc_unprotect_object (header_p_->self_scm ());
+      scm_gc_unprotect_object (header_->self_scm ());
     }
 }
 
@@ -73,14 +70,20 @@ Score::~Score ()
   
 }
 
+
+
 void
-Score::run_translator (Music_output_def *odef_l)
+Score::run_translator (Music_output_def *odef)
 {
-  Cpu_timer timer;
-
+  /*
+    We want to know if we want to store locations, since they take a
+    lot of overhead.
+  */
+  store_locations_global_b = (gh_eval_str ("point-and-click") !=  SCM_BOOL_F);
   
-  Global_translator * trans_p = odef_l->get_global_translator_p ();
-  if (!trans_p)
+  Cpu_timer timer;
+  Global_translator * trans = odef->get_global_translator ();
+  if (!trans)
     {
       programming_error ("no toplevel translator");
       return ;
@@ -88,55 +91,48 @@ Score::run_translator (Music_output_def *odef_l)
   progress_indication (_ ("Interpreting music..."));
   Music * music = unsmob_music (music_);
   
-  trans_p->final_mom_ = music->length_mom ();
-
-
-  Music_iterator * iter = Music_iterator::static_get_iterator_p (music);
-  iter->init_translator (music, trans_p);
+  trans->final_mom_ = music->length_mom ();
+  SCM protected_iter =  Music_iterator::get_static_get_iterator (music);
+  Music_iterator * iter = unsmob_iterator (protected_iter);
+  iter->init_translator (music, trans);
 
   iter->construct_children ();
 
   if (! iter->ok ())
     {
-      delete iter;
       warning (_ ("Need music in a score"));
-      errorlevel_i_ =1;
+      errorlevel_ =1;
       return ;
     }
 
-  trans_p->start ();
-  trans_p->run_iterator_on_me (iter);
-  delete iter;
-  trans_p->finish ();
+  trans->start ();
+  trans->run_iterator_on_me (iter);
+  iter->quit();
+  scm_remember_upto_here_1 (protected_iter);
+  trans->finish ();
 
-  if (errorlevel_i_)
+  if (errorlevel_)
     {
       // should we? hampers debugging.
       warning (_ ("Errors found/*, not processing score*/"));
     }
 
-  Music_output * output = trans_p->get_output_p ();
-  scm_gc_unprotect_object (trans_p->self_scm ());
+  Music_output * output = trans->get_output ();
+  scm_gc_unprotect_object (trans->self_scm ());
   
   if (verbose_global_b)
     progress_indication (_f ("elapsed time: %.2f seconds",  timer.read ()));
 
-  if (!header_p_)
-    header_p_ = new Scheme_hash_table; // ugh
-  Scope bla (header_p_);
-  output->header_l_ = &bla;
-  output->origin_str_ =  location_str ();
+  if (!header_)
+    header_ = new Scheme_hash_table; // ugh
+
+  output->header_ = header_;
+  output->origin_string_ =  location_string ();
 
   progress_indication ("\n");
   output->process ();
+  
   delete output ;
-
-  /*
-    force GC. At this point, GUILE may give back mallocated area to
-    the system.
-  */
-    
-  scm_gc ();
 }
 
 void
@@ -145,23 +141,20 @@ Score::process ()
   if (!unsmob_music (music_))
     return;
 
-
-  for (int i=0; i < def_p_arr_.size (); i++)
+  for (int i=0; i < defs_.size (); i++)
     {
       if (no_paper_global_b 
-         && dynamic_cast<Paper_def*> (def_p_arr_[i]))
+         && dynamic_cast<Paper_def*> (defs_[i]))
        continue;
-      run_translator (def_p_arr_[i]);
+      run_translator (defs_[i]);
     }
 }
 
 
-
-
 void
-Score::add_output (Music_output_def *pap_p)
+Score::add_output (Music_output_def *pap)
 {
-  def_p_arr_.push (pap_p);
+  defs_.push (pap);
 }
 
 IMPLEMENT_SMOBS (Score);
@@ -172,10 +165,10 @@ SCM
 Score::mark_smob (SCM s)
 {
   Score * sc = (Score*) SCM_CELL_WORD_1 (s);
-  if (sc->header_p_)
-    scm_gc_mark (sc->header_p_->self_scm ());
-  for (int i = sc->def_p_arr_.size (); i--;)
-    scm_gc_mark (sc->def_p_arr_[i]->self_scm ());
+  if (sc->header_)
+    scm_gc_mark (sc->header_->self_scm ());
+  for (int i = sc->defs_.size (); i--;)
+    scm_gc_mark (sc->defs_[i]->self_scm ());
   
   return sc->music_;
 }