X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=fc9aea63be73c95966a31ebe207b12228fdff2bf;hb=9f2135fa9453892d7ddd3bb9c57f83f9a4e95f11;hp=71b476cca0c6348e11d5643546cb64e04bd0811a;hpb=940309ad0e403897f556c8253e69708121b91765;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 71b476cca0..fc9aea63be 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -29,9 +29,6 @@ %{ -#define YYDEBUG 1 -#define YYERROR_VERBOSE 1 - #define yyerror Lily_parser::parser_error /* We use custom location type: Input objects */ @@ -44,6 +41,8 @@ %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 @@ -223,7 +222,7 @@ static Music *make_music_with_input (SCM name, Input where); SCM check_scheme_arg (Lily_parser *parser, Input loc, SCM arg, SCM args, SCM pred); SCM loc_on_music (Input loc, SCM arg); -SCM make_chord_elements (SCM pitch, SCM dur, SCM modification_list); +SCM make_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list); SCM make_chord_step (int step, Rational alter); SCM make_simple_markup (SCM a); bool is_duration (int t); @@ -404,6 +403,9 @@ If we give names, Bison complains. %type music %type music_bare %type music_arg +%type music_assign +%type music_embedded +%type music_or_context_def %type complex_music %type complex_music_prefix %type mode_changed_music @@ -458,6 +460,8 @@ If we give names, Bison complains. %type context_def_spec_block %type context_def_spec_body %type context_mod +%type context_mod_arg +%type context_mod_embedded %type context_mod_list %type context_prop_spec %type direction_less_char @@ -471,13 +475,14 @@ If we give names, Bison complains. %type event_function_event %type figure_list %type figure_spec -%type fraction %type full_markup %type full_markup_list %type function_arglist %type function_arglist_optional %type function_arglist_backup %type function_arglist_nonbackup +%type function_arglist_nonbackup_common +%type function_arglist_closed_nonbackup %type function_arglist_skip %type function_arglist_bare %type function_arglist_closed @@ -491,7 +496,6 @@ If we give names, Bison complains. %type identifier_init %type lilypond %type lilypond_header -%type lilypond_header_body %type lyric_element %type lyric_element_arg %type lyric_element_music @@ -507,6 +511,7 @@ If we give names, Bison complains. %type markup_head_1_list %type markup_list %type markup_top +%type maybe_notemode_duration %type mode_changing_head %type mode_changing_head_with_context %type multiplied_duration @@ -559,7 +564,7 @@ start_symbol: 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); @@ -581,8 +586,10 @@ lilypond: /* empty */ { } 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; @@ -635,7 +642,7 @@ toplevel_expression: embedded_scm_bare: SCM_TOKEN { - $$ = parser->lexer_->eval_scm ($1); + $$ = parser->lexer_->eval_scm_token ($1); } | SCM_IDENTIFIER ; @@ -696,9 +703,13 @@ embedded_lilypond: $$ = 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; @@ -710,10 +721,7 @@ embedded_lilypond: lilypond_header_body: - { - $$ = get_header (parser); - parser->lexer_->add_scope ($$); - } + /* empty */ | lilypond_header_body assignment { } @@ -773,7 +781,7 @@ identifier_init: | context_def_spec_block { $$ = $1; } - | music { + | music_assign { $$ = $1; } | post_event_nofinger { @@ -782,6 +790,9 @@ identifier_init: | number_expression { $$ = $1; } + | FRACTION { + $$ = $1; + } | string { $$ = $1; } @@ -806,6 +817,27 @@ context_def_spec_block: } ; +context_mod_arg: + embedded_scm + | composite_music + ; + +context_mod_embedded: + context_mod_arg + { + if (unsmob_music ($1)) { + SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler"); + $1 = scm_call_2 (proc, parser->self_scm (), $1); + } + if (unsmob_context_mod ($1)) + $$ = $1; + else { + parser->parser_error (@1, _ ("not a context mod")); + } + } + ; + + context_def_spec_body: /**/ { $$ = Context_def::make_scm (); @@ -815,18 +847,6 @@ context_def_spec_body: $$ = $1; unsmob_context_def ($$)->origin ()->set_spot (@$); } - | context_def_spec_body embedded_scm { - if (Context_mod *cm = unsmob_context_mod ($2)) { - SCM p = cm->get_mods (); - Context_def*td = unsmob_context_def ($$); - - for (; scm_is_pair (p); p = scm_cdr (p)) { - td->add_context_mod (scm_car (p)); - } - } else { - parser->parser_error (@2, _ ("not a context mod")); - } - } | context_def_spec_body context_mod { unsmob_context_def ($$)->add_context_mod ($2); } @@ -837,6 +857,13 @@ context_def_spec_body: td->add_context_mod (scm_car (m)); } } + | context_def_spec_body context_mod_embedded { + Context_def *td = unsmob_context_def ($$); + SCM new_mods = unsmob_context_mod ($2)->get_mods (); + for (SCM m = new_mods; scm_is_pair (m); m = scm_cdr (m)) { + td->add_context_mod (scm_car (m)); + } + } ; @@ -860,10 +887,8 @@ book_body: $$->paper_ = dynamic_cast (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 ()); - parser->lexer_->set_identifier (ly_symbol2scm ("book-output-suffix"), SCM_BOOL_F); - parser->lexer_->set_identifier (ly_symbol2scm ("book-filename"), SCM_BOOL_F); } | BOOK_IDENTIFIER { $$ = unsmob_book ($1); @@ -901,9 +926,10 @@ book_body: 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; @@ -954,9 +980,12 @@ bookpart_body: 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; @@ -986,9 +1015,12 @@ score_body: $$->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) { @@ -1059,6 +1091,25 @@ output_def_head_with_mode_switch: } ; +// 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; @@ -1077,8 +1128,21 @@ output_def_body: | output_def_body assignment { } - | output_def_body context_def_spec_block { - assign_context_def ($$, $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 { @@ -1104,11 +1168,9 @@ music_list: /* 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", @$); @@ -1126,14 +1188,43 @@ braced_music_list: } ; -music: simple_music +music: music_arg | lyric_element_music - | composite_music %prec COMPOSITE + ; + +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 + { + if (unsmob_pitch ($1)) { + Music *n = MY_MAKE_MUSIC ("NoteEvent", @1); + n->set_property ("pitch", $1); + n->set_property ("duration", + parser->default_duration_.smobbed_copy ()); + $$ = n->unprotect (); + } + } + | composite_music %prec COMPOSITE + ; + +music_assign: simple_music | composite_music %prec COMPOSITE + | lyric_element_music ; repeated_music: @@ -1218,12 +1309,9 @@ context_mod_list: if (md) unsmob_context_mod ($1)->add_context_mods (md->get_mods ()); } - | context_mod_list embedded_scm { - Context_mod *md = unsmob_context_mod ($2); - if (md) - unsmob_context_mod ($1)->add_context_mods (md->get_mods ()); - else - parser->parser_error (@2, _ ("not a context mod")); + | context_mod_list context_mod_embedded { + unsmob_context_mod ($1)->add_context_mods + (unsmob_context_mod ($2)->get_mods ()); } ; @@ -1273,21 +1361,13 @@ function_arglist_skip: ; -function_arglist_nonbackup: +function_arglist_nonbackup_common: EXPECT_OPTIONAL EXPECT_PITCH function_arglist pitch_also_in_chords { $$ = scm_cons ($4, $3); } | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed duration_length { $$ = scm_cons ($4, $3); } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg_closed - { - $$ = check_scheme_arg (parser, @4, $4, $3, $2); - } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number_closed - { - $$ = check_scheme_arg (parser, @4, $4, $3, $2); - } | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed FRACTION { $$ = check_scheme_arg (parser, @4, $4, $3, $2); @@ -1326,6 +1406,29 @@ function_arglist_nonbackup: } ; +function_arglist_closed_nonbackup: + function_arglist_nonbackup_common + | EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg_closed + { + $$ = check_scheme_arg (parser, @4, $4, $3, $2); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number_closed + { + $$ = check_scheme_arg (parser, @4, $4, $3, $2); + } + ; + +function_arglist_nonbackup: + function_arglist_nonbackup_common + | EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg + { + $$ = check_scheme_arg (parser, @4, $4, $3, $2); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number + { + $$ = check_scheme_arg (parser, @4, $4, $3, $2); + } + ; function_arglist_keep: function_arglist_common @@ -1479,11 +1582,6 @@ function_arglist_backup: $$ = check_scheme_arg (parser, @3, $3, $1, $2); } - | function_arglist_backup REPARSE fraction - { - $$ = check_scheme_arg (parser, @3, - $3, $1, $2); - } ; function_arglist: @@ -1503,7 +1601,7 @@ function_arglist_common: $$ = 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); @@ -1594,7 +1692,7 @@ function_arglist_common_minus: function_arglist_closed: function_arglist_closed_common - | function_arglist_nonbackup + | function_arglist_closed_nonbackup ; function_arglist_closed_common: @@ -1642,7 +1740,7 @@ function_arglist_closed_common: $$ = 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); @@ -1790,14 +1888,14 @@ mode_changed_music: 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"); } @@ -1810,7 +1908,7 @@ mode_changing_head: 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"); } @@ -1823,7 +1921,7 @@ mode_changing_head: 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"); } @@ -1836,7 +1934,7 @@ mode_changing_head_with_context: 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 @@ -1936,16 +2034,19 @@ context_mod: | context_def_mod STRING { $$ = scm_list_2 ($1, $2); } - | context_def_mod embedded_scm { - if (ly_symbol2scm ("consists") != $1) - { - $$ = SCM_EOL; - parser->parser_error (@1, _ ("only \\consists takes non-string argument.")); - } - else - { - $$ = scm_list_2 ($1, $2); - } + | context_def_mod embedded_scm + { + if (!scm_is_string ($2) + && ly_symbol2scm ("consists") != $1 + && ly_symbol2scm ("remove") != $1) + { + $$ = SCM_EOL; + parser->parser_error (@1, _ ("only \\consists and \\remove take non-string argument.")); + } + else + { + $$ = scm_list_2 ($1, $2); + } } ; @@ -2024,12 +2125,14 @@ simple_string: STRING { scalar: embedded_scm_arg | bare_number + | FRACTION | lyric_element ; scalar_closed: embedded_scm_arg_closed | bare_number + | FRACTION | lyric_element ; @@ -2037,9 +2140,17 @@ scalar_closed: event_chord: simple_element post_events { // Let the rhythmic music iterator sort this mess out. - if (scm_is_pair ($2)) - unsmob_music ($1)->set_property ("articulations", + if (scm_is_pair ($2)) { + if (unsmob_pitch ($1)) { + Music *n = MY_MAKE_MUSIC ("NoteEvent", @1); + n->set_property ("pitch", $1); + n->set_property ("duration", + parser->default_duration_.smobbed_copy ()); + $$ = n->unprotect (); + } + unsmob_music ($$)->set_property ("articulations", scm_reverse_x ($2, SCM_EOL)); + } } | simple_chord_elements post_events { SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL)); @@ -2500,15 +2611,23 @@ duration_length: } ; -optional_notemode_duration: +maybe_notemode_duration: { - Duration dd = parser->default_duration_; - $$ = dd.smobbed_copy (); + $$ = SCM_UNDEFINED; } | multiplied_duration { $$ = $1; parser->default_duration_ = *unsmob_duration ($$); } +; + + +optional_notemode_duration: + maybe_notemode_duration + { + if (SCM_UNBNDP ($$)) + $$ = parser->default_duration_.smobbed_copy (); + } ; steno_duration: @@ -2544,13 +2663,6 @@ multiplied_duration: } ; -fraction: - FRACTION { $$ = $1; } - | UNSIGNED '/' UNSIGNED { - $$ = scm_cons ($1, $3); - } - ; - dots: /* empty */ { $$ = 0; @@ -2683,31 +2795,37 @@ optional_rest: ; simple_element: - pitch exclamations questions octave_check optional_notemode_duration optional_rest { + pitch exclamations questions octave_check maybe_notemode_duration optional_rest { if (!parser->lexer_->is_note_state ()) parser->parser_error (@1, _ ("have to be in Note mode for notes")); - - Music *n = 0; - if ($6) - n = MY_MAKE_MUSIC ("RestEvent", @$); - else - n = MY_MAKE_MUSIC ("NoteEvent", @$); - - n->set_property ("pitch", $1); - n->set_property ("duration", $5); - - if (scm_is_number ($4)) + if ($2 || $3 || scm_is_number ($4) || !SCM_UNBNDP ($5) || $6) { - int q = scm_to_int ($4); - n->set_property ("absolute-octave", scm_from_int (q-1)); + Music *n = 0; + if ($6) + n = MY_MAKE_MUSIC ("RestEvent", @$); + else + n = MY_MAKE_MUSIC ("NoteEvent", @$); + + n->set_property ("pitch", $1); + if (SCM_UNBNDP ($5)) + n->set_property ("duration", + parser->default_duration_.smobbed_copy ()); + else + n->set_property ("duration", $5); + + if (scm_is_number ($4)) + { + int q = scm_to_int ($4); + n->set_property ("absolute-octave", scm_from_int (q-1)); + } + + if ($3 % 2) + n->set_property ("cautionary", SCM_BOOL_T); + if ($2 % 2 || $3 % 2) + n->set_property ("force-accidental", SCM_BOOL_T); + + $$ = n->unprotect (); } - - if ($3 % 2) - n->set_property ("cautionary", SCM_BOOL_T); - if ($2 % 2 || $3 % 2) - n->set_property ("force-accidental", SCM_BOOL_T); - - $$ = n->unprotect (); } | DRUM_PITCH optional_notemode_duration { Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); @@ -2789,11 +2907,11 @@ lyric_element_music: new_chord: steno_tonic_pitch optional_notemode_duration { - $$ = make_chord_elements ($1, $2, SCM_EOL); + $$ = make_chord_elements (@$, $1, $2, SCM_EOL); } | steno_tonic_pitch optional_notemode_duration chord_separator chord_items { SCM its = scm_reverse_x ($4, SCM_EOL); - $$ = make_chord_elements ($1, $2, scm_cons ($3, its)); + $$ = make_chord_elements (@$, $1, $2, scm_cons ($3, its)); } ; @@ -3098,7 +3216,7 @@ simple_markup: } | 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 ()); @@ -3315,10 +3433,15 @@ make_chord_step (int step, Rational alter) SCM -make_chord_elements (SCM pitch, SCM dur, SCM modification_list) +make_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list) { SCM chord_ctor = ly_lily_module_constant ("construct-chord-elements"); - return scm_call_3 (chord_ctor, pitch, dur, modification_list); + SCM res = scm_call_3 (chord_ctor, pitch, dur, modification_list); + for (SCM s = res; scm_is_pair (s); s = scm_cdr (s)) + { + unsmob_music (scm_car (s))->set_spot (loc); + } + return res; } int