lexer_->unprotect ();
}
-Lily_parser::Lily_parser (Lily_parser const &src, SCM closures)
+Lily_parser::Lily_parser (Lily_parser const &src, SCM closures, SCM location)
{
lexer_ = 0;
sources_ = src.sources_;
smobify_self ();
if (src.lexer_)
{
- lexer_ = new Lily_lexer (*src.lexer_, this);
+ lexer_ = new Lily_lexer (*src.lexer_, this, location);
+ lexer_->unprotect ();
}
-
- lexer_->unprotect ();
}
Lily_parser::~Lily_parser ()
Lily_parser::parse_string (string ly_code)
{
lexer_->main_input_name_ = "<string>";
- lexer_->is_main_input_ = true;
lexer_->new_input (lexer_->main_input_name_, ly_code, sources_);
SCM mod = lexer_->set_current_scope ();
int line)
{
lexer_->main_input_name_ = filename;
- lexer_->is_main_input_ = true;
lexer_->new_input (lexer_->main_input_name_, ly_code, sources_);
if (line)
{
SCM parser = lexer_->lookup_identifier_symbol (ly_symbol2scm ("parser"));
lexer_->set_identifier (ly_symbol2scm ("parser"), self_scm ());
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 = do_yyparse ();
lexer_->set_identifier (ly_symbol2scm ("parser"), parser);
scm_set_current_module (mod);