X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=0bb4c152f273455dd1e02f201803e66d8eeaa685;hb=766e64a52830a300841dae05235f5aa96fd330fa;hp=5f18eef53191b046830953038da9a8c2561233ed;hpb=0c34fe54a73dec156d4ed33a47647388588385df;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 5f18eef531..0bb4c152f2 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2010 Han-Wen Nienhuys + Copyright (C) 1997--2011 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -84,6 +84,7 @@ using namespace std; #include "book.hh" #include "context-def.hh" +#include "context-mod.hh" #include "dimensions.hh" #include "file-path.hh" #include "input.hh" @@ -198,7 +199,6 @@ void set_music_properties (Music *p, SCM a); %token MIDI "\\midi" %token NAME "\\name" %token NOTEMODE "\\notemode" -%token OBJECTID "\\objectid" %token OCTAVE "\\octave" %token ONCE "\\once" %token OVERRIDE "\\override" @@ -271,6 +271,7 @@ If we give names, Bison complains. %token EXPECT_MARKUP; %token EXPECT_MUSIC; %token EXPECT_SCM; +%token EXPECT_MARKUP_LIST /* After the last argument. */ %token EXPECT_NO_MORE_ARGS; @@ -279,29 +280,17 @@ If we give names, Bison complains. %token CHORD_MODIFIER %token CHORD_REPETITION %token CONTEXT_DEF_IDENTIFIER +%token CONTEXT_MOD_IDENTIFIER %token DRUM_PITCH %token DURATION_IDENTIFIER %token EVENT_IDENTIFIER %token FRACTION %token LYRICS_STRING %token LYRIC_MARKUP_IDENTIFIER -%token MARKUP_HEAD_EMPTY -%token MARKUP_HEAD_LIST0 -%token MARKUP_HEAD_MARKUP0 -%token MARKUP_HEAD_MARKUP0_MARKUP1 -%token MARKUP_HEAD_SCM0 -%token MARKUP_HEAD_SCM0_MARKUP1 -%token MARKUP_HEAD_SCM0_SCM1 -%token MARKUP_HEAD_SCM0_SCM1_MARKUP2 -%token MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3 -%token MARKUP_HEAD_SCM0_MARKUP1_MARKUP2 -%token MARKUP_HEAD_SCM0_SCM1_SCM2 -%token MARKUP_LIST_HEAD_EMPTY -%token MARKUP_LIST_HEAD_LIST0 -%token MARKUP_LIST_HEAD_SCM0 -%token MARKUP_LIST_HEAD_SCM0_LIST1 -%token MARKUP_LIST_HEAD_SCM0_SCM1_LIST2 +%token MARKUP_FUNCTION +%token MARKUP_LIST_FUNCTION %token MARKUP_IDENTIFIER +%token MARKUPLINES_IDENTIFIER %token MUSIC_FUNCTION %token MUSIC_IDENTIFIER %token NOTENAME_PITCH @@ -346,6 +335,7 @@ If we give names, Bison complains. %type chord_body_element %type command_element %type command_event +%type context_modification %type context_change %type direction_less_event %type direction_reqd_event @@ -411,6 +401,8 @@ If we give names, Bison complains. %type markup_braced_list_body %type markup_composed_list %type markup_command_list +%type markup_command_list_arguments +%type markup_command_basic_arguments %type markup_head_1_item %type markup_head_1_list %type markup_list @@ -426,7 +418,6 @@ If we give names, Bison complains. %type number_expression %type number_factor %type number_term -%type object_id_setting %type octave_check %type optional_context_mod %type optional_id @@ -447,6 +438,7 @@ If we give names, Bison complains. %type step_number %type step_numbers %type string +%type tempo_range %type score_block %type score_body @@ -475,10 +467,6 @@ lilypond: /* empty */ ; -object_id_setting: - OBJECTID STRING { $$ = $2; } - ; - toplevel_expression: lilypond_header { PARSER->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1); @@ -628,9 +616,15 @@ identifier_init: | full_markup { $$ = $1; } + | full_markup_list { + $$ = $1; + } | DIGIT { $$ = scm_from_int ($1); } + | context_modification { + $$ = $1; + } ; context_def_spec_block: @@ -663,6 +657,13 @@ context_def_spec_body: | context_def_spec_body context_mod { unsmob_context_def ($$)->add_context_mod ($2); } + | context_def_spec_body context_modification { + 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)); + } + } ; @@ -735,9 +736,6 @@ book_body: $$->scores_ = SCM_EOL; $$->bookparts_ = SCM_EOL; } - | book_body object_id_setting { - $$->user_key_ = ly_scm2string ($2); - } ; bookpart_block: @@ -789,9 +787,6 @@ bookpart_body: $$->paper_ = 0; $$->scores_ = SCM_EOL; } - | bookpart_body object_id_setting { - $$->user_key_ = ly_scm2string ($2); - } ; score_block: @@ -816,9 +811,6 @@ score_body: $$->protect (); $$->origin ()->set_spot (@$); } - | score_body object_id_setting { - $$->user_key_ = ly_scm2string ($2); - } | score_body lilypond_header { $$->set_header ($2); } @@ -919,20 +911,14 @@ output_def_body: ; tempo_event: - TEMPO steno_duration '=' bare_unsigned { - $$ = MAKE_SYNTAX ("tempo", @$, SCM_BOOL_F, $2, scm_int2num ($4)); - } - | TEMPO string steno_duration '=' bare_unsigned { - $$ = MAKE_SYNTAX ("tempo", @$, make_simple_markup($2), $3, scm_int2num ($5)); - } - | TEMPO full_markup steno_duration '=' bare_unsigned { - $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, scm_int2num ($5)); + TEMPO steno_duration '=' tempo_range { + $$ = MAKE_SYNTAX ("tempo", @$, SCM_EOL, $2, $4); } - | TEMPO string { - $$ = MAKE_SYNTAX ("tempoText", @$, make_simple_markup($2) ); + | TEMPO scalar steno_duration '=' tempo_range { + $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, $5); } - | TEMPO full_markup { - $$ = MAKE_SYNTAX ("tempoText", @$, $2 ); + | TEMPO scalar { + $$ = MAKE_SYNTAX ("tempo", @$, $2); } ; @@ -1023,22 +1009,45 @@ simple_music: | context_change ; +context_modification: + WITH { PARSER->lexer_->push_initial_state (); } '{' context_mod_list '}' + { + PARSER->lexer_->pop_state (); + $$ = $4; + } + | WITH CONTEXT_MOD_IDENTIFIER + { + $$ = $2; + } + | CONTEXT_MOD_IDENTIFIER + { + $$ = $1; + } + ; + optional_context_mod: - /**/ { $$ = SCM_EOL; } - | WITH { PARSER->lexer_->push_initial_state (); } - '{' context_mod_list '}' - { - PARSER->lexer_->pop_state (); - $$ = $4; - } - ; + /**/ { + $$ = SCM_EOL; + } + | context_modification + { + $$ = $1; + } + ; context_mod_list: - /* */ { $$ = SCM_EOL; } - | context_mod_list context_mod { - $$ = scm_cons ($2, $1); - } - ; + /**/ { + $$ = Context_mod ().smobbed_copy (); + } + | context_mod_list context_mod { + unsmob_context_mod ($1)->add_context_mod ($2); + } + | context_mod_list CONTEXT_MOD_IDENTIFIER { + Context_mod *md = unsmob_context_mod ($2); + if (md) + unsmob_context_mod ($1)->add_context_mods (md->get_mods ()); + } + ; composite_music: prefix_composite_music { $$ = $1; } @@ -1056,7 +1065,7 @@ function_scm_argument: ; /* An argument list. If a function \foo expects scm scm music, then the lexer expands \foo into the token sequence: - MUSIC_FUNCTION EXPECT_MUSIC EXPECT_SCM EXPECT_SCM + MUSIC_FUNCTION EXPECT_MUSIC EXPECT_SCM EXPECT_SCM EXPECT_NO_MORE_ARGS and this rule returns the reversed list of arguments. */ function_arglist_music_last: @@ -1120,10 +1129,18 @@ prefix_composite_music: $$ = run_music_function (PARSER, $1); } | CONTEXT simple_string optional_id optional_context_mod music { - $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_F); + Context_mod *ctxmod = unsmob_context_mod ($4); + SCM mods = SCM_EOL; + if (ctxmod) + mods = ctxmod->get_mods (); + $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, mods, SCM_BOOL_F); } | NEWCONTEXT simple_string optional_id optional_context_mod music { - $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_T); + Context_mod *ctxmod = unsmob_context_mod ($4); + SCM mods = SCM_EOL; + if (ctxmod) + mods = ctxmod->get_mods (); + $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, mods, SCM_BOOL_T); } | TIMES fraction music { @@ -1148,7 +1165,11 @@ prefix_composite_music: PARSER->lexer_->pop_state (); } | mode_changing_head_with_context optional_context_mod grouped_music_list { - $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, $3, $2, SCM_BOOL_T); + Context_mod *ctxmod = unsmob_context_mod ($2); + SCM mods = SCM_EOL; + if (ctxmod) + mods = ctxmod->get_mods (); + $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, $3, mods, SCM_BOOL_T); if ($1 == ly_symbol2scm ("ChordNames")) { $$ = MAKE_SYNTAX ("unrelativable-music", @$, $$); @@ -1239,18 +1260,33 @@ new_lyrics: $$ = scm_cons ($3, SCM_EOL); } + | ADDLYRICS { + PARSER->lexer_->push_lyric_state (); } + MUSIC_IDENTIFIER { + PARSER->lexer_->pop_state (); + $$ = scm_cons ($3, SCM_EOL); + } | new_lyrics ADDLYRICS { PARSER->lexer_->push_lyric_state (); } grouped_music_list { PARSER->lexer_->pop_state (); $$ = scm_cons ($4, $1); } + | new_lyrics ADDLYRICS { + PARSER->lexer_->push_lyric_state (); + } MUSIC_IDENTIFIER { + PARSER->lexer_->pop_state (); + $$ = scm_cons ($4, $1); + } ; re_rhythmed_music: grouped_music_list new_lyrics { $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL)); } + | MUSIC_IDENTIFIER new_lyrics { + $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL)); + } | LYRICSTO simple_string { PARSER->lexer_->push_lyric_state (); } music { @@ -1447,12 +1483,13 @@ event_chord: $$ = MAKE_SYNTAX ("repetition-chord", i, PARSER->lexer_->chord_repetition_.last_chord_, PARSER->lexer_->chord_repetition_.repetition_function_, - $2, $3); + $2, scm_reverse_x ($3, SCM_EOL)); } | MULTI_MEASURE_REST optional_notemode_duration post_events { Input i; i.set_location (@1, @3); - $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2, $3); + $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2, + scm_reverse_x ($3, SCM_EOL)); } | command_element /* note chord elements are memorized into @@ -1608,9 +1645,7 @@ command_element: } | PARTIAL duration_length { - Moment m = - unsmob_duration ($2)->get_length (); - $$ = MAKE_SYNTAX ("property-operation", @$, SCM_BOOL_F, ly_symbol2scm ("Timing"), ly_symbol2scm ("PropertySet"), ly_symbol2scm ("measurePosition"), m.smobbed_copy ()); - $$ = MAKE_SYNTAX ("context-specification", @$, ly_symbol2scm ("Score"), SCM_BOOL_F, $$, SCM_EOL, SCM_BOOL_F); + $$ = MAKE_SYNTAX ("partial", @$, $2); } | TIME_T fraction { @@ -1619,9 +1654,7 @@ command_element: $$ = scm_apply_2 (proc, scm_car ($2), scm_cdr ($2), SCM_EOL); } | MARK scalar { - SCM proc = ly_lily_module_constant ("make-mark-set"); - - $$ = scm_call_1 (proc, $2); + $$ = MAKE_SYNTAX ("make-mark-set", @$, $2); } ; @@ -1671,8 +1704,12 @@ post_event: direction_less_event { $$ = $1; } - | '-' music_function_event { + | script_dir music_function_event { $$ = run_music_function (PARSER, $2); + if ($1) + { + unsmob_music ($$)->set_property ("direction", scm_from_int ($1)); + } } | HYPHEN { if (!PARSER->lexer_->is_lyric_state ()) @@ -1942,6 +1979,7 @@ steno_duration: | DURATION_IDENTIFIER dots { Duration *d = unsmob_duration ($1); Duration k (d->duration_log (), d->dot_count () + $2); + k = k.compressed (d->factor ()); *d = k; $$ = $1; } @@ -2254,6 +2292,15 @@ step_number: } ; +tempo_range: + bare_unsigned { + $$ = scm_from_int ($1); + } + | bare_unsigned '~' bare_unsigned { + $$ = scm_cons (scm_from_int ($1), scm_from_int ($3)); + } + ; + /* UTILITIES @@ -2325,7 +2372,6 @@ unsigned_number: } ; - exclamations: { $$ = 0; } | exclamations '!' { $$ ++; } @@ -2353,7 +2399,10 @@ lyric_markup: ; full_markup_list: - MARKUPLINES + MARKUPLINES_IDENTIFIER { + $$ = $1; + } + | MARKUPLINES { PARSER->lexer_->push_markup_state (); } markup_list { $$ = $3; @@ -2386,7 +2435,10 @@ markup_top: ; markup_list: - markup_composed_list { + MARKUPLINES_IDENTIFIER { + $$ = $1; + } + | markup_composed_list { $$ = $1; } | markup_braced_list { @@ -2416,37 +2468,38 @@ markup_braced_list_body: $$ = scm_cons ($2, $1); } | markup_braced_list_body markup_list { - $$ = scm_append_x (scm_list_2 (scm_reverse_x ($2, SCM_EOL), $1)); + $$ = scm_reverse_x ($2, $1); } ; markup_command_list: - MARKUP_LIST_HEAD_EMPTY { - $$ = scm_list_1 ($1); + MARKUP_LIST_FUNCTION markup_command_list_arguments { + $$ = scm_cons ($1, scm_reverse_x($2, SCM_EOL)); } - | MARKUP_LIST_HEAD_LIST0 markup_list { - $$ = scm_list_2 ($1, $2); + ; + +markup_command_basic_arguments: + EXPECT_MARKUP_LIST markup_command_list_arguments markup_list { + $$ = scm_cons ($3, $2); } - | MARKUP_LIST_HEAD_SCM0 embedded_scm { - $$ = scm_list_2 ($1, $2); + | EXPECT_SCM markup_command_list_arguments embedded_scm { + $$ = scm_cons ($3, $2); } - | MARKUP_LIST_HEAD_SCM0_LIST1 embedded_scm markup_list { - $$ = scm_list_3 ($1, $2, $3); + | EXPECT_NO_MORE_ARGS { + $$ = SCM_EOL; } - | MARKUP_LIST_HEAD_SCM0_SCM1_LIST2 embedded_scm embedded_scm markup_list { - $$ = scm_list_4 ($1, $2, $3, $4); + ; + +markup_command_list_arguments: + markup_command_basic_arguments { $$ = $1; } + | EXPECT_MARKUP markup_command_list_arguments markup { + $$ = scm_cons ($3, $2); } ; markup_head_1_item: - MARKUP_HEAD_MARKUP0 { - $$ = scm_list_1 ($1); - } - | MARKUP_HEAD_SCM0_MARKUP1 embedded_scm { - $$ = scm_list_2 ($1, $2); - } - | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm { - $$ = scm_list_3 ($1, $2, $3); + MARKUP_FUNCTION EXPECT_MARKUP markup_command_list_arguments { + $$ = scm_cons ($1, scm_reverse_x ($3, SCM_EOL)); } ; @@ -2481,29 +2534,8 @@ simple_markup: sc->unprotect (); PARSER->lexer_->pop_state (); } - | MARKUP_HEAD_SCM0 embedded_scm { - $$ = scm_list_2 ($1, $2); - } - | MARKUP_HEAD_SCM0_SCM1_SCM2 embedded_scm embedded_scm embedded_scm { - $$ = scm_list_4 ($1, $2, $3, $4); - } - | MARKUP_HEAD_SCM0_SCM1 embedded_scm embedded_scm { - $$ = scm_list_3 ($1, $2, $3); - } - | MARKUP_HEAD_SCM0_MARKUP1_MARKUP2 embedded_scm markup markup { - $$ = scm_list_4 ($1, $2, $3, $4); - } - | MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3 embedded_scm embedded_scm markup markup { - $$ = scm_list_5 ($1, $2, $3, $4, $5); - } - | MARKUP_HEAD_EMPTY { - $$ = scm_list_1 ($1); - } - | MARKUP_HEAD_LIST0 markup_list { - $$ = scm_list_2 ($1,$2); - } - | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup { - $$ = scm_list_3 ($1, $2, $3); + | MARKUP_FUNCTION markup_command_basic_arguments { + $$ = scm_cons ($1, scm_reverse_x ($2, SCM_EOL)); } ; @@ -2556,13 +2588,17 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) } else if (scm_is_number (sid)) { *destination = sid; return NUMBER_IDENTIFIER; - } else if (unsmob_context_def (sid)) { - Context_def *def= unsmob_context_def (sid)->clone (); + } else if (unsmob_context_def (sid)) { + Context_def *def= unsmob_context_def (sid)->clone (); - *destination = def->self_scm (); - def->unprotect (); + *destination = def->self_scm (); + def->unprotect (); - return CONTEXT_DEF_IDENTIFIER; + return CONTEXT_DEF_IDENTIFIER; + } else if (unsmob_context_mod (sid)) { + *destination = unsmob_context_mod (sid)->smobbed_copy (); + + return CONTEXT_MOD_IDENTIFIER; } else if (unsmob_score (sid)) { Score *score = new Score (*unsmob_score (sid)); *destination = score->self_scm (); @@ -2595,6 +2631,9 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) if (is_lyric_state ()) return LYRIC_MARKUP_IDENTIFIER; return MARKUP_IDENTIFIER; + } else if (Text_interface::is_markup_list (sid)) { + *destination = sid; + return MARKUPLINES_IDENTIFIER; } return -1;