X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fincludable-lexer.cc;h=f0eed9eb6c48e9e2aea49f6b64a972f261d5b6ba;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=65bea4d00b25973378509c0978fb8a3530024be3;hpb=af770f3440264c18ce01525dce1aa76b86ace0d5;p=lilypond.git diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc index 65bea4d00b..f0eed9eb6c 100644 --- 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 + (c) 1997--2008 Han-Wen Nienhuys */ #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,19 +41,12 @@ 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) { - if (!allow_includes_b_) - { - LexerError (_ ("include files are not allowed in safe mode").c_str ()); - return; - } - Source_file *file = sources->get_file (&name); if (!file) {