source file of the LilyPond music typesetter
- (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
+#include "includable-lexer.hh"
+
#include <sstream>
+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 "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. */
-#ifndef HAVE_FLEXLEXER_YY_CURRENT_BUFFER
-#define yy_current_buffer \
+#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 ()
{
-#ifdef HAVE_FLEXLEXER_YY_CURRENT_BUFFER
+#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)
{
- if (!allow_includes_b_)
+ Source_file *file = sources->get_file (&name);
+ if (!file)
{
- LexerError ("include files are disallowed.");
- return;
- }
-
- Source_file * sl = global_sources->get_file (s);
- if (!sl)
- {
- String msg = _f ("can't find file: `%s'", s);
+ string msg = _f ("cannot find file: `%s'", name);
msg += "\n";
- msg += _f ("(search path: `%s')", global_sources->path_C_->to_string ().to_str0 ());
- msg += "\n";
- LexerError (msg.to_str0 ());
-
+ msg += _f ("(search path: `%s')",
+ sources->path_->to_string ().c_str ());
+ LexerError (msg.c_str ());
return;
}
- filename_strings_.push (sl->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 ("[") + s);
-
- include_stack_.push (sl);
+ if (be_verbose_global)
+ progress_indication (string ("[") + name);
- /*
- ugh. We'd want to create a buffer from the bytes directly.
+ include_stack_.push_back (file);
- Whoops. The size argument to yy_create_buffer is not the
- filelength but a BUFFERSIZE. Maybe this is why reading stdin fucks up.
+ /* Ugh. We'd want to create a buffer from the bytes directly.
- */
- yy_switch_to_buffer (yy_create_buffer (sl->get_istream (), YY_BUF_SIZE));
+ 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));
}
-/*
- Unused.
- */
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_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);
-#ifdef HAVE_FLEXLEXER_YY_CURRENT_BUFFER
+#if HAVE_FLEXLEXER_YY_CURRENT_BUFFER
yy_current_buffer = 0;
-#endif
+#endif
if (state_stack_.empty ())
{
-#ifdef HAVE_FLEXLEXER_YY_CURRENT_BUFFER
+#if HAVE_FLEXLEXER_YY_CURRENT_BUFFER
yy_current_buffer = 0;
-#endif
+#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*
+char const *
Includable_lexer::here_str0 () const
{
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_.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*
+Source_file *
Includable_lexer::get_source_file () const
{
if (include_stack_.empty ())
return 0;
- else
- return include_stack_.top ();
+ return include_stack_.back ();
}
projects / lilypond.git / blobdiff