SCM lookup_identifier (string s);
SCM lookup_identifier_symbol (SCM s);
void push_extra_token (int token_type);
- void push_embedded_token ();
void push_chord_state (SCM tab);
void push_figuredbass_state ();
void push_lyric_state ();
extra_token_types_.push_back (token_type);
}
-void
-Lily_lexer::push_embedded_token ()
-{
- push_extra_token (EMBEDDED_LILY);
-}
-
void
Lily_lexer::push_chord_state (SCM tab)
{
lexer_->new_input (lexer_->main_input_name_, ly_code, sources_);
SCM mod = lexer_->set_current_scope ();
- lexer_->push_embedded_token ();
+ lexer_->push_extra_token (EMBEDDED_LILY);
do_yyparse ();
- SCM result = lexer_->lookup_identifier_symbol (ly_symbol2scm ("$parseStringResult"));
- // $parseStringResult is set in the grammar rule for embedded_lilypond
+ SCM result = lexer_->lookup_identifier_symbol (ly_symbol2scm ("parseStringResult"));
+ // parseStringResult is set in the grammar rule for embedded_lilypond
scm_set_current_module (mod);
PARSER->lexer_->push_note_state (alist_to_hashq (nn));
} embedded_lilypond {
PARSER->lexer_->pop_state ();
- PARSER->lexer_->set_identifier (ly_symbol2scm ("$parseStringResult"), $3);
+ PARSER->lexer_->set_identifier (ly_symbol2scm ("parseStringResult"), $3);
}
;
| error {
PARSER->error_level_ = 1;
}
- | embedded_lilypond INVALID {
+ | INVALID embedded_lilypond {
PARSER->error_level_ = 1;
}
;