#include "input.hh"
static Keyword_ent the_key_tab[]={
+ {"autochange", AUTOCHANGE},
{"spanrequest", SPANREQUEST},
{"simultaneous", SIMULTANEOUS},
{"sequential", SEQUENTIAL},
{"mm", MM_T},
{"name", NAME},
{"notenames", NOTENAMES},
- {"notes" , NOTES},
+ {"notes", NOTES},
{"partial", PARTIAL},
{"paper", PAPER},
{"penalty", PENALTY},
void
My_lily_lexer::start_main_input ()
{
- if (!monitor->silent_b ("InitDeclarations") && check_debug)
+ if (flower_dstream && !flower_dstream->silent_b ("InitDeclarations") && flower_dstream)
print_declarations (true);
- if (!monitor->silent_b ("InitLexer") && check_debug)
+ if (flower_dstream && !flower_dstream->silent_b ("InitLexer") && flower_dstream)
set_debug (1);
{
#if 0
if (unique_b)
- old->warning(_f ("redeclaration of `\\%s\'", name_str));
+ old->warning(_f ("redeclaration of `\\%s'", name_str));
#endif
delete old;
}
if (lookup_keyword (name_str) >= 0)
{
- warning ( _f ("Identifier name is a keyword (`%s')", name_str));
+ warning ( _f ("Identifier name is a keyword: `%s'", name_str));
}
scope_l_arr_.top ()->elem (name_str) = i;
{
for (int i=scope_l_arr_.size (); i--; )
{
- DOUT << "Scope no. " << i << '\n';
+ DEBUG_OUT << "Scope no. " << i << '\n';
scope_l_arr_[i]->print ();
}
}
Input
My_lily_lexer::here_input () const
{
- Source_file * f_l= source_file_l();
- return Input (f_l, here_ch_C());
+ Source_file * f_l= source_file_l ();
+ return Input (f_l, (char*)here_ch_C ());
}