X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=02c99e2f42e8f4eb7cf3283a764369ccac3770d7;hb=5670dc898dbedc105b5ff0719959317850ef443d;hp=213f3ec53967486e6ea63e8563f44d7e20e5c603;hpb=728c1f61013a32153c647a72ca31bc2353754803;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 213f3ec539..02c99e2f42 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1,10 +1,21 @@ /* - parser.yy -- Bison/C++ parser for LilyPond + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1997--2007 Han-Wen Nienhuys + Copyright (C) 1997--2011 Han-Wen Nienhuys Jan Nieuwenhuizen + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ %{ @@ -44,7 +55,7 @@ of the parse stack onto the heap. */ or - \repeat { \repeat } \alternative + \repeat { \repeat } \alternative */ @@ -73,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" @@ -133,7 +145,7 @@ SCM get_next_unique_lyrics_context_id (); static Music *make_music_with_input (SCM name, Input where); SCM make_music_relative (Pitch start, SCM music, Input loc); -SCM run_music_function (Lily_parser *, SCM expr); +SCM run_music_function (Lily_parser *parser, Input loc, SCM func, SCM args); SCM get_first_context_id (SCM type, Music *m); SCM make_chord_elements (SCM pitch, SCM dur, SCM modification_list); SCM make_chord_step (int step, Rational alter); @@ -151,8 +163,8 @@ void set_music_properties (Music *p, SCM a); FIXME: Bison needs to translate some of these, eg, STRING. -*/ - +*/ + /* Keyword tokens with plain escaped name. */ %token ACCEPTS "\\accepts" %token ADDLYRICS "\\addlyrics" @@ -175,7 +187,7 @@ void set_music_properties (Music *p, SCM a); %token FIGURES "\\figures" %token GROBDESCRIPTIONS "\\grobdescriptions" %token HEADER "\\header" -%token INVALID "\\invalid" +%token INVALID "\\version-error" %token KEY "\\key" %token LAYOUT "\\layout" %token LYRICMODE "\\lyricmode" @@ -187,12 +199,9 @@ 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" %token PAPER "\\paper" -%token PARTIAL "\\partial" %token RELATIVE "\\relative" %token REMOVE "\\remove" %token REPEAT "\\repeat" @@ -202,10 +211,8 @@ void set_music_properties (Music *p, SCM a); %token SEQUENTIAL "\\sequential" %token SET "\\set" %token SIMULTANEOUS "\\simultaneous" -%token SKIP "\\skip" %token TEMPO "\\tempo" %token TIMES "\\times" -%token TRANSPOSE "\\transpose" %token TYPE "\\type" %token UNSET "\\unset" %token WITH "\\with" @@ -252,44 +259,39 @@ If we give names, Bison complains. %token MULTI_MEASURE_REST -%token DIGIT %token E_UNSIGNED %token UNSIGNED /* Artificial tokens, for more generic function syntax */ -%token EXPECT_MARKUP; -%token EXPECT_MUSIC; -%token EXPECT_SCM; +%token EXPECT_MARKUP "markup?" +%token EXPECT_MUSIC "ly:music?" +%token EXPECT_PITCH "ly:pitch?" +%token EXPECT_DURATION "ly:duration?" +%token EXPECT_SCM "scheme?" +%token EXPECT_MARKUP_LIST "markup-list?" /* After the last argument. */ %token EXPECT_NO_MORE_ARGS; +/* An artificial token for parsing embedded Lilypond */ +%token EMBEDDED_LILY "#{" + %token BOOK_IDENTIFIER %token CHORDMODIFIER_PITCH %token CHORD_MODIFIER +%token CHORD_REPETITION %token CONTEXT_DEF_IDENTIFIER +%token CONTEXT_MOD_IDENTIFIER %token DRUM_PITCH +%token PITCH_IDENTIFIER %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 @@ -297,6 +299,7 @@ If we give names, Bison complains. %token OUTPUT_DEF_IDENTIFIER %token REAL %token RESTNAME +%token SCM_FUNCTION %token SCM_IDENTIFIER %token SCM_TOKEN %token SCORE_IDENTIFIER @@ -324,6 +327,8 @@ If we give names, Bison complains. /* Music */ %type composite_music %type grouped_music_list +%type closed_music +%type open_music %type music %type prefix_composite_music %type repeated_music @@ -334,18 +339,23 @@ 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 +%type embedded_lilypond %type event_chord +%type fingering %type gen_text_def %type music_property_def %type note_chord_element %type post_event +%type post_event_nofinger %type re_rhythmed_music %type relative_music %type simple_element %type simple_music_property_def +%type start_symbol %type string_number_event %type tempo_event @@ -353,10 +363,10 @@ If we give names, Bison complains. %type output_def_head %type output_def_head_with_mode_switch %type output_def -%type paper_block +%type paper_block %type alternative_music -%type generic_prefix_music_scm +%type generic_prefix_music_scm %type music_list %type absolute_pitch %type assignment_id @@ -378,6 +388,7 @@ If we give names, Bison complains. %type context_prop_spec %type direction_less_char %type duration_length +%type closed_embedded_scm %type embedded_scm %type figure_list %type figure_spec @@ -386,19 +397,23 @@ If we give names, Bison complains. %type full_markup_list %type function_scm_argument %type function_arglist -%type function_arglist_music_last %type function_arglist_nonmusic_last -%type function_arglist_nonmusic +%type closed_function_arglist +%type open_function_arglist %type identifier_init +%type lilypond %type lilypond_header %type lilypond_header_body %type lyric_element %type lyric_markup %type markup %type markup_braced_list -%type markup_braced_list_body +%type markup_braced_list_body %type markup_composed_list %type markup_command_list +%type markup_command_list_arguments +%type closed_markup_command_list_arguments +%type markup_command_basic_arguments %type markup_head_1_item %type markup_head_1_list %type markup_list @@ -406,15 +421,15 @@ If we give names, Bison complains. %type mode_changing_head %type mode_changing_head_with_context %type multiplied_duration -%type music_function_identifier_musicless_prefix %type music_function_event +%type music_function_event_arglist %type music_function_chord_body +%type music_function_chord_body_arglist %type new_chord %type new_lyrics %type number_expression %type number_factor %type number_term -%type object_id_setting %type octave_check %type optional_context_mod %type optional_id @@ -425,6 +440,9 @@ If we give names, Bison complains. %type property_operation %type property_path property_path_revved %type scalar +%type closed_scalar +%type open_scm_function_call +%type closed_scm_function_call %type script_abbreviation %type simple_chord_elements %type simple_markup @@ -433,8 +451,9 @@ If we give names, Bison complains. %type steno_pitch %type steno_tonic_pitch %type step_number -%type step_numbers +%type step_numbers %type string +%type tempo_range %type score_block %type score_body @@ -449,7 +468,18 @@ prec levels in different prods */ %% -lilypond: /* empty */ +start_symbol: + lilypond + | EMBEDDED_LILY { + SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames"); + PARSER->lexer_->push_note_state (alist_to_hashq (nn)); + } embedded_lilypond { + PARSER->lexer_->pop_state (); + PARSER->lexer_->set_identifier (ly_symbol2scm ("parseStringResult"), $3); + } + ; + +lilypond: /* empty */ { } | lilypond toplevel_expression { } | lilypond assignment { @@ -463,10 +493,6 @@ lilypond: /* empty */ ; -object_id_setting: - OBJECTID STRING { $$ = $2; } - ; - toplevel_expression: lilypond_header { PARSER->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1); @@ -485,7 +511,7 @@ toplevel_expression: } | score_block { Score *score = $1; - + SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-score-handler"); scm_call_2 (proc, PARSER->self_scm (), score->self_scm ()); score->unprotect (); @@ -519,9 +545,46 @@ toplevel_expression: } ; -embedded_scm: +closed_embedded_scm: SCM_TOKEN | SCM_IDENTIFIER + | closed_scm_function_call + ; + +embedded_scm: + closed_embedded_scm + | open_scm_function_call + ; + +closed_scm_function_call: + SCM_FUNCTION closed_function_arglist + { + $$ = run_music_function (PARSER, @$, + $1, $2); + } + ; + +open_scm_function_call: + SCM_FUNCTION open_function_arglist + { + $$ = run_music_function (PARSER, @$, + $1, $2); + } + ; + +embedded_lilypond: + { $$ = MAKE_SYNTAX ("void-music", @$, SCM_UNDEFINED); } + | identifier_init + | music music music_list { + $$ = MAKE_SYNTAX ("sequential-music", @$, + scm_cons2 ($1, $2, scm_reverse_x ($3, SCM_EOL))); + } + | error { + PARSER->error_level_ = 1; + } + | INVALID embedded_lilypond { + PARSER->error_level_ = 1; + } ; @@ -531,7 +594,7 @@ lilypond_header_body: PARSER->lexer_->add_scope ($$); } | lilypond_header_body assignment { - + } ; @@ -552,7 +615,11 @@ assignment_id: assignment: assignment_id '=' identifier_init { PARSER->lexer_->set_identifier ($1, $3); - + } + | assignment_id property_path '=' identifier_init { + SCM path = scm_cons (scm_string_to_symbol ($1), $2); + PARSER->lexer_->set_identifier (path, $4); + ; /* TODO: devise standard for protection in parser. @@ -597,7 +664,7 @@ identifier_init: else $$ = MAKE_SYNTAX ("event-chord", @$, scm_list_1 ($1)); } - | post_event { + | post_event_nofinger { $$ = $1; } | number_expression { @@ -612,9 +679,12 @@ identifier_init: | full_markup { $$ = $1; } - | DIGIT { - $$ = scm_from_int ($1); + | full_markup_list { + $$ = $1; } + | context_modification { + $$ = $1; + } ; context_def_spec_block: @@ -645,7 +715,14 @@ context_def_spec_body: } } | context_def_spec_body context_mod { - unsmob_context_def ($$)->add_context_mod ($2); + 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)); + } } ; @@ -654,6 +731,8 @@ context_def_spec_body: book_block: BOOK '{' book_body '}' { $$ = $3; + pop_paper (PARSER); + PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-book"), SCM_BOOL_F); } ; @@ -663,19 +742,26 @@ book_block: book_body: { $$ = new Book; + init_papers (PARSER); $$->origin ()->set_spot (@$); $$->paper_ = dynamic_cast (unsmob_output_def (PARSER->lexer_->lookup_identifier ("$defaultpaper"))->clone ()); $$->paper_->unprotect (); - $$->header_ = PARSER->lexer_->lookup_identifier ("$defaultheader"); + 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); $$->protect (); $$->origin ()->set_spot (@$); + PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $1); } | book_body paper_block { $$->paper_ = $2; $2->unprotect (); + set_paper (PARSER, $2); } | book_body bookpart_block { Book *bookpart = $2; @@ -710,14 +796,12 @@ book_body: $$->scores_ = SCM_EOL; $$->bookparts_ = SCM_EOL; } - | book_body object_id_setting { - $$->user_key_ = ly_scm2string ($2); - } ; bookpart_block: BOOKPART '{' bookpart_body '}' { $$ = $3; + PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), SCM_BOOL_F); } ; @@ -725,11 +809,13 @@ bookpart_body: { $$ = new Book; $$->origin ()->set_spot (@$); + PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $$->self_scm ()); } | BOOK_IDENTIFIER { $$ = unsmob_book ($1); $$->protect (); $$->origin ()->set_spot (@$); + PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $1); } | bookpart_body paper_block { $$->paper_ = $2; @@ -761,9 +847,6 @@ bookpart_body: $$->paper_ = 0; $$->scores_ = SCM_EOL; } - | bookpart_body object_id_setting { - $$->user_key_ = ly_scm2string ($2); - } ; score_block: @@ -788,9 +871,6 @@ score_body: $$->protect (); $$->origin ()->set_spot (@$); } - | score_body object_id_setting { - $$->user_key_ = ly_scm2string ($2); - } | score_body lilypond_header { $$->set_header ($2); } @@ -798,7 +878,7 @@ score_body: if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T) { PARSER->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead")); - + } else { @@ -891,66 +971,43 @@ output_def_body: ; tempo_event: - TEMPO steno_duration '=' bare_unsigned { - $$ = MAKE_SYNTAX ("tempo", @$, SCM_BOOL_F, $2, scm_int2num ($4)); + TEMPO steno_duration '=' tempo_range { + $$ = MAKE_SYNTAX ("tempo", @$, SCM_EOL, $2, $4); } - | TEMPO string steno_duration '=' bare_unsigned { - $$ = MAKE_SYNTAX ("tempo", @$, make_simple_markup($2), $3, scm_int2num ($5)); + | TEMPO closed_scalar steno_duration '=' tempo_range { + $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, $5); } - | TEMPO full_markup steno_duration '=' bare_unsigned { - $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, scm_int2num ($5)); - } - | TEMPO string { - $$ = MAKE_SYNTAX ("tempoText", @$, make_simple_markup($2) ); - } - | TEMPO full_markup { - $$ = MAKE_SYNTAX ("tempoText", @$, $2 ); + | TEMPO closed_scalar { + $$ = MAKE_SYNTAX ("tempo", @$, $2); } ; /* -The representation of a list is the - - (LIST . LAST-CONS) - - to have efficient append. */ +The representation of a list is reversed to have efficient append. */ music_list: /* empty */ { - $$ = scm_cons (SCM_EOL, SCM_EOL); + $$ = SCM_EOL; } | music_list music { - SCM s = $$; - SCM c = scm_cons ($2, SCM_EOL); - - if (scm_is_pair (scm_cdr (s))) - scm_set_cdr_x (scm_cdr (s), c); /* append */ - else - scm_set_car_x (s, c); /* set first cons */ - scm_set_cdr_x (s, c); /* remember last cell */ + $$ = scm_cons ($2, $1); } | music_list embedded_scm { } | music_list error { Music *m = MY_MAKE_MUSIC("Music", @$); - // ugh. code dup + // ugh. code dup m->set_property ("error-found", SCM_BOOL_T); - SCM s = $$; - SCM c = scm_cons (m->self_scm (), SCM_EOL); + $$ = scm_cons (m->self_scm (), $1); m->unprotect (); /* UGH */ - - if (scm_is_pair (scm_cdr (s))) - scm_set_cdr_x (scm_cdr (s), c); /* append */ - else - scm_set_car_x (s, c); /* set first cons */ - scm_set_cdr_x (s, c); /* remember last cell */ } ; music: simple_music | composite_music + | MUSIC_IDENTIFIER ; alternative_music: @@ -958,7 +1015,7 @@ alternative_music: $$ = SCM_EOL; } | ALTERNATIVE '{' music_list '}' { - $$ = scm_car ($3); + $$ = scm_reverse_x ($3, SCM_EOL); } ; @@ -972,103 +1029,151 @@ repeated_music: sequential_music: SEQUENTIAL '{' music_list '}' { - $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($3)); + $$ = MAKE_SYNTAX ("sequential-music", @$, scm_reverse_x ($3, SCM_EOL)); } | '{' music_list '}' { - $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($2)); + $$ = MAKE_SYNTAX ("sequential-music", @$, scm_reverse_x ($2, SCM_EOL)); } ; simultaneous_music: SIMULTANEOUS '{' music_list '}'{ - $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($3)); + $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_reverse_x ($3, SCM_EOL)); } | DOUBLE_ANGLE_OPEN music_list DOUBLE_ANGLE_CLOSE { - $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($2)); + $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_reverse_x ($2, SCM_EOL)); } ; simple_music: event_chord - | MUSIC_IDENTIFIER | music_property_def | 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; } | grouped_music_list { $$ = $1; } ; +/* Music that can't be followed by additional events or durations */ +closed_music: + MUSIC_IDENTIFIER + | grouped_music_list + ; + +/* Music that potentially accepts additional events or durations */ +open_music: + simple_music + | prefix_composite_music + ; + grouped_music_list: simultaneous_music { $$ = $1; } | sequential_music { $$ = $1; } ; function_scm_argument: - embedded_scm + closed_embedded_scm | simple_string ; /* 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: - EXPECT_MUSIC function_arglist music { - $$ = scm_cons ($3, $2); - } + +function_arglist: + closed_function_arglist + | open_function_arglist ; -function_arglist_nonmusic_last: - EXPECT_MARKUP function_arglist full_markup { +open_function_arglist: + EXPECT_MUSIC function_arglist open_music { $$ = scm_cons ($3, $2); } - | EXPECT_SCM function_arglist function_scm_argument { - $$ = scm_cons ($3, $2); + | EXPECT_SCM function_arglist open_scm_function_call { + $$ = scm_cons ($3, $2); } ; -function_arglist_nonmusic: EXPECT_NO_MORE_ARGS { - $$ = SCM_EOL; - } - | EXPECT_MARKUP function_arglist_nonmusic full_markup { - $$ = scm_cons ($3, $2); - } - | EXPECT_SCM function_arglist_nonmusic function_scm_argument { +/* a closed argument list is one that does not end in a music + expression that could still take a duration or event */ + +closed_function_arglist: + function_arglist_nonmusic_last + | EXPECT_MUSIC function_arglist closed_music { $$ = scm_cons ($3, $2); - } + } ; -function_arglist: EXPECT_NO_MORE_ARGS { +function_arglist_nonmusic_last: + EXPECT_NO_MORE_ARGS { /* This is for 0-ary functions, so they don't need to read a lookahead token */ $$ = SCM_EOL; } - | function_arglist_music_last - | function_arglist_nonmusic_last + | EXPECT_MARKUP function_arglist full_markup { + $$ = scm_cons ($3, $2); + } + | EXPECT_MARKUP function_arglist simple_string { + $$ = scm_cons ($3, $2); + } + | EXPECT_PITCH function_arglist pitch_also_in_chords { + $$ = scm_cons ($3, $2); + } + | EXPECT_DURATION closed_function_arglist duration_length { + $$ = scm_cons ($3, $2); + } + | EXPECT_SCM function_arglist function_scm_argument { + $$ = scm_cons ($3, $2); + } ; generic_prefix_music_scm: MUSIC_FUNCTION function_arglist { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); + $$ = run_music_function (PARSER, @$, + $1, $2); } ; @@ -1078,30 +1183,30 @@ optional_id: | '=' simple_string { $$ = $2; } - ; + ; prefix_composite_music: - generic_prefix_music_scm { - $$ = run_music_function (PARSER, $1); - } + generic_prefix_music_scm | 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 { $$ = MAKE_SYNTAX ("time-scaled-music", @$, $2, $3); } | repeated_music { $$ = $1; } - | TRANSPOSE pitch_also_in_chords pitch_also_in_chords music { - Pitch from = *unsmob_pitch ($2); - Pitch to = *unsmob_pitch ($3); - SCM pitch = pitch_interval (from, to).smobbed_copy (); - $$ = MAKE_SYNTAX ("transpose-music", @$, pitch, $4); - } | mode_changing_head grouped_music_list { if ($1 == ly_symbol2scm ("chords")) { @@ -1114,7 +1219,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", @$, $$); @@ -1125,14 +1234,14 @@ prefix_composite_music: | re_rhythmed_music { $$ = $1; } ; -mode_changing_head: +mode_changing_head: NOTEMODE { SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames"); PARSER->lexer_->push_note_state (alist_to_hashq (nn)); $$ = ly_symbol2scm ("notes"); } - | DRUMMODE + | DRUMMODE { SCM nn = PARSER->lexer_->lookup_identifier ("drumPitchNames"); PARSER->lexer_->push_note_state (alist_to_hashq (nn)); @@ -1158,7 +1267,7 @@ mode_changing_head: } ; -mode_changing_head_with_context: +mode_changing_head_with_context: DRUMS { SCM nn = PARSER->lexer_->lookup_identifier ("drumPitchNames"); PARSER->lexer_->push_note_state (alist_to_hashq (nn)); @@ -1198,7 +1307,7 @@ relative_music: new_lyrics: ADDLYRICS { PARSER->lexer_->push_lyric_state (); } /*cont */ - grouped_music_list { + closed_music { /* Can also use music at the expensive of two S/Rs similar to \repeat \alternative */ PARSER->lexer_->pop_state (); @@ -1207,14 +1316,14 @@ new_lyrics: } | new_lyrics ADDLYRICS { PARSER->lexer_->push_lyric_state (); - } grouped_music_list { + } closed_music { PARSER->lexer_->pop_state (); $$ = scm_cons ($4, $1); } ; re_rhythmed_music: - grouped_music_list new_lyrics { + closed_music new_lyrics { $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL)); } | LYRICSTO simple_string { @@ -1233,10 +1342,10 @@ context_change: property_path_revved: - embedded_scm { + closed_embedded_scm { $$ = scm_cons ($1, SCM_EOL); } - | property_path_revved embedded_scm { + | property_path_revved closed_embedded_scm { $$ = scm_cons ($2, $1); } ; @@ -1244,7 +1353,7 @@ property_path_revved: property_path: property_path_revved { $$ = scm_reverse_x ($1, SCM_EOL); - } + } ; property_operation: @@ -1256,7 +1365,7 @@ property_operation: $$ = scm_list_2 (ly_symbol2scm ("unset"), scm_string_to_symbol ($2)); } - | OVERRIDE simple_string property_path '=' embedded_scm { + | OVERRIDE simple_string property_path '=' scalar { $$ = scm_append (scm_list_2 (scm_list_3 (ly_symbol2scm ("push"), scm_string_to_symbol ($2), $5), $3)); @@ -1286,6 +1395,17 @@ 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_prop_spec: @@ -1306,7 +1426,7 @@ context_prop_spec: simple_music_property_def: OVERRIDE context_prop_spec property_path '=' scalar { - $$ = scm_append (scm_list_2 (scm_list_n (scm_car ($2), + $$ = scm_append (scm_list_2 (scm_list_n (scm_car ($2), ly_symbol2scm ("OverrideProperty"), scm_cadr ($2), $5, SCM_UNDEFINED), @@ -1363,24 +1483,25 @@ simple_string: STRING { } ; -scalar: string { +closed_scalar: string { $$ = $1; } - | LYRICS_STRING { + | lyric_element { $$ = $1; } | bare_number { $$ = $1; } - | embedded_scm { + | closed_embedded_scm { $$ = $1; } | full_markup { $$ = $1; } - | DIGIT { - $$ = scm_from_int ($1); - } + ; + +scalar: closed_scalar + | open_scm_function_call ; event_chord: @@ -1396,13 +1517,28 @@ event_chord: i.set_location (@1, @2); $$ = MAKE_SYNTAX ("event-chord", i, elts); } + | CHORD_REPETITION optional_notemode_duration post_events { + 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 { 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_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_ = $$; + } ; @@ -1413,7 +1549,7 @@ note_chord_element: SCM dur = unsmob_duration ($2)->smobbed_copy (); SCM es = m->get_property ("elements"); SCM postevs = scm_reverse_x ($3, SCM_EOL); - + for (SCM s = es; scm_is_pair (s); s = scm_cdr (s)) unsmob_music (scm_car (s))->set_property ("duration", dur); es = ly_append2 (es, postevs); @@ -1467,7 +1603,6 @@ chord_body_element: } | DRUM_PITCH post_events { Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); - n->set_property ("duration", $2); n->set_property ("drum-type", $1); if (scm_is_pair ($2)) { @@ -1476,41 +1611,48 @@ chord_body_element: } $$ = n->unprotect (); } - | music_function_chord_body { - $$ = run_music_function (PARSER, $1); - } + | music_function_chord_body ; -music_function_identifier_musicless_prefix: MUSIC_FUNCTION { - SCM sig = scm_object_property (yylval.scm, ly_symbol2scm ("music-function-signature")); - if (scm_is_pair (sig) && to_boolean (scm_memq (ly_music_p_proc, scm_cdr (scm_reverse (sig))))) - { - PARSER->parser_error (@$, "Music function applied to event may not have a Music argument, except as the last argument."); - } +/* 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_nonmusic_last + | EXPECT_MUSIC music_function_chord_body_arglist chord_body_element { + $$ = scm_cons ($3, $2); } ; music_function_chord_body: - /* We could allow chord functions to have multiple music arguments, - but it's more consistent with music_function_event if we - prohibit it here too */ - music_function_identifier_musicless_prefix EXPECT_MUSIC function_arglist_nonmusic chord_body_element { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($3, scm_list_1 ($4))); + MUSIC_FUNCTION music_function_chord_body_arglist { + $$ = run_music_function (PARSER, @$, + $1, $2); } - | music_function_identifier_musicless_prefix function_arglist_nonmusic { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); + ; + +/* We could accept a closed music argument before the post events + * indicated by a trailing argument list. For symmetry with chord + * bodies and in order to avoid too tricky and complex behavior, we + * refrain from doing so. + */ +music_function_event_arglist: + function_arglist_nonmusic_last + | EXPECT_MUSIC music_function_event_arglist post_event { + $$ = scm_cons ($3, $2); } ; music_function_event: - /* Post-events can only have the last argument as music, without this - restriction we get a shift/reduce conflict from e.g. - c8-\partcombine c8 -. */ - music_function_identifier_musicless_prefix EXPECT_MUSIC function_arglist_nonmusic post_event { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($3, scm_list_1 ($4))); - } - | music_function_identifier_musicless_prefix function_arglist_nonmusic { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); + MUSIC_FUNCTION music_function_event_arglist { + $$ = run_music_function (PARSER, @$, + $1, $2); } ; @@ -1518,9 +1660,6 @@ command_element: command_event { $$ = $1; } - | SKIP duration_length { - $$ = MAKE_SYNTAX ("skip-music", @$, $2); - } | E_BRACKET_OPEN { Music *m = MY_MAKE_MUSIC ("LigatureEvent", @$); m->set_property ("span-direction", scm_from_int (START)); @@ -1548,21 +1687,13 @@ command_element: $$ = MAKE_SYNTAX ("bar-check", @$, SCM_UNDEFINED); } - | 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); - } - | TIME_T fraction { SCM proc = ly_lily_module_constant ("make-time-signature-set"); $$ = 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); } ; @@ -1585,7 +1716,7 @@ command_event: Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$); if (scm_ilength ($3) > 0) - { + { key->set_property ("pitch-alist", $3); key->set_property ("tonic", Pitch (0, 0, 0).smobbed_copy ()); key->transpose (* unsmob_pitch ($2)); @@ -1607,13 +1738,17 @@ post_events: $$ = scm_cons ($2, $$); } ; - -post_event: + +post_event_nofinger: direction_less_event { $$ = $1; } - | '-' music_function_event { - $$ = run_music_function (PARSER, $2); + | script_dir music_function_event { + $$ = $2; + if ($1) + { + unsmob_music ($$)->set_property ("direction", scm_from_int ($1)); + } } | HYPHEN { if (!PARSER->lexer_->is_lyric_state ()) @@ -1644,6 +1779,18 @@ post_event: | string_number_event ; +post_event: + post_event_nofinger + | script_dir fingering { + if ($1) + { + Music *m = unsmob_music ($2); + m->set_property ("direction", scm_from_int ($1)); + } + $$ = $2; + } + ; + string_number_event: E_UNSIGNED { Music *s = MY_MAKE_MUSIC ("StringNumberEvent", @$); @@ -1657,7 +1804,7 @@ direction_less_char: $$ = ly_symbol2scm ("bracketOpenSymbol"); } | ']' { - $$ = ly_symbol2scm ("bracketCloseSymbol"); + $$ = ly_symbol2scm ("bracketCloseSymbol"); } | '~' { $$ = ly_symbol2scm ("tildeSymbol"); @@ -1708,8 +1855,8 @@ direction_less_event: a->set_property ("tremolo-type", scm_from_int ($1)); $$ = a->unprotect (); } - ; - + ; + direction_reqd_event: gen_text_def { $$ = $1; @@ -1790,6 +1937,7 @@ pitch: steno_pitch { $$ = $1; } + | PITCH_IDENTIFIER ; pitch_also_in_chords: @@ -1809,7 +1957,10 @@ gen_text_def: make_simple_markup ($1)); $$ = t->unprotect (); } - | DIGIT { + ; + +fingering: + UNSIGNED { Music *t = MY_MAKE_MUSIC ("FingeringEvent", @$); t->set_property ("digit", scm_from_int ($1)); $$ = t->unprotect (); @@ -1848,7 +1999,7 @@ script_dir: absolute_pitch: - steno_pitch { + pitch { $$ = $1; } ; @@ -1883,6 +2034,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; } @@ -1930,10 +2082,7 @@ tremolo_type: ; bass_number: - DIGIT { - $$ = scm_from_int ($1); - } - | UNSIGNED { + UNSIGNED { $$ = scm_from_int ($1); } | STRING { $$ = $1; } @@ -2055,7 +2204,7 @@ simple_element: n = MY_MAKE_MUSIC ("RestEvent", @$); else n = MY_MAKE_MUSIC ("NoteEvent", @$); - + n->set_property ("pitch", $1); n->set_property ("duration", $5); @@ -2077,7 +2226,7 @@ simple_element: n->set_property ("duration", $2); n->set_property ("drum-type", $1); - $$ = n->unprotect (); + $$ = n->unprotect (); } | RESTNAME optional_notemode_duration { Music *ev = 0; @@ -2087,7 +2236,7 @@ simple_element: } else { ev = MY_MAKE_MUSIC ("RestEvent", @$); - + } ev->set_property ("duration", $2); $$ = ev->unprotect (); @@ -2106,7 +2255,7 @@ simple_element: simple_chord_elements: simple_element { $$ = scm_list_1 ($1); - } + } | new_chord { if (!PARSER->lexer_->is_chord_state ()) PARSER->parser_error (@1, _ ("have to be in Chord mode for chords")); @@ -2118,7 +2267,7 @@ simple_chord_elements: unsmob_music (scm_car (s))->set_property ("duration", $2); } $$ = $1; - } + } ; lyric_element: @@ -2142,7 +2291,7 @@ new_chord: chord_items: /**/ { - $$ = SCM_EOL; + $$ = SCM_EOL; } | chord_items chord_item { $$ = scm_cons ($2, $$); @@ -2193,7 +2342,16 @@ step_number: | bare_unsigned CHORD_MINUS { $$ = make_chord_step ($1, FLAT_ALTERATION); } - ; + ; + +tempo_range: + bare_unsigned { + $$ = scm_from_int ($1); + } + | bare_unsigned '~' bare_unsigned { + $$ = scm_cons (scm_from_int ($1), scm_from_int ($3)); + } + ; /* UTILITIES @@ -2254,9 +2412,6 @@ bare_unsigned: UNSIGNED { $$ = $1; } - | DIGIT { - $$ = $1; - } ; unsigned_number: @@ -2265,7 +2420,6 @@ unsigned_number: $$ = $1; } ; - exclamations: { $$ = 0; } @@ -2294,7 +2448,10 @@ lyric_markup: ; full_markup_list: - MARKUPLINES + MARKUPLINES_IDENTIFIER { + $$ = $1; + } + | MARKUPLINES { PARSER->lexer_->push_markup_state (); } markup_list { $$ = $3; @@ -2315,8 +2472,8 @@ full_markup: ; markup_top: - markup_list { - $$ = scm_list_2 (ly_lily_module_constant ("line-markup"), $1); + markup_list { + $$ = scm_list_2 (ly_lily_module_constant ("line-markup"), $1); } | markup_head_1_list simple_markup { $$ = scm_car (scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, scm_list_1 ($2))); @@ -2327,7 +2484,10 @@ markup_top: ; markup_list: - markup_composed_list { + MARKUPLINES_IDENTIFIER { + $$ = $1; + } + | markup_composed_list { $$ = $1; } | markup_braced_list { @@ -2341,7 +2501,7 @@ markup_list: markup_composed_list: markup_head_1_list markup_braced_list { $$ = scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, $2); - + } ; @@ -2357,37 +2517,46 @@ 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_HEAD_LIST0 markup_list { - $$ = scm_list_2 ($1, $2); + MARKUP_LIST_FUNCTION closed_markup_command_list_arguments { + $$ = scm_cons ($1, scm_reverse_x($2, SCM_EOL)); } - | MARKUP_LIST_HEAD_SCM0 embedded_scm { - $$ = 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_LIST1 embedded_scm markup_list { - $$ = scm_list_3 ($1, $2, $3); + | EXPECT_SCM markup_command_list_arguments closed_embedded_scm { + $$ = scm_cons ($3, $2); } - | MARKUP_LIST_HEAD_SCM0_SCM1_LIST2 embedded_scm embedded_scm markup_list { - $$ = scm_list_4 ($1, $2, $3, $4); + | EXPECT_NO_MORE_ARGS { + $$ = SCM_EOL; } ; -markup_head_1_item: - MARKUP_HEAD_MARKUP0 { - $$ = scm_list_1 ($1); +closed_markup_command_list_arguments: + markup_command_basic_arguments { $$ = $1; } + | EXPECT_MARKUP markup_command_list_arguments markup { + $$ = scm_cons ($3, $2); } - | MARKUP_HEAD_SCM0_MARKUP1 embedded_scm { - $$ = scm_list_2 ($1, $2); + ; + +markup_command_list_arguments: + closed_markup_command_list_arguments + | EXPECT_SCM markup_command_list_arguments open_scm_function_call + { + $$ = scm_cons ($3, $2); } - | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm { - $$ = scm_list_3 ($1, $2, $3); + ; + +markup_head_1_item: + MARKUP_FUNCTION EXPECT_MARKUP markup_command_list_arguments { + $$ = scm_cons ($1, scm_reverse_x ($3, SCM_EOL)); } ; @@ -2422,32 +2591,11 @@ 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)); } ; - + markup: markup_head_1_list simple_markup { SCM mapper = ly_lily_module_constant ("map-markup-command-list"); @@ -2497,13 +2645,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 (); - - return CONTEXT_DEF_IDENTIFIER; + *destination = def->self_scm (); + def->unprotect (); + + 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 (); @@ -2521,13 +2673,16 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) mus->unprotect (); return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER; + } else if (unsmob_pitch (sid)) { + *destination = unsmob_pitch (sid)->smobbed_copy (); + return PITCH_IDENTIFIER; } else if (unsmob_duration (sid)) { *destination = unsmob_duration (sid)->smobbed_copy (); return DURATION_IDENTIFIER; } else if (unsmob_output_def (sid)) { Output_def *p = unsmob_output_def (sid); p = p->clone (); - + *destination = p->self_scm (); p->unprotect (); return OUTPUT_DEF_IDENTIFIER; @@ -2536,9 +2691,12 @@ 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; + return -1; } SCM @@ -2559,22 +2717,21 @@ get_next_unique_lyrics_context_id () SCM -run_music_function (Lily_parser *parser, SCM expr) +run_music_function (Lily_parser *parser, Input loc, SCM func, SCM args) { - SCM func = scm_car (expr); - Input *loc = unsmob_input (scm_cadr (expr)); - SCM args = scm_cddr (expr); SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature")); SCM type_check_proc = ly_lily_module_constant ("type-check-list"); - if (!to_boolean (scm_call_3 (type_check_proc, scm_cadr (expr), sig, args))) + args = scm_reverse_x (args, SCM_EOL); + + if (!to_boolean (scm_call_3 (type_check_proc, make_input (loc), scm_cdr (sig), args))) { parser->error_level_ = 1; - return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("void-music"), scm_list_2 (parser->self_scm (), make_input (*loc))); + return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("void-music"), scm_list_2 (parser->self_scm (), make_input (loc))); } - SCM syntax_args = scm_list_4 (parser->self_scm (), make_input (*loc), func, args); + SCM syntax_args = scm_list_5 (parser->self_scm (), make_input (loc), scm_car (sig), func, args); return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("music-function"), syntax_args); } @@ -2672,7 +2829,7 @@ make_music_relative (Pitch start, SCM music, Input loc) { Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic", loc); relative->set_property ("element", music); - + Music *m = unsmob_music (music); Pitch last = m->to_relative_octave (start); if (lily_1_8_relative) @@ -2686,8 +2843,8 @@ yylex (YYSTYPE *s, YYLTYPE *loc, void *v) Lily_parser *pars = (Lily_parser*) v; Lily_lexer *lex = pars->lexer_; - lex->lexval = (void*) s; - lex->lexloc = loc; + lex->lexval_ = (void*) s; + lex->lexloc_ = loc; lex->prepare_for_next_token (); return lex->yylex (); }