X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser.cc;h=65160851e16ee39ceb01f7805f7112fd228676b3;hb=e03b2923c10e1c33238a4f2ecf78714bf829e758;hp=b0949fb664d33b4ce5f49db3aaeb092fff421020;hpb=b4bf2bb07379dace29a777d15ac47781bada2b03;p=lilypond.git

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index b0949fb664..65160851e1 100644
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -3,26 +3,30 @@
 
   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>
 */
 
 #include "lily-parser.hh"
-#include "text-metrics.hh"
+
 #include "book.hh"
-#include "lilypond-key.hh"
+#include "file-name.hh"
+#include "file-path.hh"
+#include "international.hh"
+#include "lily-lexer.hh"
 #include "lily-version.hh"
+#include "lilypond-key.hh"
 #include "main.hh"
-#include "lily-lexer.hh"
 #include "output-def.hh"
 #include "paper-book.hh"
 #include "parser.hh"
 #include "score.hh"
-#include "file-name.hh"
-#include "file-path.hh"
 #include "source.hh"
+#include "text-metrics.hh"
 #include "warn.hh"
 
+#include "ly-smobs.icc"
+
 Lily_parser::Lily_parser (Sources *sources)
 {
   lexer_ = 0;
@@ -55,11 +59,6 @@ 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)
@@ -83,7 +82,7 @@ Lily_parser::print_smob (SCM s, SCM port, scm_print_state*)
 
 /* Process one .ly file, or book.  */
 void
-Lily_parser::parse_file (String init, String name, String out_name)
+Lily_parser::parse_file (string init, string name, string out_name)
 {
   if (output_backend_global == "tex")
     try_load_text_metrics (out_name);
@@ -103,9 +102,9 @@ Lily_parser::parse_file (String init, String name, String out_name)
   lexer_->new_input (init, sources_);
 
   File_name f (name);
-  String s = global_path.find (f.base_ + ".twy");
+  string s = global_path.find (f.base_ + ".twy");
   s = gulp_file_to_string (s, false, -1);
-  scm_eval_string (scm_makfrom0str (s.to_str0 ()));
+  scm_eval_string (scm_makfrom0str (s.c_str ()));
 
   /* Read .ly IN_FILE, lex, parse, write \score blocks from IN_FILE to
      OUT_FILE (unless IN_FILE redefines output file name).  */
@@ -122,9 +121,9 @@ Lily_parser::parse_file (String init, String name, String out_name)
 
   scm_set_current_module (mod);
 
-  if (!define_spots_.is_empty ())
+  if (!define_spots_.empty ())
     {
-      define_spots_.top ().warning (_ ("braces don't match"));
+      define_spots_.back ().warning (_ ("braces don't match"));
       error_level_ = 1;
     }
 
@@ -133,7 +132,7 @@ Lily_parser::parse_file (String init, String name, String out_name)
 }
 
 void
-Lily_parser::parse_string (String ly_code)
+Lily_parser::parse_string (string ly_code)
 {
   // TODO: use $parser 
   lexer_->set_identifier (ly_symbol2scm ("parser"),
@@ -149,9 +148,9 @@ Lily_parser::parse_string (String ly_code)
   do_yyparse ();
   scm_set_current_module (mod);
 
-  if (!define_spots_.is_empty ())
+  if (!define_spots_.empty ())
     {
-      if (define_spots_.is_empty ()
+      if (define_spots_.empty ()
 	  && !error_level_)
 	programming_error ("define_spots_ don't match, but error_level_ not set.");
     }
@@ -166,20 +165,29 @@ Lily_parser::here_str0 () const
 }
 
 void
-Lily_parser::parser_error (String s)
+Lily_parser::parser_error (string s)
 {
-  lexer_->here_input ().error (_ (s.to_str0 ()));
+  lexer_->here_input ().error (_ (s.c_str ()));
   error_level_ = 1;
 }
 
 void
-Lily_parser::parser_error (Input const &i, String s)
+Lily_parser::parser_error (Input const &i, string s)
 {
   i.error (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)
@@ -188,7 +196,8 @@ get_layout (Lily_parser *parser)
   Output_def *layout = unsmob_output_def (id);
   layout = layout ? layout->clone () : new Output_def;
   layout->set_variable (ly_symbol2scm ("is-layout"), SCM_BOOL_T);
-
+  layout->parser_ = parser;
+    
   return layout;
 }
 
@@ -199,6 +208,7 @@ get_midi (Lily_parser *parser)
   Output_def *layout = unsmob_output_def (id);
   layout = layout ? layout->clone () : new Output_def;
   layout->set_variable (ly_symbol2scm ("is-midi"), SCM_BOOL_T);
+  layout->parser_ = parser;
   return layout;
 }
 
@@ -210,6 +220,7 @@ get_paper (Lily_parser *parser)
 
   layout = layout ? dynamic_cast<Output_def *> (layout->clone ()) : new Output_def;
   layout->set_variable (ly_symbol2scm ("is-paper"), SCM_BOOL_T);
+  layout->parser_ = parser;
   return layout;
 }