%{
-#define YYDEBUG 1
-#define YYERROR_VERBOSE 1
-
#define yyerror Lily_parser::parser_error
/* We use custom location type: Input objects */
%parse-param {Lily_parser *parser}
%lex-param {Lily_parser *parser}
+%error-verbose
+%debug
/* We use SCMs to do strings, because it saves us the trouble of
deleting them. Let's hope that a stack overflow doesn't trigger a move
%type <scm> music_bare
%type <scm> music_arg
%type <scm> music_assign
+%type <scm> music_embedded
+%type <scm> music_or_context_def
%type <scm> complex_music
%type <scm> complex_music_prefix
%type <scm> mode_changed_music
%type <scm> event_function_event
%type <scm> figure_list
%type <scm> figure_spec
-%type <scm> fraction
%type <scm> full_markup
%type <scm> full_markup_list
%type <scm> function_arglist
%type <scm> identifier_init
%type <scm> lilypond
%type <scm> lilypond_header
-%type <scm> lilypond_header_body
%type <scm> lyric_element
%type <scm> lyric_element_arg
%type <scm> lyric_element_music
lilypond
| EMBEDDED_LILY {
SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
- parser->lexer_->push_note_state (alist_to_hashq (nn));
+ parser->lexer_->push_note_state (nn);
} embedded_lilypond {
parser->lexer_->pop_state ();
parser->lexer_->set_identifier (ly_symbol2scm ("parseStringResult"), $3);
toplevel_expression:
- lilypond_header {
- parser->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
+ {
+ parser->lexer_->add_scope (get_header (parser));
+ } lilypond_header {
+ parser->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $2);
}
| book_block {
Book *book = $1;
$$ = MAKE_SYNTAX ("void-music", @$);
}
| identifier_init
- | music music music_list {
- $$ = MAKE_SYNTAX ("sequential-music", @$,
- scm_cons2 ($1, $2, scm_reverse_x ($3, SCM_EOL)));
+ | music_embedded music_embedded music_list {
+ $3 = scm_reverse_x ($3, SCM_EOL);
+ if (unsmob_music ($2))
+ $3 = scm_cons ($2, $3);
+ if (unsmob_music ($1))
+ $3 = scm_cons ($1, $3);
+ $$ = MAKE_SYNTAX ("sequential-music", @$, $3);
}
| error {
parser->error_level_ = 1;
lilypond_header_body:
- {
- $$ = get_header (parser);
- parser->lexer_->add_scope ($$);
- }
+ /* empty */
| lilypond_header_body assignment {
}
$$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (parser->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
$$->paper_->unprotect ();
push_paper (parser, $$->paper_);
- $$->header_ = parser->lexer_->lookup_identifier ("$defaultheader");
+ $$->header_ = get_header (parser);
parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $$->self_scm ());
}
| BOOK_IDENTIFIER {
SCM proc = parser->lexer_->lookup_identifier ("book-text-handler");
scm_call_2 (proc, $$->self_scm (), $2);
}
- | book_body lilypond_header {
- $$->header_ = $2;
- }
+ | book_body
+ {
+ parser->lexer_->add_scope ($1->header_);
+ } lilypond_header
| book_body embedded_scm { }
| book_body error {
$$->paper_ = 0;
SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler");
scm_call_2 (proc, $$->self_scm (), $2);
}
- | bookpart_body lilypond_header {
- $$->header_ = $2;
- }
+ | bookpart_body
+ {
+ if (!ly_is_module ($1->header_))
+ $1->header_ = ly_make_module (false);
+ parser->lexer_->add_scope ($1->header_);
+ } lilypond_header
| bookpart_body embedded_scm { }
| bookpart_body error {
$$->paper_ = 0;
$$->protect ();
$$->origin ()->set_spot (@$);
}
- | score_body lilypond_header {
- $$->set_header ($2);
- }
+ | score_body
+ {
+ if (!ly_is_module ($1->get_header ()))
+ $1->set_header (ly_make_module (false));
+ parser->lexer_->add_scope ($1->get_header ());
+ } lilypond_header
| score_body output_def {
if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T)
{
}
;
+// We need this weird nonterminal because both music as well as a
+// context definition can start with \context and the difference is
+// only apparent after looking at the next token. If it is '{', there
+// is still time to escape from notes mode.
+
+music_or_context_def:
+ music_arg
+ {
+ parser->lexer_->pop_state ();
+ }
+ | CONTEXT
+ {
+ parser->lexer_->pop_state ();
+ } '{' context_def_spec_body '}'
+ {
+ $$ = $4;
+ }
+ ;
+
output_def_body:
output_def_head_with_mode_switch '{' {
$$ = $1;
| output_def_body assignment {
}
- | output_def_body context_def_spec_block {
- assign_context_def ($$, $2);
- }
- | output_def_body music_arg {
- SCM proc = parser->lexer_->lookup_identifier ("output-def-music-handler");
- scm_call_3 (proc, parser->self_scm (), $1->self_scm (), $2);
+ | output_def_body
+ {
+ SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
+ parser->lexer_->push_note_state (nn);
+ } music_or_context_def
+ {
+ if (unsmob_context_def ($3))
+ assign_context_def ($$, $3);
+ else {
+
+ SCM proc = parser->lexer_->lookup_identifier
+ ("output-def-music-handler");
+ scm_call_3 (proc, parser->self_scm (),
+ $1->self_scm (), $3);
+ }
}
| output_def_body error {
/* empty */ {
$$ = SCM_EOL;
}
- | music_list music {
- $$ = scm_cons ($2, $1);
- }
- | music_list embedded_scm {
-
+ | music_list music_embedded {
+ if (unsmob_music ($2))
+ $$ = scm_cons ($2, $1);
}
| music_list error {
Music *m = MY_MAKE_MUSIC("Music", @$);
| lyric_element_music
;
+music_embedded:
+ music
+ | embedded_scm
+ {
+ if (unsmob_music ($1)
+ || scm_is_eq ($1, SCM_UNSPECIFIED))
+ $$ = $1;
+ else
+ {
+ @$.warning (_ ("Ignoring non-music expression"));
+ $$ = SCM_UNSPECIFIED;
+ }
+ }
+ ;
+
music_arg:
simple_music
{
$$ = check_scheme_arg (parser, @3,
$3, $1, $2);
}
- | function_arglist_backup REPARSE fraction
- {
- $$ = check_scheme_arg (parser, @3,
- $3, $1, $2);
- }
;
function_arglist:
$$ = check_scheme_arg (parser, @3,
$3, $2, $1);
}
- | EXPECT_SCM function_arglist_closed_optional fraction
+ | EXPECT_SCM function_arglist_closed_optional FRACTION
{
$$ = check_scheme_arg (parser, @3,
$3, $2, $1);
$$ = check_scheme_arg (parser, @3,
$3, $2, $1);
}
- | EXPECT_SCM function_arglist_closed_optional fraction
+ | EXPECT_SCM function_arglist_closed_optional FRACTION
{
$$ = check_scheme_arg (parser, @3,
$3, $2, $1);
mode_changing_head:
NOTEMODE {
SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
- parser->lexer_->push_note_state (alist_to_hashq (nn));
+ parser->lexer_->push_note_state (nn);
$$ = ly_symbol2scm ("notes");
}
| DRUMMODE
{
SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames");
- parser->lexer_->push_note_state (alist_to_hashq (nn));
+ parser->lexer_->push_note_state (nn);
$$ = ly_symbol2scm ("drums");
}
SCM nn = parser->lexer_->lookup_identifier ("chordmodifiers");
parser->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
nn = parser->lexer_->lookup_identifier ("pitchnames");
- parser->lexer_->push_chord_state (alist_to_hashq (nn));
+ parser->lexer_->push_chord_state (nn);
$$ = ly_symbol2scm ("chords");
}
mode_changing_head_with_context:
DRUMS {
SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames");
- parser->lexer_->push_note_state (alist_to_hashq (nn));
+ parser->lexer_->push_note_state (nn);
$$ = ly_symbol2scm ("DrumStaff");
}
SCM nn = parser->lexer_->lookup_identifier ("chordmodifiers");
parser->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
nn = parser->lexer_->lookup_identifier ("pitchnames");
- parser->lexer_->push_chord_state (alist_to_hashq (nn));
+ parser->lexer_->push_chord_state (nn);
$$ = ly_symbol2scm ("ChordNames");
}
| LYRICS
}
;
-fraction:
- FRACTION { $$ = $1; }
- | UNSIGNED '/' UNSIGNED {
- $$ = scm_cons ($1, $3);
- }
- ;
-
dots:
/* empty */ {
$$ = 0;
}
| SCORE {
SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
- parser->lexer_->push_note_state (alist_to_hashq (nn));
+ parser->lexer_->push_note_state (nn);
} '{' score_body '}' {
Score * sc = $4;
$$ = scm_list_2 (ly_lily_module_constant ("score-markup"), sc->self_scm ());
projects / lilypond.git / blobdiff