X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fincludable-lexer.cc;h=f0eed9eb6c48e9e2aea49f6b64a972f261d5b6ba;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=a757385a1d1a29ec9909c53148415ff22765eb6d;hpb=6721fc6f4e26e0bf88b744fe171330cb182e52ff;p=lilypond.git

diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index a757385a1d..f0eed9eb6c 100644
--- a/lily/includable-lexer.cc
+++ b/lily/includable-lexer.cc
@@ -3,32 +3,36 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "includable-lexer.hh"
+
 #include <sstream>
-#include "config.h"
+using namespace std;
+
+#include "config.hh"
 
-#include "includable-lexer.hh"
 #include "file-path.hh"
+#include "international.hh"
+#include "main.hh"
 #include "source-file.hh"
-#include "source.hh"
+#include "sources.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 \
+#define yy_current_buffer						\
   (yy_buffer_stack != 0 ? yy_buffer_stack[yy_buffer_stack_top] : 0)
 #endif
 
@@ -37,121 +41,102 @@ Includable_lexer::Includable_lexer ()
 #if HAVE_FLEXLEXER_YY_CURRENT_BUFFER
   yy_current_buffer = 0;
 #endif
-  allow_includes_b_ = true;
 }
 
 /** Set the new input file to NAME, remember old file.  */
 void
-Includable_lexer::new_input (String name, Sources *sources)
+Includable_lexer::new_input (string name, Sources *sources)
 {
-  if (!allow_includes_b_)
-    {
-      LexerError (_ ("include files are not allowed").to_str0 ());
-      return;
-    }
-  
-  Source_file *file = sources->get_file (name);
+  Source_file *file = sources->get_file (&name);
   if (!file)
     {
-      String msg = _f ("can't find file: `%s'", name);
+      string msg = _f ("cannot find file: `%s'", name);
       msg += "\n";
       msg += _f ("(search path: `%s')",
-		 sources->path_->to_string ().to_str0 ());
-      msg += "\n";
-      LexerError (msg.to_str0 ());
+		 sources->path_->to_string ().c_str ());
+      LexerError (msg.c_str ());
       return;
     }
-  filename_strings_.push (file->name_string ());
+  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);
+    state_stack_.push_back (yy_current_buffer);
 
-  if (verbose_global_b)
-    progress_indication (String ("[") + name);
-	
-  include_stack_.push (file);
+  if (be_verbose_global)
+    progress_indication (string ("[") + name);
+
+  include_stack_.push_back (file);
 
   /* 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.  */
+  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);
   sources->add (file);
-  filename_strings_.push (name);
+  file_name_strings_.push_back (name);
 
-  char_count_stack_.push (0);
+  char_count_stack_.push_back (0);
   if (yy_current_buffer)
-    state_stack_.push (yy_current_buffer);
+    state_stack_.push_back (yy_current_buffer);
 
-  if (verbose_global_b)
-    progress_indication (String ("[") + name);
-  include_stack_.push (file);
+  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 ();
-  if (verbose_global_b)
+  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  
+#if HAVE_FLEXLEXER_YY_CURRENT_BUFFER
   yy_current_buffer = 0;
-#endif  
-  if (state_stack_.is_empty ())
+#endif
+  if (state_stack_.empty ())
     {
-#if HAVE_FLEXLEXER_YY_CURRENT_BUFFER  
+#if HAVE_FLEXLEXER_YY_CURRENT_BUFFER
       yy_current_buffer = 0;
-#endif  
+#endif
       return false;
     }
-  yy_switch_to_buffer (state_stack_.pop ());
+  yy_switch_to_buffer (state_stack_.back ());
+  state_stack_.pop_back ();
   return true;
 }
 
-char const*
+char const *
 Includable_lexer::here_str0 () const
 {
-  if (include_stack_.is_empty ())
+  if (include_stack_.empty ())
     return 0;
-  return include_stack_.top ()->to_str0 () + char_count_stack_.top ();
+  return include_stack_.back ()->c_str () + char_count_stack_.back ();
 }
 
 Includable_lexer::~Includable_lexer ()
 {
-  while (!include_stack_.is_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;
+  while (!include_stack_.empty ())
+    close_input ();
 }
 
-Source_file*
+Source_file *
 Includable_lexer::get_source_file () const
 {
-  if (include_stack_.is_empty ())
+  if (include_stack_.empty ())
     return 0;
-  else
-    return include_stack_.top ();
+  return include_stack_.back ();
 }