X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fincludable-lexer.cc;h=f0eed9eb6c48e9e2aea49f6b64a972f261d5b6ba;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=2634c1a1db50caabee4228816573911ef72c4420;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc index 2634c1a1db..f0eed9eb6c 100644 --- a/lily/includable-lexer.cc +++ b/lily/includable-lexer.cc @@ -3,142 +3,140 @@ source file of the LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ -#include +#include "includable-lexer.hh" + +#include +using namespace std; +#include "config.hh" #include "file-path.hh" -#include "includable-lexer.hh" +#include "international.hh" +#include "main.hh" #include "source-file.hh" -#include "source.hh" -#include "debug.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 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; - allow_includes_b_ = true; +#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) { - if (!allow_includes_b_) - { - LexerError ("include files are disallowed."); - return; - } - - Source_file * sl = global_sources->get_file_l (s); - if (!sl) + Source_file *file = sources->get_file (&name); + if (!file) { - String msg = _f ("Can't find file: `%s'", s); - msg += "\n"; - msg += _f ("(search path: `%s')", global_sources->path_C_->str ().ch_C()); + string msg = _f ("cannot find file: `%s'", name); msg += "\n"; - LexerError (msg.ch_C ()); - + msg += _f ("(search path: `%s')", + sources->path_->to_string ().c_str ()); + LexerError (msg.c_str ()); return; } - filename_str_arr_.push (sl->name_str ()); + 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); - progress_indication (String ("[") + s); - - include_stack_.push (sl); + state_stack_.push_back (yy_current_buffer); - /* - ugh. We'd want to create a buffer from the bytes directly. + if (be_verbose_global) + progress_indication (string ("[") + name); - Whoops. The size argument to yy_create_buffer is not the - filelength but a BUFFERSIZE. Maybe this is why reading stdin fucks up. + include_stack_.push_back (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); + 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); - progress_indication (String ("[") + name); - include_stack_.push (file); + 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->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 (); - progress_indication ("]"); + 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 () const +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 (); }