X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=a6b3b99d585ae4c395ae5f0e7b04e63cc987018b;hb=5e3f01b8ce09646a55838687ba4f1f38e2989afb;hp=c4806d741c3b6021ec4d46864958ed8ae31a148b;hpb=b82a74e8a67881d8dbe11bdc9c09dbe853236370;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index c4806d741c..a6b3b99d58 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -2,7 +2,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2012 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -46,7 +46,7 @@ %lex-param {Lily_parser *parser} /* We use SCMs to do strings, because it saves us the trouble of -deleting them. Let's hope that a stack overflow doesnt trigger a move +deleting them. Let's hope that a stack overflow doesn't trigger a move of the parse stack onto the heap. */ %left PREC_BOT @@ -201,7 +201,7 @@ while (0) scm_apply_0 (proc, args) /* Syntactic Sugar. */ #define MAKE_SYNTAX(name, location, ...) \ - LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (parser->self_scm (), make_input (location) , ##__VA_ARGS__, SCM_UNDEFINED)); + LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (parser->self_scm (), make_input (location) , ##__VA_ARGS__, SCM_UNDEFINED)) #define START_MAKE_SYNTAX(name, ...) \ scm_list_n (ly_lily_module_constant (name) , ##__VA_ARGS__, SCM_UNDEFINED) #define FINISH_MAKE_SYNTAX(start, location, ...) \ @@ -223,7 +223,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 +404,7 @@ If we give names, Bison complains. %type music %type music_bare %type music_arg +%type music_assign %type complex_music %type complex_music_prefix %type mode_changed_music @@ -458,6 +459,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 @@ -468,7 +471,6 @@ If we give names, Bison complains. %type embedded_scm_bare %type embedded_scm_bare_arg %type embedded_scm_closed -%type embedded_scm_chord_body %type event_function_event %type figure_list %type figure_spec @@ -479,6 +481,8 @@ If we give names, Bison complains. %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 @@ -508,12 +512,12 @@ 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 %type music_function_event %type music_function_chord_body -%type music_function_chord_body_arglist %type new_chord %type new_lyrics %type number_expression @@ -637,7 +641,7 @@ toplevel_expression: embedded_scm_bare: SCM_TOKEN { - $$ = parser->lexer_->eval_scm ($1); + $$ = parser->lexer_->eval_scm_token ($1); } | SCM_IDENTIFIER ; @@ -775,17 +779,8 @@ identifier_init: | context_def_spec_block { $$ = $1; } - | music { - /* Hack: Create event-chord around standalone events. - Prevents the identifier from being interpreted as a post-event. */ - Music *mus = unsmob_music ($1); - bool is_event = mus && - (scm_memq (ly_symbol2scm ("event"), mus->get_property ("types")) - != SCM_BOOL_F); - if (!is_event) - $$ = $1; - else - $$ = MAKE_SYNTAX ("event-chord", @$, scm_list_1 ($1)); + | music_assign { + $$ = $1; } | post_event_nofinger { $$ = $1; @@ -793,6 +788,9 @@ identifier_init: | number_expression { $$ = $1; } + | FRACTION { + $$ = $1; + } | string { $$ = $1; } @@ -817,6 +815,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 (); @@ -826,18 +845,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); } @@ -848,6 +855,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)); + } + } ; @@ -873,8 +887,6 @@ book_body: push_paper (parser, $$->paper_); $$->header_ = parser->lexer_->lookup_identifier ("$defaultheader"); 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); @@ -1091,6 +1103,10 @@ output_def_body: | 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 error { } @@ -1137,16 +1153,30 @@ braced_music_list: } ; -music: simple_music +music: music_arg | lyric_element_music - | composite_music %prec COMPOSITE ; 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: REPEAT simple_string unsigned_number music { @@ -1229,12 +1259,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 ()); } ; @@ -1277,28 +1304,20 @@ function_arglist_skip: { $$ = scm_cons ($1, $3); } %prec FUNCTION_ARGLIST - | EXPECT_SCM EXPECT_DURATION function_arglist_skip + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip { $$ = scm_cons ($1, $3); } %prec FUNCTION_ARGLIST ; -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); @@ -1337,6 +1356,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 @@ -1605,7 +1647,7 @@ function_arglist_common_minus: function_arglist_closed: function_arglist_closed_common - | function_arglist_nonbackup + | function_arglist_closed_nonbackup ; function_arglist_closed_common: @@ -1947,16 +1989,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); + } } ; @@ -2035,21 +2080,34 @@ simple_string: STRING { scalar: embedded_scm_arg | bare_number + | FRACTION | lyric_element ; scalar_closed: embedded_scm_arg_closed | bare_number + | FRACTION | lyric_element ; event_chord: - /* TODO: Create a special case that avoids the creation of - EventChords around simple_elements that have no post_events? - */ - simple_chord_elements post_events { + simple_element post_events { + // Let the rhythmic music iterator sort this mess out. + 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)); Input i; @@ -2062,8 +2120,6 @@ event_chord: Input i; i.set_location (@1, @3); $$ = MAKE_SYNTAX ("repetition-chord", i, - parser->lexer_->chord_repetition_.last_chord_, - parser->lexer_->chord_repetition_.repetition_function_, $2, scm_reverse_x ($3, SCM_EOL)); } | MULTI_MEASURE_REST optional_notemode_duration post_events { @@ -2073,13 +2129,7 @@ event_chord: scm_reverse_x ($3, SCM_EOL)); } | command_element - /* note chord elements are memorized into - parser->lexer_->chord_repetition_ so that the chord repetition - mechanism copy them when a chord repetition symbol is found - */ - | note_chord_element { - parser->lexer_->chord_repetition_.last_chord_ = $$; - } + | note_chord_element ; @@ -2111,7 +2161,8 @@ chord_body: chord_body_elements: /* empty */ { $$ = SCM_EOL; } | chord_body_elements chord_body_element { - $$ = scm_cons ($2, $1); + if (!SCM_UNBNDP ($2)) + $$ = scm_cons ($2, $1); } ; @@ -2153,43 +2204,24 @@ chord_body_element: $$ = n->unprotect (); } | music_function_chord_body - ; - -/* We can't accept a music argument, not even a closed one, - * immediately before chord_body_elements, otherwise a function \fun - * with a signature of two music arguments can't be sorted out - * properly in a construct like - * <\fun { c } \fun { c } c> - * The second call could be interpreted either as a chord constituent - * or a music expression. - */ - -music_function_chord_body_arglist: - function_arglist_bare - | EXPECT_SCM music_function_chord_body_arglist embedded_scm_chord_body { - $$ = check_scheme_arg (parser, @3, - $3, $2, $1); - } - ; + Music *m = unsmob_music ($1); -embedded_scm_chord_body: - embedded_scm_bare_arg - | SCM_FUNCTION music_function_chord_body_arglist { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); + while (m && m->is_mus_type ("music-wrapper-music")) { + $$ = m->get_property ("element"); + m = unsmob_music ($$); + } + + if (!(m && m->is_mus_type ("rhythmic-event"))) { + parser->parser_error (@$, _ ("not a rhythmic event")); + $$ = SCM_UNDEFINED; + } } - | bare_number - | fraction - | lyric_element - | chord_body_element ; music_function_chord_body: - MUSIC_FUNCTION music_function_chord_body_arglist { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); - } + music_function_call + | MUSIC_IDENTIFIER ; // Event functions may only take closed arglists, otherwise it would @@ -2534,15 +2566,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: @@ -2717,31 +2757,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", @$); @@ -2766,10 +2812,7 @@ simple_element: ; simple_chord_elements: - simple_element { - $$ = scm_list_1 ($1); - } - | new_chord { + new_chord { if (!parser->lexer_->is_chord_state ()) parser->parser_error (@1, _ ("have to be in Chord mode for chords")); $$ = $1; @@ -2795,45 +2838,42 @@ lyric_element: lyric_element_arg: lyric_element | lyric_element multiplied_duration post_events { - SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2); - $$ = MAKE_SYNTAX ("event-chord", @$, - scm_cons (lyric_event, - scm_reverse_x ($3, SCM_EOL))); + $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2); + if (scm_is_pair ($3)) + unsmob_music ($$)->set_property + ("articulations", scm_reverse_x ($3, SCM_EOL)); } | lyric_element post_event post_events { - SCM lyric_event = - MAKE_SYNTAX ("lyric-event", @$, $1, - parser->default_duration_.smobbed_copy ()); - $$ = MAKE_SYNTAX ("event-chord", @$, - scm_cons2 (lyric_event, $2, - scm_reverse_x ($3, SCM_EOL))); - + $$ = MAKE_SYNTAX ("lyric-event", @$, $1, + parser->default_duration_.smobbed_copy ()); + unsmob_music ($$)->set_property + ("articulations", scm_cons ($2, scm_reverse_x ($3, SCM_EOL))); } | LYRIC_ELEMENT optional_notemode_duration post_events { - SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2); - $$ = MAKE_SYNTAX ("event-chord", @$, - scm_cons (lyric_event, - scm_reverse_x ($3, SCM_EOL))); + $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2); + if (scm_is_pair ($3)) + unsmob_music ($$)->set_property + ("articulations", scm_reverse_x ($3, SCM_EOL)); } ; lyric_element_music: lyric_element optional_notemode_duration post_events { - SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2); - $$ = MAKE_SYNTAX ("event-chord", @$, - scm_cons (lyric_event, - scm_reverse_x ($3, SCM_EOL))); + $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2); + if (scm_is_pair ($3)) + unsmob_music ($$)->set_property + ("articulations", scm_reverse_x ($3, SCM_EOL)); } ; 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)); } ; @@ -2940,10 +2980,10 @@ number_factor: bare_number: bare_number_closed | UNSIGNED NUMBER_IDENTIFIER { - $$ = scm_product ($1, $2) + $$ = scm_product ($1, $2); } | REAL NUMBER_IDENTIFIER { - $$ = scm_product ($1, $2) + $$ = scm_product ($1, $2); } ; @@ -3226,9 +3266,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) unsmob_music (*destination)-> set_property ("origin", make_input (last_input_)); - bool is_event = scm_memq (ly_symbol2scm ("event"), mus->get_property ("types")) - != SCM_BOOL_F; - + bool is_event = mus->is_mus_type ("post-event"); mus->unprotect (); return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER; } else if (unsmob_pitch (sid)) { @@ -3357,10 +3395,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