/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#endif
#ifndef YY_START
-#define YY_START \
+#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 \
+#define yy_current_buffer \
(yy_buffer_stack != 0 ? yy_buffer_stack[yy_buffer_stack_top] : 0)
#endif
string msg = _f ("cannot find file: `%s'", name);
msg += "\n";
msg += _f ("(search path: `%s')",
- (current_dir.length () ? (current_dir + PATHSEP) : "") + sources->path_->to_string ().c_str ());
+ (current_dir.length () ? (current_dir + PATHSEP) : "") + sources->path_->to_string ().c_str ());
LexerError (msg.c_str ());
return;
}
if (yy_current_buffer)
state_stack_.push_back (yy_current_buffer);
- if (be_verbose_global)
- {
- string spaces = "";
- for (size_t i = 0; i < state_stack_.size (); i++)
- spaces += " ";
- progress_indication (string ("\n") + spaces + string ("[") + file->name_string ());
- }
+ debug_output (string (state_stack_.size (), ' ') // indentation!
+ + string ("[") + file->name_string ());
include_stack_.push_back (file);
if (yy_current_buffer)
state_stack_.push_back (yy_current_buffer);
- if (be_verbose_global)
- {
- string spaces = "";
- for (size_t i = 0; i < state_stack_.size (); i++)
- spaces += " ";
- progress_indication (string ("\n") + spaces + string ("[") + name);
- }
+ debug_output (string (state_stack_.size (), ' ') // indentation!
+ + string ("[") + name);
include_stack_.push_back (file);
yy_switch_to_buffer (yy_create_buffer (file->get_istream (), YY_BUF_SIZE));
{
include_stack_.pop_back ();
char_count_stack_.pop_back ();
- if (be_verbose_global)
- progress_indication ("]");
+ debug_output ("]", false);
yy_delete_buffer (yy_current_buffer);
#if HAVE_FLEXLEXER_YY_CURRENT_BUFFER
yy_current_buffer = 0;