source file of the LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <strstream.h>
+
+#include "file-path.hh"
#include "includable-lexer.hh"
#include "source-file.hh"
#include "source.hh"
#include "debug.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
Source_file * sl = global_sources->get_file_l (s);
if (!sl)
{
- String msg = _f ("can't find file: `%s\'", s);
+ String msg = _f ("can't find file: `%s'", s);
+ msg += "\n";
+ msg += _f ("(search path: `%s')", global_sources->path_C_->str ().ch_C ());
+ msg += "\n";
LexerError (msg.ch_C ());
+
return;
}
filename_str_arr_.push (sl->name_str ());
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));
}
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));
{
include_stack_.pop ();
char_count_stack_.pop ();
- *mlog << "]"<<flush;
+ if (verbose_global_b)
+ progress_indication ("]");
yy_delete_buffer (yy_current_buffer);
yy_current_buffer = 0;
if (state_stack_.empty ())
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_ch_C () const
{
if (include_stack_.empty ())
return 0;