source file of the LilyPond music typesetter
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include <strstream.h>
+#include <sstream>
+#include "config.h"
-
-#include "file-path.hh"
#include "includable-lexer.hh"
+#include "file-path.hh"
#include "source-file.hh"
#include "source.hh"
-#include "debug.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 \
+ (yy_buffer_stack != 0 ? yy_buffer_stack[yy_buffer_stack_top] : 0)
+#endif
+
Includable_lexer::Includable_lexer ()
{
+#ifdef HAVE_FLEXLEXER_YY_CURRENT_BUFFER
yy_current_buffer = 0;
+#endif
allow_includes_b_ = true;
}
return;
}
- Source_file * sl = global_sources->get_file_l (s);
+ Source_file * sl = global_sources->get_file (s);
if (!sl)
{
- String msg = _f ("can't find file: `%s\'", s);
- msg += _f ("\nSearch path is `%s'\n", global_sources->path_C_->str ().ch_C());
- LexerError (msg.ch_C ());
+ String msg = _f ("can't find file: `%s'", s);
+ msg += "\n";
+ msg += _f ("(search path: `%s')", global_sources->path_C_->to_string ().to_str0 ());
+ msg += "\n";
+ LexerError (msg.to_str0 ());
return;
}
- filename_str_arr_.push (sl->name_str ());
+ filename_strings_.push (sl->name_string ());
char_count_stack_.push (0);
if (yy_current_buffer)
state_stack_.push (yy_current_buffer);
- *mlog << "[" << s<< flush;
+
+ if (verbose_global_b)
+ progress_indication (String ("[") + s);
+
include_stack_.push (sl);
/*
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 (sl->istream_l (), YY_BUF_SIZE));
-
+ */
+ yy_switch_to_buffer (yy_create_buffer (sl->get_istream (), YY_BUF_SIZE));
}
+
+/*
+ Unused.
+ */
void
Includable_lexer::new_input (String name, String data, Sources* sources)
{
Source_file* file = new Source_file (name, data);
sources->add (file);
- filename_str_arr_.push (name);
+ filename_strings_.push (name);
char_count_stack_.push (0);
if (yy_current_buffer)
state_stack_.push (yy_current_buffer);
- *mlog << "[" << name << flush;
+
+ if (verbose_global_b)
+ progress_indication (String ("[") + name);
include_stack_.push (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
{
include_stack_.pop ();
char_count_stack_.pop ();
- *mlog << "]"<<flush;
+ if (verbose_global_b)
+ progress_indication ("]");
yy_delete_buffer (yy_current_buffer);
+#ifdef HAVE_FLEXLEXER_YY_CURRENT_BUFFER
yy_current_buffer = 0;
+#endif
if (state_stack_.empty ())
{
+#ifdef 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_.pop ());
+ return true;
+ }
}
char const*
-Includable_lexer::here_ch_C ()
+Includable_lexer::here_str0 () const
{
if (include_stack_.empty ())
return 0;
- return include_stack_.top ()->ch_C () + char_count_stack_.top ();
+ return include_stack_.top ()->to_str0 () + char_count_stack_.top ();
}
Includable_lexer::~Includable_lexer ()
}
Source_file*
-Includable_lexer::source_file_l () const
+Includable_lexer::get_source_file () const
{
if (include_stack_.empty ())
return 0;