*** empty log message ***

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

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index f79fee66601b413950fe7abd674a4ddada87ccb6..b2529c270e73eab1b25865f99f2a6085b6ce325f 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
        Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -12,12 +12,12 @@
 #include "warn.hh"
 #include "main.hh"
 #include "parser.hh"
-#include "file-results.hh"
+#include "input-file-results.hh"
 #include "scm-hash.hh"
 
-My_lily_parser::My_lily_parser (Sources * source)
+My_lily_parser::My_lily_parser (Input_file_results * source)
 {
-  source_ = source;
+  input_file_ = source;
   lexer_ = 0;
   default_duration_ = Duration (2,0);
   error_level_ = 0;
@@ -44,7 +44,7 @@ My_lily_parser::parse_file (String init, String s)
   progress_indication (_ ("Parsing..."));
 
   set_yydebug (0);
-  lexer_->new_input (init, source_);
+  lexer_->new_input (init, &input_file_->sources_);
   do_yyparse ();
 
   progress_indication ("\n");
@@ -55,7 +55,7 @@ My_lily_parser::parse_file (String init, String s)
       error_level_ = 1;
     }
 
-  inclusion_globals = lexer_->filename_strings_;
+  input_file_->inclusion_names_ = lexer_->filename_strings_;
 
   error_level_ = error_level_ | lexer_->errorlevel_; // ugh naming.
 }
@@ -91,10 +91,13 @@ My_lily_parser::pop_spot ()
 Input
 My_lily_parser::here_input () const
 {
-  return  lexer_->here_input ();
+  /*
+    Parsing looks ahead , so we really want the previous location of the
+    lexer, not lexer_->here_input().
+   */
+  return lexer_->last_input_;
 }
 
-// move me?
 #include "paper-def.hh"
 #include "translator-def.hh"