X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fincludable-lexer.cc;h=7d506373f32788674bf3c3fd8bc4f02720cdf33e;hb=9c3ecc7d6e596e8151a58ce7ed0dd9e1b0802d1e;hp=3728476203d6c442f07a1db16d6f605f8506fb21;hpb=dccb52c3a040eb61328bf7bb9aae9a90b59e1120;p=lilypond.git

diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index 3728476203..7d506373f3 100644
--- a/lily/includable-lexer.cc
+++ b/lily/includable-lexer.cc
@@ -3,102 +3,147 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
+
 #include "includable-lexer.hh"
+
+#include <sstream>
+using namespace std;
+
+#include "config.hh"
+
+#include "file-name.hh"
+#include "file-path.hh"
+#include "international.hh"
+#include "main.hh"
 #include "source-file.hh"
-#include "source.hh"
+#include "sources.hh"
+#include "warn.hh"
 
 #ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE 16384
 #endif
 
+#ifndef YY_START
+#define YY_START				\
+  ((yy_start - 1) / 2)
+#define YYSTATE YY_START
+#endif
+
+/* Flex >= 2.5.29 has include stack; but we don't use that yet.  */
+#if !HAVE_FLEXLEXER_YY_CURRENT_BUFFER
+#define yy_current_buffer						\
+  (yy_buffer_stack != 0 ? yy_buffer_stack[yy_buffer_stack_top] : 0)
+#endif
+
+extern bool relative_includes;
+
 Includable_lexer::Includable_lexer ()
 {
+#if HAVE_FLEXLEXER_YY_CURRENT_BUFFER
   yy_current_buffer = 0;
+#endif
 }
 
-/** set the  new input to s, remember old file.
-*/
+/** Set the new input file to NAME, remember old file.  */
 void
-Includable_lexer::new_input (String s, Sources  * global_sources)
+Includable_lexer::new_input (string name, Sources *sources)
 {
-  Source_file * sl = global_sources->get_file_l (s);
-  if (!sl)
+  string current_dir = dir_name (main_input_name_);
+  if (relative_includes)
+    current_dir = include_stack_.size () ? dir_name (include_stack_.back ()->name_string ()) : "";
+
+  Source_file *file = sources->get_file (name, current_dir);
+  if (!file)
     {
-      String msg =_ ("Can't find file `") + s+ "'";
-      LexerError (msg.ch_C ());
+      string msg = _f ("cannot find file: `%s'", name);
+      msg += "\n";
+      msg += _f ("(search path: `%s')",
+		 (current_dir.length () ? (current_dir + PATHSEP) : "") + sources->path_->to_string ().c_str ());
+      LexerError (msg.c_str ());
       return;
     }
+  file_name_strings_.push_back (file->name_string ());
 
-
-  char_count_stack_.push (0);
+  char_count_stack_.push_back (0);
   if (yy_current_buffer)
-    state_stack_.push (yy_current_buffer);
-  cout << "[" << s<<flush;
-  include_stack_.push (sl);
+    state_stack_.push_back (yy_current_buffer);
+
+  if (be_verbose_global)
+    progress_indication (string ("[") + file->name_string ());
 
-  /*
-    ugh. We'd want to create a buffer from the bytes directly.
+  include_stack_.push_back (file);
 
-    Whoops. The size argument to yy_create_buffer is not the
-    filelength but a BUFFERSIZE. Maybe this is why reading stdin fucks up.
+  /* Ugh. We'd want to create a buffer from the bytes directly.
 
-    */
-  yy_switch_to_buffer (yy_create_buffer (sl->istream_l (), YY_BUF_SIZE));
+  Whoops.  The size argument to yy_create_buffer is not the
+  filelength but a BUFFERSIZE.  Maybe this is why reading stdin fucks up.  */
+  yy_switch_to_buffer (yy_create_buffer (file->get_istream (), YY_BUF_SIZE));
+}
+
+void
+Includable_lexer::new_input (string name, string data, Sources *sources)
+{
+  Source_file *file = new Source_file (name, data);
+  sources->add (file);
+  file_name_strings_.push_back (name);
+
+  char_count_stack_.push_back (0);
+  if (yy_current_buffer)
+    state_stack_.push_back (yy_current_buffer);
+
+  if (be_verbose_global)
+    progress_indication (string ("[") + name);
+  include_stack_.push_back (file);
+
+  yy_switch_to_buffer (yy_create_buffer (file->get_istream (), YY_BUF_SIZE));
 }
 
 /** pop the inputstack.  conceptually this is a destructor, but it
-  does not destruct the Source_file that Includable_lexer::new_input creates.  */
+    does not destruct the Source_file that Includable_lexer::new_input
+    creates.  */
 bool
 Includable_lexer::close_input ()
 {
-  include_stack_.pop ();
-  char_count_stack_.pop ();
-  cout << "]"<<flush;
+  include_stack_.pop_back ();
+  char_count_stack_.pop_back ();
+  if (be_verbose_global)
+    progress_indication ("]");
   yy_delete_buffer (yy_current_buffer);
+#if HAVE_FLEXLEXER_YY_CURRENT_BUFFER
   yy_current_buffer = 0;
+#endif
   if (state_stack_.empty ())
     {
+#if HAVE_FLEXLEXER_YY_CURRENT_BUFFER
+      yy_current_buffer = 0;
+#endif
       return false;
     }
-  else
-      {
-	yy_switch_to_buffer (state_stack_.pop ());
-	return true;
-      }
+  yy_switch_to_buffer (state_stack_.back ());
+  state_stack_.pop_back ();
+  return true;
 }
 
-char const*
-Includable_lexer::here_ch_C ()
+char const *
+Includable_lexer::here_str0 () const
 {
   if (include_stack_.empty ())
     return 0;
-  return include_stack_.top ()->ch_C () + char_count_stack_.top ();
+  return include_stack_.back ()->c_str () + char_count_stack_.back ();
 }
 
 Includable_lexer::~Includable_lexer ()
 {
   while (!include_stack_.empty ())
-    {
-      close_input ();
-    }
-}
-/**
-  Since we don't create the buffer state from the bytes directly, we
-  don't know about the location of the lexer. Add this as a
-  YY_USER_ACTION */
-void
-Includable_lexer::add_lexed_char (int count)
-{
-  char_count_stack_.top () += count;
+    close_input ();
 }
 
-Source_file*
-Includable_lexer::source_file_l () const
+Source_file *
+Includable_lexer::get_source_file () const
 {
   if (include_stack_.empty ())
     return 0;
-  else
-    return include_stack_.top ();
+  return include_stack_.back ();
 }