= {
{"accepts", ACCEPTS},
{"addlyrics", ADDLYRICS},
- {"addquote", ADDQUOTE},
{"alias", ALIAS},
{"alternative", ALTERNATIVE},
{"book", BOOK},
{"new", NEWCONTEXT},
{"notemode", NOTEMODE},
{"objectid", OBJECTID},
- {"octave", OCTAVE},
{"once", ONCE},
{"override", OVERRIDE},
{"paper", PAPER},
}
int
-Lily_lexer::lookup_keyword (std::string s)
+Lily_lexer::lookup_keyword (string s)
{
return keytable_->lookup (s.c_str ());
}
}
SCM
-Lily_lexer::lookup_identifier (std::string name)
+Lily_lexer::lookup_identifier (string name)
{
return lookup_identifier_symbol (ly_symbol2scm (name.c_str ()));
}
{
if (lookup_keyword (ly_symbol2string (sym)) >= 0)
{
- std::string symstr = ly_symbol2string (sym);
+ string symstr = ly_symbol2string (sym);
warning (_f ("identifier name is a keyword: `%s'", symstr.c_str ()));
}
void
Lily_lexer::LexerError (char const *s)
{
- if (include_stack_.is_empty ())
+ if (include_stack_.empty ())
message (_f ("error at EOF: %s", s) + "\n");
else
{
char const *start = here_str0 ();
lexloc->set (get_source_file (),
start, start + count);
- char_count_stack_.top () += count;
+ char_count_stack_.back () += count;
}
#include "ly-smobs.icc"