static Keyword_ent the_key_tab[]={
{"accepts", ACCEPTS},
{"bar", BAR},
+ {"break", BREAK},
{"cadenza", CADENZA},
{"clear", CLEAR},
{"clef", CLEF},
{"output", OUTPUT},
{"partial", PARTIAL},
{"paper", PAPER},
- {"plet", PLET},
{"property", PROPERTY},
{"pt", PT_T},
{"score", SCORE},
{"script", SCRIPT},
+ {"shape", SHAPE},
{"skip", SKIP},
{"staff", STAFF},
{"table", TABLE},
- {"spandynamic", SPANDYNAMIC},
+ {"spandynamic", SPANDYNAMIC},
{"symboltables", SYMBOLTABLES},
{"tempo", TEMPO},
{"texid", TEXID},
int
My_lily_lexer::lookup_keyword (String s)
{
- return keytable_p_->lookup (s);
+ return keytable_p_->lookup (s.ch_C ());
}
Identifier*
{
if (!identifier_p_dict_p_->elt_b (s))
return 0;
-
+
return (*identifier_p_dict_p_)[s];
}
My_lily_lexer::set_identifier (String name_str, Identifier*i)
{
Identifier *old = lookup_identifier (name_str);
- if (old)
+ if (old)
{
- old->warning("redeclaration of \\" + name_str);
+ old->warning(_("redeclaration of \\") + name_str);
delete old;
}
(*identifier_p_dict_p_)[name_str] = i;
delete keytable_p_;
for (Assoc_iter<String,Identifier*>
- ai (*identifier_p_dict_p_); ai.ok(); ai++)
+ ai (*identifier_p_dict_p_); ai.ok(); ai++)
{
DOUT << "deleting: " << ai.key()<<'\n';
delete ai.val();
My_lily_lexer::print_declarations (bool init_b) const
{
for (Assoc_iter<String,Identifier*> ai (*identifier_p_dict_p_);
- ai.ok(); ai++)
+ ai.ok(); ai++)
{
- if (ai.val()->init_b_ == init_b)
+ if (ai.val()->init_b_ == init_b)
{
DOUT << ai.key() << '=';
ai.val()->print ();
void
My_lily_lexer::LexerError (char const *s)
{
- if (include_stack_.empty())
+ if (include_stack_.empty())
{
- *mlog << "error at EOF" << s << '\n';
+ *mlog << _("error at EOF") << s << '\n';
}
- else
+ else
{
errorlevel_i_ |= 1;
Input spot (source_file_l(),here_ch_C());
delete note_tab_p_;
note_tab_p_ = new Notename_table;
}
+
+char
+My_lily_lexer::escaped_char(char c) const
+{
+ switch(c)
+ {
+ case 'n':
+ return '\n';
+ case 't':
+ return '\t';
+
+ case '\'':
+ case '\"':
+ case '\\':
+ return c;
+ }
+ return 0;
+}