X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=83e95491c292f82fb79d4a3439c0947806d86bc5;hb=2e0077b3e57aa62c5a15ebfbc044e3ad447da44d;hp=3e7625f45f8cafbbe578bfa803e2d2a4819bedbe;hpb=1d9fc4b1512eb69a28677890dc26658c3552c6cd;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 3e7625f45f..83e95491c2 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -119,6 +119,7 @@ FIXME: using namespace std; #include "book.hh" +#include "context.hh" #include "context-def.hh" #include "context-mod.hh" #include "dimensions.hh" @@ -228,7 +229,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 disp = SCM_UNDEFINED); SCM make_music_from_simple (Lily_parser *parser, Input loc, SCM pitch); -SCM loc_on_music (Lily_parser *parser, Input loc, SCM arg); +SCM loc_on_copy (Lily_parser *parser, Input loc, SCM arg); SCM make_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list); SCM make_chord_step (SCM step, Rational alter); SCM make_simple_markup (SCM a); @@ -345,7 +346,6 @@ If we give names, Bison complains. %token BOOK_IDENTIFIER %token CHORD_MODIFIER %token CHORD_REPETITION -%token CONTEXT_MOD_IDENTIFIER %token DRUM_PITCH /* Artificial token for durations in argument lists */ %token DURATION_ARG @@ -353,6 +353,7 @@ If we give names, Bison complains. %token EVENT_IDENTIFIER %token EVENT_FUNCTION %token FRACTION +%token LOOKUP_IDENTIFIER %token LYRIC_ELEMENT %token MARKUP_FUNCTION %token MARKUP_LIST_FUNCTION @@ -385,8 +386,7 @@ prec levels in different prods */ start_symbol: lilypond | EMBEDDED_LILY { - SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_note_state (nn); + parser->lexer_->push_note_state (Lily::pitchnames); } embedded_lilypond { parser->lexer_->pop_state (); *retval = $3; @@ -408,10 +408,8 @@ lilypond: /* empty */ { $$ = SCM_UNSPECIFIED; } toplevel_expression: - { - parser->lexer_->add_scope (get_header (parser)); - } lilypond_header { - parser->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $2); + header_block { + parser->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1); } | book_block { SCM proc = parser->lexer_->lookup_identifier ("toplevel-book-handler"); @@ -474,6 +472,12 @@ toplevel_expression: id = ly_symbol2scm ("$defaultlayout"); parser->lexer_->set_identifier (id, $1); + } else if (ly_is_module ($1)) + { + SCM module = get_header (parser); + ly_module_copy (module, $1); + parser->lexer_->set_identifier + (ly_symbol2scm ("$defaultheader"), module); } else if (!scm_is_eq ($1, SCM_UNSPECIFIED)) parser->parser_error (@1, _("bad expression type")); } @@ -492,6 +496,15 @@ toplevel_expression: } ; +lookup: + LOOKUP_IDENTIFIER + | LOOKUP_IDENTIFIER '.' symbol_list_rev + { + $$ = loc_on_copy (parser, @$, + nested_property ($1, scm_reverse_x ($3, SCM_EOL))); + } + ; + embedded_scm_bare: SCM_TOKEN { @@ -503,6 +516,7 @@ embedded_scm_bare: embedded_scm_active: SCM_IDENTIFIER | scm_function_call + | lookup ; embedded_scm_bare_arg: @@ -515,11 +529,13 @@ embedded_scm_bare_arg: | partial_markup | full_markup_list | context_modification + | header_block | score_block | context_def_spec_block | book_block | bookpart_block | output_def + | lookup ; /* The generic version may end in music, or not */ @@ -527,6 +543,7 @@ embedded_scm_bare_arg: embedded_scm: embedded_scm_bare | scm_function_call + | lookup ; /* embedded_scm_arg is _not_ casting pitches to music by default, this @@ -621,8 +638,15 @@ lilypond_header_body: | lilypond_header_body assignment { } - | lilypond_header_body embedded_scm { - + | lilypond_header_body SCM_TOKEN { + // Evaluate and ignore #xxx, as opposed to \xxx + parser->lexer_->eval_scm_token ($2, @2); + } + | lilypond_header_body embedded_scm_active { + if (ly_is_module ($2)) + ly_module_copy (scm_current_module (), $2); + else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) + parser->parser_error (@2, _("bad expression type")); } ; @@ -632,6 +656,14 @@ lilypond_header: } ; +header_block: + { + parser->lexer_->add_scope (get_header (parser)); + } lilypond_header { + $$ = $2; + } + ; + /* DECLARATIONS */ @@ -644,12 +676,12 @@ assignment: parser->lexer_->set_identifier ($1, $3); $$ = SCM_UNSPECIFIED; } - | assignment_id property_path '=' identifier_init { - SCM path = scm_cons (scm_string_to_symbol ($1), $2); - parser->lexer_->set_identifier (path, $4); + | assignment_id '.' property_path '=' identifier_init { + SCM path = scm_cons (scm_string_to_symbol ($1), $3); + parser->lexer_->set_identifier (path, $5); $$ = SCM_UNSPECIFIED; } - | assignment_id '.' property_path '=' identifier_init { + | assignment_id ',' property_path '=' identifier_init { SCM path = scm_cons (scm_string_to_symbol ($1), $3); parser->lexer_->set_identifier (path, $5); $$ = SCM_UNSPECIFIED; @@ -660,6 +692,14 @@ assignment: identifier_init: identifier_init_nonumber | number_expression + | symbol_list_part_bare '.' property_path + { + $$ = scm_reverse_x ($1, $3); + } + | symbol_list_part_bare ',' property_path + { + $$ = scm_reverse_x ($1, $3); + } | post_event_nofinger post_events { $$ = scm_reverse_x ($2, SCM_EOL); @@ -685,7 +725,8 @@ identifier_init: ; identifier_init_nonumber: - score_block + header_block + | score_block | book_block | bookpart_block | output_def @@ -802,8 +843,7 @@ context_mod_arg: embedded_scm | { - SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_note_state (nn); + parser->lexer_->push_note_state (Lily::pitchnames); } composite_music { @@ -935,16 +975,15 @@ book_body: SCM proc = parser->lexer_->lookup_identifier ("book-score-handler"); scm_call_2 (proc, $1, $2); } else if (Output_def *od = unsmob ($2)) { - SCM id = SCM_EOL; - - if (to_boolean (od->c_variable ("is-paper"))) - id = ly_symbol2scm ("$defaultpaper"); - else if (to_boolean (od->c_variable ("is-midi"))) - id = ly_symbol2scm ("$defaultmidi"); - else if (to_boolean (od->c_variable ("is-layout"))) - id = ly_symbol2scm ("$defaultlayout"); - - parser->lexer_->set_identifier (id, $2); + if (to_boolean (od->lookup_variable (ly_symbol2scm ("is-paper")))) { + unsmob ($1)->paper_ = od; + set_paper (parser, od); + } else { + parser->parser_error (@2, _ ("need \\paper for paper block")); + } + } else if (ly_is_module ($2)) + { + ly_module_copy (unsmob ($1)->header_, $2); } else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) parser->parser_error (@2, _("bad expression type")); } @@ -1016,16 +1055,16 @@ bookpart_body: SCM proc = parser->lexer_->lookup_identifier ("bookpart-score-handler"); scm_call_2 (proc, $1, $2); } else if (Output_def *od = unsmob ($2)) { - SCM id = SCM_EOL; - - if (to_boolean (od->c_variable ("is-paper"))) - id = ly_symbol2scm ("$defaultpaper"); - else if (to_boolean (od->c_variable ("is-midi"))) - id = ly_symbol2scm ("$defaultmidi"); - else if (to_boolean (od->c_variable ("is-layout"))) - id = ly_symbol2scm ("$defaultlayout"); - - parser->lexer_->set_identifier (id, $2); + if (to_boolean (od->lookup_variable (ly_symbol2scm ("is-paper")))) { + unsmob ($1)->paper_ = od; + } else { + parser->parser_error (@2, _ ("need \\paper for paper block")); + } + } else if (ly_is_module ($2)) { + Book *book = unsmob ($1); + if (!ly_is_module (book->header_)) + book->header_ = ly_make_module (false); + ly_module_copy (book->header_, $2); } else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) parser->parser_error (@2, _("bad expression type")); } @@ -1124,6 +1163,22 @@ score_items: scm_set_cdr_x ($$, scm_cons ($2, scm_cdr ($$))); else $$ = scm_cons ($2, $$); + } else if (ly_is_module ($2)) { + SCM module = SCM_UNSPECIFIED; + if (score) { + module = score->get_header (); + if (!ly_is_module (module)) + { + module = ly_make_module (false); + score->set_header (module); + } + } else if (scm_is_pair ($$) && ly_is_module (scm_car ($$))) + module = scm_car ($$); + else { + module = ly_make_module (false); + $$ = scm_cons (module, $$); + } + ly_module_copy (module, $2); } else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) parser->parser_error (@2, _("Spurious expression in \\score")); } @@ -1260,8 +1315,7 @@ output_def_body: { if (scm_is_pair ($1)) $1 = scm_car ($1); - SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_note_state (nn); + parser->lexer_->push_note_state (Lily::pitchnames); } music_or_context_def { parser->lexer_->pop_state (); @@ -1433,21 +1487,12 @@ simple_music: context_modification: WITH { - SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_note_state (nn); + parser->lexer_->push_note_state (Lily::pitchnames); } '{' context_mod_list '}' { parser->lexer_->pop_state (); $$ = $4; } - | WITH CONTEXT_MOD_IDENTIFIER - { - $$ = $2; - } - | CONTEXT_MOD_IDENTIFIER - { - $$ = $1; - } | WITH context_modification_arg { if (unsmob ($2)) { @@ -1457,7 +1502,10 @@ context_modification: if (unsmob ($2)) $$ = $2; else { - parser->parser_error (@2, _ ("not a context mod")); + // let's permit \with #*unspecified* to go for + // an empty context mod + if (!scm_is_eq ($2, SCM_UNSPECIFIED)) + parser->parser_error (@2, _ ("not a context mod")); $$ = Context_mod ().smobbed_copy (); } } @@ -1468,16 +1516,40 @@ context_modification_arg: | MUSIC_IDENTIFIER ; -optional_context_mod: - /**/ { - $$ = SCM_EOL; - } - | context_modification +/* A list of single mods collected from a (possibly empty) sequence of + * context modifications, usually written as \with ... \with ... + */ + +optional_context_mods: + context_modification_mods_list { - $$ = $1; + if (scm_is_pair ($1)) + $$ = scm_append_x (scm_reverse_x ($1, SCM_EOL)); } ; +/* The worker for optional_context_mods conses a (reversed) list where + * each element contains the list of single context mods from one + * context modification block. Context_mod::get_mods creates fresh + * copies, so it's okay to use append! on them. + */ + +context_modification_mods_list: + /**/ { + $$ = SCM_EOL; + } + | context_modification_mods_list context_modification + { + if (Context_mod *m = unsmob ($2)) + $$ = scm_cons (m->get_mods (), $1); + } + ; + +/* A Context_mod is a container for a list of context mods like + * \consists ... \override ... . context_mod_list produces a + * Context_mod from the inside of a \with { ... } statement. + */ + context_mod_list: /**/ { $$ = Context_mod ().smobbed_copy (); @@ -1486,58 +1558,34 @@ context_mod_list: if (!SCM_UNBNDP ($2)) unsmob ($1)->add_context_mod ($2); } - | context_mod_list CONTEXT_MOD_IDENTIFIER { - Context_mod *md = unsmob ($2); - if (md) - unsmob ($1)->add_context_mods (md->get_mods ()); - } | context_mod_list context_mod_arg { - if (scm_is_eq ($2, SCM_UNSPECIFIED)) - ; - else if (unsmob ($2)) { + if (unsmob ($2)) { SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler"); $2 = scm_call_1 (proc, $2); } if (unsmob ($2)) unsmob ($$)->add_context_mods (unsmob ($2)->get_mods ()); - else { + else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) parser->parser_error (@2, _ ("not a context mod")); - } } ; context_prefix: - CONTEXT symbol optional_id optional_context_mod { - Context_mod *ctxmod = unsmob ($4); - SCM mods = SCM_EOL; - if (ctxmod) - mods = ctxmod->get_mods (); - $$ = START_MAKE_SYNTAX (context_specification, $2, $3, mods, SCM_BOOL_F); + CONTEXT symbol optional_id optional_context_mods { + $$ = START_MAKE_SYNTAX (context_specification, $2, $3, $4, SCM_BOOL_F); } - | NEWCONTEXT symbol optional_id optional_context_mod { - Context_mod *ctxmod = unsmob ($4); - SCM mods = SCM_EOL; - if (ctxmod) - mods = ctxmod->get_mods (); - $$ = START_MAKE_SYNTAX (context_specification, $2, $3, mods, SCM_BOOL_T); + | NEWCONTEXT symbol optional_id optional_context_mods { + $$ = START_MAKE_SYNTAX (context_specification, $2, $3, $4, SCM_BOOL_T); } ; new_lyrics: - ADDLYRICS optional_context_mod lyric_mode_music { - Context_mod *ctxmod = unsmob ($2); - SCM mods = SCM_EOL; - if (ctxmod) - mods = ctxmod->get_mods (); - $$ = scm_acons ($3, mods, SCM_EOL); + ADDLYRICS optional_context_mods lyric_mode_music { + $$ = scm_acons ($3, $2, SCM_EOL); } - | new_lyrics ADDLYRICS optional_context_mod lyric_mode_music { - Context_mod *ctxmod = unsmob ($3); - SCM mods = SCM_EOL; - if (ctxmod) - mods = ctxmod->get_mods (); - $$ = scm_acons ($4, mods, $1); + | new_lyrics ADDLYRICS optional_context_mods lyric_mode_music { + $$ = scm_acons ($4, $3, $1); } ; @@ -1673,6 +1721,10 @@ symbol_list_arg: { $$ = scm_append (scm_list_2 ($1, scm_reverse_x ($3, SCM_EOL))); } + | SYMBOL_LIST ',' symbol_list_rev + { + $$ = scm_append (scm_list_2 ($1, scm_reverse_x ($3, SCM_EOL))); + } ; symbol_list_rev: @@ -1681,6 +1733,10 @@ symbol_list_rev: { $$ = scm_append_x (scm_list_2 ($3, $1)); } + | symbol_list_rev ',' symbol_list_part + { + $$ = scm_append_x (scm_list_2 ($3, $1)); + } ; // symbol_list_part delivers elements in reverse copy. @@ -1688,9 +1744,9 @@ symbol_list_rev: symbol_list_part: symbol_list_element { - $$ = try_string_variants (Lily::symbol_list_p, $1); + $$ = try_string_variants (Lily::key_list_p, $1); if (SCM_UNBNDP ($$)) { - parser->parser_error (@1, _("not a symbol")); + parser->parser_error (@1, _("not a key")); $$ = SCM_EOL; } else $$ = scm_reverse ($$); @@ -1701,8 +1757,24 @@ symbol_list_part: symbol_list_element: STRING | embedded_scm_bare + | UNSIGNED ; +symbol_list_part_bare: + STRING + { + $$ = try_string_variants (Lily::key_list_p, $1); + if (SCM_UNBNDP ($$)) { + parser->parser_error (@1, _("not a key")); + $$ = SCM_EOL; + } else + $$ = scm_reverse ($$); + } + | UNSIGNED + { + $$ = scm_list_1 ($1); + } + ; function_arglist_nonbackup: function_arglist_common @@ -1874,6 +1946,8 @@ function_arglist_nonbackup_reparse: if (scm_is_true (scm_call_1 ($2, $4))) // May be 3 \cm or similar MYREPARSE (@4, $2, REAL, $4); + else if (scm_is_true (scm_call_1 ($2, scm_list_1 ($4)))) + MYREPARSE (@4, $2, SYMBOL_LIST, scm_list_1 ($4)); else { SCM d = make_duration ($4); if (!SCM_UNBNDP (d)) { @@ -1918,7 +1992,7 @@ function_arglist_backup: $$ = scm_cons ($$, $3); else { - $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (SCM_ARG, $4, @4); } } @@ -1929,7 +2003,7 @@ function_arglist_backup: { $$ = scm_cons ($4, $3); } else { - $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (EVENT_IDENTIFIER, $4, @4); } } @@ -1945,7 +2019,7 @@ function_arglist_backup: } else if (scm_is_true (scm_call_1 ($2, $4))) $$ = scm_cons ($4, $3); else { - $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (PITCH_IDENTIFIER, $4, @4); } } @@ -1961,7 +2035,7 @@ function_arglist_backup: } else if (scm_is_true (scm_call_1 ($2, $4))) $$ = scm_cons ($4, $3); else { - $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (TONICNAME_PITCH, $4, @4); } } @@ -1970,7 +2044,7 @@ function_arglist_backup: if (scm_is_true (scm_call_1 ($2, $4))) $$ = scm_cons ($4, $3); else { - $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (SCM_IDENTIFIER, $4, @4); } } @@ -1980,6 +2054,8 @@ function_arglist_backup: if (scm_is_true (scm_call_1 ($2, $4))) // May be 3 \cm or similar MYREPARSE (@4, $2, REAL, $4); + else if (scm_is_true (scm_call_1 ($2, scm_list_1 ($4)))) + MYREPARSE (@4, $2, SYMBOL_LIST, scm_list_1 ($4)); else { SCM d = make_duration ($4); if (!SCM_UNBNDP (d)) { @@ -1990,11 +2066,11 @@ function_arglist_backup: ($2, make_music_from_simple (parser, @4, d)))) MYREPARSE (@4, $2, DURATION_ARG, d); else { - $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (UNSIGNED, $4, @4); } } else { - $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (UNSIGNED, $4, @4); } } @@ -2006,7 +2082,7 @@ function_arglist_backup: $$ = $3; MYREPARSE (@4, $2, REAL, $4); } else { - $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (REAL, $4, @4); } } @@ -2016,7 +2092,7 @@ function_arglist_backup: { $$ = scm_cons ($4, $3); } else { - $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (NUMBER_IDENTIFIER, $4, @4); } } @@ -2033,7 +2109,7 @@ function_arglist_backup: if (scm_is_true (scm_call_1 ($2, $$))) $$ = scm_cons ($$, $3); else { - $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (UNSIGNED, $5, @5); parser->lexer_->push_extra_token (@4, '-'); } @@ -2046,7 +2122,7 @@ function_arglist_backup: MYREPARSE (@5, $2, REAL, n); $$ = $3; } else { - $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (REAL, n, @5); } } @@ -2056,7 +2132,7 @@ function_arglist_backup: if (scm_is_true (scm_call_1 ($2, n))) { $$ = scm_cons (n, $3); } else { - $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (NUMBER_IDENTIFIER, n, @5); } } @@ -2070,7 +2146,7 @@ function_arglist_backup: ($2, make_music_from_simple (parser, @4, $4)))) MYREPARSE (@4, $2, DURATION_ARG, $4); else { - $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (DURATION_IDENTIFIER, $4, @4); } } @@ -2085,7 +2161,7 @@ function_arglist_backup: else $$ = scm_cons (res, $3); else { - $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (SCM_IDENTIFIER, $4, @4); } } @@ -2100,7 +2176,7 @@ function_arglist_backup: else $$ = scm_cons (res, $3); else { - $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (STRING, $4, @4); } } @@ -2139,7 +2215,7 @@ function_arglist: function_arglist_nonbackup | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_nonbackup DEFAULT { - $$ = scm_cons (loc_on_music (parser, @4, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @4, $1), $3); } ; @@ -2147,7 +2223,7 @@ function_arglist_skip_nonbackup: function_arglist_nonbackup | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_nonbackup { - $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); } ; @@ -2350,6 +2426,8 @@ function_arglist_common_reparse: if (scm_is_true (scm_call_1 ($1, $3))) // May be 3 \cm or similar MYREPARSE (@3, $1, REAL, $3); + else if (scm_is_true (scm_call_1 ($1, scm_list_1 ($3)))) + MYREPARSE (@3, $1, SYMBOL_LIST, scm_list_1 ($3)); else { SCM d = make_duration ($3); if (!SCM_UNBNDP (d)) { @@ -2405,7 +2483,7 @@ function_arglist_optional: function_arglist_backup | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_backup DEFAULT { - $$ = scm_cons (loc_on_music (parser, @4, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @4, $1), $3); } | function_arglist_skip_backup BACKUP ; @@ -2414,7 +2492,7 @@ function_arglist_skip_backup: function_arglist_backup | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_backup { - $$ = scm_cons (loc_on_music (parser, @3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); } ; @@ -2462,12 +2540,8 @@ mode_changed_music: } parser->lexer_->pop_state (); } - | mode_changing_head_with_context optional_context_mod grouped_music_list { - Context_mod *ctxmod = unsmob ($2); - SCM mods = SCM_EOL; - if (ctxmod) - mods = ctxmod->get_mods (); - $$ = MAKE_SYNTAX (context_specification, @$, $1, SCM_EOL, mods, SCM_BOOL_T, $3); + | mode_changing_head_with_context optional_context_mods grouped_music_list { + $$ = MAKE_SYNTAX (context_specification, @$, $1, SCM_EOL, $2, SCM_BOOL_T, $3); if (scm_is_eq ($1, ly_symbol2scm ("ChordNames"))) { $$ = MAKE_SYNTAX (unrelativable_music, @$, $$); @@ -2478,15 +2552,13 @@ mode_changed_music: mode_changing_head: NOTEMODE { - SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_note_state (nn); + parser->lexer_->push_note_state (Lily::pitchnames); $$ = ly_symbol2scm ("notes"); } | DRUMMODE { - SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames"); - parser->lexer_->push_note_state (nn); + parser->lexer_->push_note_state (Lily::drum_pitch_names); $$ = ly_symbol2scm ("drums"); } @@ -2496,10 +2568,9 @@ mode_changing_head: $$ = ly_symbol2scm ("figures"); } | CHORDMODE { - 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 (nn); + parser->lexer_->chordmodifier_tab_ = + alist_to_hashq (Lily::chordmodifiers); + parser->lexer_->push_chord_state (Lily::pitchnames); $$ = ly_symbol2scm ("chords"); } @@ -2511,8 +2582,7 @@ mode_changing_head: mode_changing_head_with_context: DRUMS { - SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames"); - parser->lexer_->push_note_state (nn); + parser->lexer_->push_note_state (Lily::drum_pitch_names); $$ = ly_symbol2scm ("DrumStaff"); } @@ -2522,10 +2592,9 @@ mode_changing_head_with_context: $$ = ly_symbol2scm ("FiguredBass"); } | CHORDS { - 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 (nn); + parser->lexer_->chordmodifier_tab_ = + alist_to_hashq (Lily::chordmodifiers); + parser->lexer_->push_chord_state (Lily::pitchnames); $$ = ly_symbol2scm ("ChordNames"); } | LYRICS @@ -2545,9 +2614,6 @@ property_path: symbol_list_rev { $$ = scm_reverse_x ($1, SCM_EOL); } - | symbol_list_rev property_path { - $$ = scm_reverse_x ($1, $2); - } ; property_operation: @@ -2557,7 +2623,7 @@ property_operation: | UNSET symbol { $$ = scm_list_2 (ly_symbol2scm ("unset"), $2); } - | OVERRIDE property_path '=' scalar { + | OVERRIDE revert_arg '=' scalar { if (scm_ilength ($2) < 2) { parser->parser_error (@2, _("bad grob property path")); $$ = SCM_UNDEFINED; @@ -2621,6 +2687,10 @@ revert_arg_part: { $$ = scm_append_x (scm_list_2 ($5, $3)); } + | revert_arg_backup BACKUP SCM_ARG ',' symbol_list_part + { + $$ = scm_append_x (scm_list_2 ($5, $3)); + } | revert_arg_backup BACKUP SCM_ARG symbol_list_part { $$ = scm_append_x (scm_list_2 ($4, $3)); @@ -2853,6 +2923,14 @@ scalar: $$ = scm_difference ($2, SCM_UNDEFINED); } | string + | symbol_list_part_bare '.' property_path + { + $$ = scm_reverse_x ($1, $3); + } + | symbol_list_part_bare ',' property_path + { + $$ = scm_reverse_x ($1, $3); + } ; event_chord: @@ -2864,15 +2942,11 @@ event_chord: } } %prec ':' | CHORD_REPETITION optional_notemode_duration post_events { - Input i; - i.set_location (@1, @3); - $$ = MAKE_SYNTAX (repetition_chord, i, + $$ = MAKE_SYNTAX (repetition_chord, @$, $2, scm_reverse_x ($3, SCM_EOL)); } %prec ':' | MULTI_MEASURE_REST optional_notemode_duration post_events { - Input i; - i.set_location (@1, @3); - $$ = MAKE_SYNTAX (multi_measure_rest, i, $2, + $$ = MAKE_SYNTAX (multi_measure_rest, @$, $2, scm_reverse_x ($3, SCM_EOL)); } %prec ':' | tempo_event @@ -3800,8 +3874,7 @@ markup_uncomposed_list: $$ = $2; } | SCORELINES { - SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_note_state (nn); + parser->lexer_->push_note_state (Lily::pitchnames); } '{' score_body '}' { Score *sc = unsmob ($4); sc->origin ()->set_spot (@$); @@ -3914,8 +3987,7 @@ simple_markup: $$ = make_simple_markup ($1); } | SCORE { - SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_note_state (nn); + parser->lexer_->push_note_state (Lily::pitchnames); } '{' score_body '}' { Score *sc = unsmob ($4); sc->origin ()->set_spot (@$); @@ -3998,7 +4070,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) return SCM_IDENTIFIER; } else if (unsmob (sid)) { *destination = unsmob (sid)->smobbed_copy (); - return CONTEXT_MOD_IDENTIFIER; + return SCM_IDENTIFIER; } else if (Music *mus = unsmob (sid)) { mus = mus->clone (); *destination = mus->self_scm (); @@ -4017,8 +4089,12 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) } else if (unsmob (sid)) { *destination = unsmob (sid)->clone ()->unprotect (); return SCM_IDENTIFIER; + } else if (scm_is_pair (sid) + && scm_is_pair (scm_car (sid)) + && scm_is_true (Lily::key_p (scm_caar (sid)))) { + *destination = sid; + return LOOKUP_IDENTIFIER; } - return -1; } @@ -4070,7 +4146,7 @@ SCM check_scheme_arg (Lily_parser *parser, Input loc, return args; } -SCM loc_on_music (Lily_parser *parser, Input loc, SCM arg) +SCM loc_on_copy (Lily_parser *parser, Input loc, SCM arg) { if (Music *m = unsmob (arg)) { @@ -4078,6 +4154,34 @@ SCM loc_on_music (Lily_parser *parser, Input loc, SCM arg) m->set_spot (parser->lexer_->override_input (loc)); return m->unprotect (); } + if (Book *b = unsmob (arg)) + { + b = b->clone (); + b->origin ()->set_spot (parser->lexer_->override_input (loc)); + return b->unprotect (); + } + if (Context_def *cd = unsmob (arg)) + { + cd = cd->clone (); + cd->origin ()->set_spot (parser->lexer_->override_input (loc)); + return cd->unprotect (); + } + if (Output_def *od = unsmob (arg)) + { + od = od->clone (); + od->input_origin_ = parser->lexer_->override_input (loc); + return od->unprotect (); + } + if (Score *s = unsmob (arg)) + { + s = s->clone (); + s->origin ()->set_spot (parser->lexer_->override_input (loc)); + return s->unprotect (); + } + if (Context_mod *cm = unsmob (arg)) + { + return cm->smobbed_copy (); + } return arg; } @@ -4088,7 +4192,7 @@ try_string_variants (SCM pred, SCM str) if (scm_is_true (scm_call_1 (pred, str))) return str; // a symbol may be interpreted as a list of symbols if it helps - if (scm_is_symbol (str)) { + if (scm_is_true (Lily::key_p (str))) { str = scm_list_1 (str); if (scm_is_true (scm_call_1 (pred, str))) return str; @@ -4102,6 +4206,10 @@ try_string_variants (SCM pred, SCM str) return SCM_UNDEFINED; str = scm_string_split (str, SCM_MAKE_CHAR ('.')); + for (SCM p = str; scm_is_pair (p); p = scm_cdr (p)) + scm_set_car_x (p, scm_string_split (scm_car (p), + SCM_MAKE_CHAR (','))); + str = scm_append_x (str); for (SCM p = str; scm_is_pair (p); p = scm_cdr (p)) scm_set_car_x (p, scm_string_to_symbol (scm_car (p))); @@ -4140,7 +4248,8 @@ is_regular_identifier (SCM id, bool multiple) || (c >= 'A' && c <= 'Z') || c > 0x7f) middle = true; - else if (middle && (c == '-' || c == '_' || (multiple && c == '.'))) + else if (middle && (c == '-' || c == '_' || (multiple && + (c == '.' || c == ',')))) middle = false; else return false;