X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fincludable-lexer.cc;h=ff48f271aa47f8e6340a908739cd43ed06f75508;hb=db4dd36b622417b5fe4c4a4660402e0ac7b5beb1;hp=1adf85425d4d6f5eef95fc944d10e19ec41a1083;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git

diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index 1adf85425d..ff48f271aa 100644
--- a/lily/includable-lexer.cc
+++ b/lily/includable-lexer.cc
@@ -3,109 +3,137 @@
 
   source file of the LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include <strstream.h>
+#include <sstream>
+
+#include "config.hh"
 
 #include "includable-lexer.hh"
+#include "file-path.hh"
 #include "source-file.hh"
 #include "source.hh"
-#include "debug.hh"
+#include "warn.hh"
+#include "main.hh"
 
 #ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE 16384
 #endif
 
 #ifndef YY_START
-#define YY_START ((yy_start - 1) / 2)
+#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
+
 Includable_lexer::Includable_lexer ()
 {
+#if HAVE_FLEXLEXER_YY_CURRENT_BUFFER
   yy_current_buffer = 0;
+#endif
+  allow_includes_b_ = true;
 }
 
-/** 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)
+  if (!allow_includes_b_)
     {
-      String msg = _f ("can't find file: `%s\'", s);
-      LexerError (msg.ch_C ());
+      LexerError (_ ("include files are not allowed in safe mode").to_str0 ());
       return;
     }
-  filename_str_arr_.push (sl->name_str ());
+  
+  Source_file *file = sources->get_file (name);
+  if (!file)
+    {
+      String msg = _f ("can't find file: `%s'", name);
+      msg += "\n";
+      msg += _f ("(search path: `%s')",
+		 sources->path_->to_string ().to_str0 ());
+      msg += "\n";
+      LexerError (msg.to_str0 ());
+      return;
+    }
+  filename_strings_.push (file->name_string ());
 
   char_count_stack_.push (0);
   if (yy_current_buffer)
     state_stack_.push (yy_current_buffer);
-  *mlog << "[" << s<<flush;
-  include_stack_.push (sl);
-
-  /*
-    ugh. We'd want to create a buffer from the bytes directly.
 
-    Whoops. The size argument to yy_create_buffer is not the
-    filelength but a BUFFERSIZE. Maybe this is why reading stdin fucks up.
+  if (verbose_global_b)
+    progress_indication (String ("[") + name);
+	
+  include_stack_.push (file);
 
-    */
-  yy_switch_to_buffer (yy_create_buffer (sl->istream_l (), YY_BUF_SIZE));
+  /* Ugh. We'd want to create a buffer from the bytes directly.
 
+    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)
+Includable_lexer::new_input (String name, String data, Sources *sources)
 {
-  Source_file* file = new Source_file (name, data);
+  Source_file *file = new Source_file (name, data);
   sources->add (file);
-  filename_str_arr_.push (name);
+  filename_strings_.push (name);
 
   char_count_stack_.push (0);
   if (yy_current_buffer)
     state_stack_.push (yy_current_buffer);
-  *mlog << "[" << name << flush;
+
+  if (verbose_global_b)
+    progress_indication (String ("[") + name);
   include_stack_.push (file);
 
-  yy_switch_to_buffer (yy_create_buffer (file->istream_l (), YY_BUF_SIZE));
+  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 ();
-  *mlog << "]"<<flush;
+  if (verbose_global_b)
+    progress_indication ("]");
   yy_delete_buffer (yy_current_buffer);
+#if HAVE_FLEXLEXER_YY_CURRENT_BUFFER  
   yy_current_buffer = 0;
-  if (state_stack_.empty ())
+#endif  
+  if (state_stack_.is_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_.pop ());
+  return true;
 }
 
 char const*
-Includable_lexer::here_ch_C ()
+Includable_lexer::here_str0 () const
 {
-  if (include_stack_.empty ())
+  if (include_stack_.is_empty ())
     return 0;
-  return include_stack_.top ()->ch_C () + char_count_stack_.top ();
+  return include_stack_.top ()->to_str0 () + char_count_stack_.top ();
 }
 
 Includable_lexer::~Includable_lexer ()
 {
-  while (!include_stack_.empty ())
+  while (!include_stack_.is_empty ())
     {
       close_input ();
     }
@@ -121,9 +149,9 @@ Includable_lexer::add_lexed_char (int count)
 }
 
 Source_file*
-Includable_lexer::source_file_l () const
+Includable_lexer::get_source_file () const
 {
-  if (include_stack_.empty ())
+  if (include_stack_.is_empty ())
     return 0;
   else
     return include_stack_.top ();