* lily/auto-beam-engraver.cc (try_music): accept and process

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

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index f79fee66601b413950fe7abd674a4ddada87ccb6..a2e9bb48fb11d64a5e49ec4654b10f99fa239bcf 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--2004 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;
@@ -35,27 +35,28 @@ My_lily_parser::~My_lily_parser ()
 
 
 void
-My_lily_parser::parse_file (String init, String s)
+My_lily_parser::parse_file (String init, String in_file, String out_file)
 {
   lexer_ = new My_lily_lexer;
-
-  lexer_->main_input_string_ = s;
+  output_basename_ = out_file;
+  
+  lexer_->main_input_name_ = in_file;
 
   progress_indication (_ ("Parsing..."));
 
   set_yydebug (0);
-  lexer_->new_input (init, source_);
+  lexer_->new_input (init, &input_file_->sources_);
   do_yyparse ();
 
   progress_indication ("\n");
   
-  if (!define_spots_.empty ())
+  if (!define_spots_.is_empty ())
     {
       define_spots_.top ().warning (_ ("Braces don't match"));
       error_level_ = 1;
     }
 
-  inclusion_globals = lexer_->filename_strings_;
+  input_file_->inclusion_names_ = lexer_->filename_strings_;
 
   error_level_ = error_level_ | lexer_->errorlevel_; // ugh naming.
 }
@@ -91,12 +92,29 @@ 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().
+   */
+  /*
+    Actually, that gets very icky when there are white space, because
+    the line-numbers are all wrong.  Let's try the character before
+    the current token. That gets the right result for
+    note/duration stuff, but doesn't mess up for errors in the 1st token of the line. 
+    
+   */
+  Input hi (lexer_->here_input ());
+
+  char const * bla = hi.defined_str0_;
+  if (hi.line_number () > 1
+      || hi.column_number () > 1)
+    bla --;
+  
+  return Input (hi.source_file_, bla);
 }
 
-// move me?
 #include "paper-def.hh"
-#include "translator-def.hh"
+#include "context-def.hh"
 
 My_lily_parser * current_parser;
 
@@ -114,7 +132,7 @@ My_lily_parser::paper_description ()
   SCM l = SCM_EOL;
   for (SCM s = al ; gh_pair_p (s); s = ly_cdr (s))
     {
-      Translator_def * td = unsmob_translator_def (ly_cdar (s));
+      Context_def * td = unsmob_context_def (ly_cdar (s));
       l = gh_cons (gh_cons (ly_caar (s), td->to_alist ()),  l);
     }
   return l;