X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser.cc;h=cec4893d8db0b9cab96c0404e34cecf088bf28c7;hb=76465a6d1c77ff1b30e5c61e9e06178b8d5290d4;hp=5c1a3d358d61f390212f14915fa60e1d5c3536ce;hpb=d8ee829c73452cc35ef17c6c22abf5b47c754c15;p=lilypond.git

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 5c1a3d358d..cec4893d8d 100644
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -32,6 +32,7 @@
 #include "paper-book.hh"
 #include "parser.hh"
 #include "score.hh"
+#include "source-file.hh"
 #include "sources.hh"
 #include "warn.hh"
 #include "program-option.hh"
@@ -44,6 +45,7 @@ Lily_parser::Lily_parser (Sources *sources)
   sources_ = sources;
   default_duration_ = Duration (2, 0);
   error_level_ = 0;
+  closures_ = SCM_EOL;
 
   smobify_self ();
 
@@ -51,13 +53,14 @@ Lily_parser::Lily_parser (Sources *sources)
   lexer_->unprotect ();
 }
 
-Lily_parser::Lily_parser (Lily_parser const &src)
+Lily_parser::Lily_parser (Lily_parser const &src, SCM closures)
 {
   lexer_ = 0;
   sources_ = src.sources_;
   default_duration_ = src.default_duration_;
-  error_level_ = src.error_level_;
+  error_level_ = 0;
   output_basename_ = src.output_basename_;
+  closures_ = closures;
 
   smobify_self ();
   if (src.lexer_)
@@ -76,6 +79,7 @@ SCM
 Lily_parser::mark_smob (SCM s)
 {
   Lily_parser *parser = (Lily_parser *) SCM_CELL_WORD_1 (s);
+  scm_gc_mark (parser->closures_);
   return (parser->lexer_) ? parser->lexer_->self_scm () : SCM_EOL;
 }
 
@@ -128,12 +132,6 @@ Lily_parser::parse_file (string init, string name, string out_name)
 
   scm_set_current_module (mod);
 
-  if (!define_spots_.empty ())
-    {
-      define_spots_.back ().warning (_ ("braces do not match"));
-      error_level_ = 1;
-    }
-
   error_level_ = error_level_ | lexer_->error_level_;
   clear ();
 }
@@ -153,41 +151,31 @@ Lily_parser::parse_string (string ly_code)
   do_yyparse ();
   scm_set_current_module (mod);
 
-  if (!define_spots_.empty ())
-    {
-      if (define_spots_.empty ()
-          && !error_level_)
-        programming_error ("define_spots_ don't match, but error_level_ not set.");
-    }
-
   error_level_ = error_level_ | lexer_->error_level_;
 }
 
 SCM
-Lily_parser::parse_string_expression (string ly_code)
+Lily_parser::parse_string_expression (string ly_code, string filename,
+                                      int line)
 {
   // TODO: use $parser
   lexer_->set_identifier (ly_symbol2scm ("parser"),
                           self_scm ());
 
-  lexer_->main_input_name_ = "<string>";
+  lexer_->main_input_name_ = filename;
   lexer_->is_main_input_ = true;
   lexer_->new_input (lexer_->main_input_name_, ly_code, sources_);
-
+  if (line)
+    {
+      lexer_->get_source_file ()->set_line (0, line);
+    }
   SCM mod = lexer_->set_current_scope ();
-  lexer_->push_embedded_token ();
+  lexer_->push_extra_token (EMBEDDED_LILY);
   do_yyparse ();
-  SCM result = lexer_->lookup_identifier_symbol (ly_symbol2scm ("$parseStringResult"));
-  // $parseStringResult is set in the grammar rule for embedded_lilypond
-  
-  scm_set_current_module (mod);
+  SCM result = lexer_->lookup_identifier_symbol (ly_symbol2scm ("parseStringResult"));
+  // parseStringResult is set in the grammar rule for embedded_lilypond
 
-  if (!define_spots_.empty ())
-    {
-      if (define_spots_.empty ()
-          && !error_level_)
-        programming_error ("define_spots_ don't match, but error_level_ not set.");
-    }
+  scm_set_current_module (mod);
 
   error_level_ = error_level_ | lexer_->error_level_;
   return result;
@@ -196,7 +184,7 @@ Lily_parser::parse_string_expression (string ly_code)
 void
 Lily_parser::include_string (string ly_code)
 {
-  lexer_->add_string_include (ly_code);
+  lexer_->new_input ("<included string>", ly_code, sources_);
 }
 
 void