/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
{
}
-
SCM
Lily_parser::mark_smob (SCM s)
{
}
int
-Lily_parser::print_smob (SCM s, SCM port, scm_print_state*)
+Lily_parser::print_smob (SCM s, SCM port, scm_print_state *)
{
scm_puts ("#<Lily_parser ", port);
Lily_parser *parser = (Lily_parser *) SCM_CELL_WORD_1 (s);
Don't mix cyclic pointers with weak tables.
*/
lexer_->set_identifier (ly_symbol2scm ("parser"),
- SCM_EOL);
+ SCM_EOL);
ly_reexport_module (scm_current_module ());
scm_set_current_module (mod);
{
// TODO: use $parser
lexer_->set_identifier (ly_symbol2scm ("parser"),
- self_scm ());
+ self_scm ());
lexer_->main_input_name_ = "<string>";
lexer_->is_main_input_ = true;
if (!define_spots_.empty ())
{
if (define_spots_.empty ()
- && !error_level_)
- programming_error ("define_spots_ don't match, but error_level_ not set.");
+ && !error_level_)
+ programming_error ("define_spots_ don't match, but error_level_ not set.");
}
error_level_ = error_level_ | lexer_->error_level_;
}
+SCM
+Lily_parser::parse_string_expression (string ly_code)
+{
+ // TODO: use $parser
+ lexer_->set_identifier (ly_symbol2scm ("parser"),
+ self_scm ());
+
+ 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 ();
+ lexer_->push_embedded_token ();
+ do_yyparse ();
+ SCM result = lexer_->lookup_identifier_symbol (ly_symbol2scm ("$parseStringResult"));
+ // $parseStringResult is set in the grammar rule for embedded_lilypond
+
+ scm_set_current_module (mod);
+
+ if (!define_spots_.empty ())
+ {
+ if (define_spots_.empty ()
+ && !error_level_)
+ programming_error ("define_spots_ don't match, but error_level_ not set.");
+ }
+
+ error_level_ = error_level_ | lexer_->error_level_;
+ return result;
+}
+
void
Lily_parser::include_string (string ly_code)
{
if (lexer_)
{
while (lexer_->has_scope ())
- lexer_->remove_scope ();
+ lexer_->remove_scope ();
}
lexer_ = 0;
error_level_ = 1;
}
-
-
IMPLEMENT_SMOBS (Lily_parser);
IMPLEMENT_TYPE_P (Lily_parser, "ly:lily-parser?");
IMPLEMENT_DEFAULT_EQUAL_P (Lily_parser);
-
/****************************************************************
OUTPUT-DEF
****************************************************************/
get_paper (Lily_parser *parser)
{
SCM papers = parser->lexer_->lookup_identifier ("$papers");
- Output_def *layout = ((papers == SCM_UNDEFINED) || scm_is_null (papers)) ?
- 0 : unsmob_output_def (scm_car (papers));
+ Output_def *layout = ((papers == SCM_UNDEFINED) || scm_is_null (papers))
+ ? 0 : unsmob_output_def (scm_car (papers));
SCM default_paper = parser->lexer_->lookup_identifier ("$defaultpaper");
layout = layout ? layout : unsmob_output_def (default_paper);