Run `make grand-replace'.

[lilypond.git] / lily / includable-lexer.cc

diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index f43feee573a8a7c0aa62a9da5f2e7ca63b759381..f0eed9eb6c48e9e2aea49f6b64a972f261d5b6ba 100644 (file)
--- a/lily/includable-lexer.cc
+++ b/lily/includable-lexer.cc
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "includable-lexer.hh"
@@ -17,7 +17,7 @@ using namespace std;
 #include "international.hh"
 #include "main.hh"
 #include "source-file.hh"
-#include "source.hh"
+#include "sources.hh"
 #include "warn.hh"
 
 #ifndef YY_BUF_SIZE
@@ -41,23 +41,16 @@ 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 (std::string name, Sources *sources)
+Includable_lexer::new_input (string name, Sources *sources)
 {
-  if (!allow_includes_b_)
-    {
-      LexerError (_ ("include files are not allowed in safe mode").c_str ());
-      return;
-    }
-
-  Source_file *file = sources->get_file (name);
+  Source_file *file = sources->get_file (&name);
   if (!file)
     {
-      std::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 ().c_str ());
@@ -71,7 +64,7 @@ Includable_lexer::new_input (std::string name, Sources *sources)
     state_stack_.push_back (yy_current_buffer);
 
   if (be_verbose_global)
-    progress_indication (std::string ("[") + name);
+    progress_indication (string ("[") + name);
 
   include_stack_.push_back (file);
 
@@ -83,7 +76,7 @@ Includable_lexer::new_input (std::string name, Sources *sources)
 }
 
 void
-Includable_lexer::new_input (std::string name, std::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);
@@ -94,7 +87,7 @@ Includable_lexer::new_input (std::string name, std::string data, Sources *source
     state_stack_.push_back (yy_current_buffer);
 
   if (be_verbose_global)
-    progress_indication (std::string ("[") + name);
+    progress_indication (string ("[") + name);
   include_stack_.push_back (file);
 
   yy_switch_to_buffer (yy_create_buffer (file->get_istream (), YY_BUF_SIZE));