deleting them. Let's hope that a stack overflow doesnt trigger a move
of the parse stack onto the heap. */
-%left PREC_TOP
-%left ADDLYRICS
%left PREC_BOT
+%nonassoc REPEAT
+%nonassoc ALTERNATIVE
+%left ADDLYRICS
+%left PREC_TOP
-%expect 1
-/* One shift/reduce problem
+/* The above precedences tackle the shift/reduce problem
1. \repeat
\repeat .. \alternative
%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"
%token MIDI "\\midi"
%token NAME "\\name"
%token NOTEMODE "\\notemode"
-%token OCTAVE "\\octave"
%token ONCE "\\once"
%token OVERRIDE "\\override"
%token PAPER "\\paper"
-%token PARTIAL "\\partial"
%token RELATIVE "\\relative"
%token REMOVE "\\remove"
%token REPEAT "\\repeat"
%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"
%token MULTI_MEASURE_REST
-%token <i> DIGIT
%token <i> E_UNSIGNED
%token <i> UNSIGNED
%token <scm> CONTEXT_DEF_IDENTIFIER
%token <scm> CONTEXT_MOD_IDENTIFIER
%token <scm> DRUM_PITCH
+%token <scm> PITCH_IDENTIFIER
%token <scm> DURATION_IDENTIFIER
%token <scm> EVENT_IDENTIFIER
%token <scm> FRACTION
%type <i> tremolo_type
/* Music */
-%type <scm> composite_music
%type <scm> grouped_music_list
+%type <scm> braced_music_list
%type <scm> closed_music
-%type <scm> open_music
%type <scm> music
%type <scm> prefix_composite_music
%type <scm> repeated_music
%type <scm> direction_reqd_event
%type <scm> embedded_lilypond
%type <scm> event_chord
+%type <scm> fingering
%type <scm> gen_text_def
%type <scm> music_property_def
%type <scm> note_chord_element
%type <scm> post_event
+%type <scm> post_event_nofinger
%type <scm> re_rhythmed_music
%type <scm> relative_music
%type <scm> simple_element
%type <outputdef> output_def
%type <outputdef> paper_block
-%type <scm> alternative_music
%type <scm> generic_prefix_music_scm
%type <scm> music_list
%type <scm> absolute_pitch
%type <scm> direction_less_char
%type <scm> duration_length
%type <scm> embedded_scm
+%type <scm> embedded_scm_bare
+%type <scm> embedded_scm_closed
+%type <scm> embedded_scm_chord_body
+%type <scm> embedded_scm_event
%type <scm> figure_list
%type <scm> figure_spec
%type <scm> fraction
%type <scm> full_markup
%type <scm> full_markup_list
-%type <scm> function_scm_argument
%type <scm> function_arglist
-%type <scm> function_arglist_nonmusic_last
-%type <scm> closed_function_arglist
-%type <scm> open_function_arglist
+%type <scm> function_arglist_bare
+%type <scm> function_arglist_closed
%type <scm> identifier_init
%type <scm> lilypond
%type <scm> lilypond_header
%type <scm> property_operation
%type <scm> property_path property_path_revved
%type <scm> scalar
+%type <scm> scalar_bare
+%type <scm> scalar_closed
%type <scm> scm_function_call
+%type <scm> scm_function_call_closed
%type <scm> script_abbreviation
%type <scm> simple_chord_elements
%type <scm> simple_markup
PARSER->lexer_->push_note_state (alist_to_hashq (nn));
} embedded_lilypond {
PARSER->lexer_->pop_state ();
- PARSER->lexer_->set_identifier (ly_symbol2scm ("$parseStringResult"), $3);
+ PARSER->lexer_->set_identifier (ly_symbol2scm ("parseStringResult"), $3);
}
;
scm_call_2 (proc, PARSER->self_scm (), score->self_scm ());
score->unprotect ();
}
- | composite_music {
+ | closed_music {
Music *music = unsmob_music ($1);
SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-music-handler");
scm_call_2 (proc, PARSER->self_scm (), music->self_scm ());
}
;
-embedded_scm:
+embedded_scm_bare:
SCM_TOKEN
| SCM_IDENTIFIER
+ ;
+
+/* The generic version may end in music, or not */
+
+embedded_scm:
+ embedded_scm_bare
| scm_function_call
;
scm_function_call:
- SCM_FUNCTION closed_function_arglist
- {
+ SCM_FUNCTION function_arglist {
$$ = run_music_function (PARSER, @$,
$1, $2);
}
| error {
PARSER->error_level_ = 1;
}
- | embedded_lilypond INVALID {
+ | INVALID embedded_lilypond {
PARSER->error_level_ = 1;
}
;
else
$$ = MAKE_SYNTAX ("event-chord", @$, scm_list_1 ($1));
}
- | post_event {
+ | post_event_nofinger {
$$ = $1;
}
| number_expression {
| full_markup_list {
$$ = $1;
}
- | DIGIT {
- $$ = scm_from_int ($1);
- }
| context_modification {
$$ = $1;
}
scm_call_2 (proc, $$->self_scm (), score->self_scm ());
score->unprotect ();
}
- | book_body composite_music {
+ | book_body closed_music {
Music *music = unsmob_music ($2);
SCM proc = PARSER->lexer_->lookup_identifier ("book-music-handler");
scm_call_3 (proc, PARSER->self_scm (), $$->self_scm (), music->self_scm ());
| book_body lilypond_header {
$$->header_ = $2;
}
+ | book_body embedded_scm { }
| book_body error {
$$->paper_ = 0;
$$->scores_ = SCM_EOL;
scm_call_2 (proc, $$->self_scm (), score->self_scm ());
score->unprotect ();
}
- | bookpart_body composite_music {
+ | bookpart_body closed_music {
Music *music = unsmob_music ($2);
SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-music-handler");
scm_call_3 (proc, PARSER->self_scm (), $$->self_scm (), music->self_scm ());
| bookpart_body lilypond_header {
$$->header_ = $2;
}
+ | bookpart_body embedded_scm { }
| bookpart_body error {
$$->paper_ = 0;
$$->scores_ = SCM_EOL;
TEMPO steno_duration '=' tempo_range {
$$ = MAKE_SYNTAX ("tempo", @$, SCM_EOL, $2, $4);
}
- | TEMPO scalar steno_duration '=' tempo_range {
+ | TEMPO scalar_closed steno_duration '=' tempo_range {
$$ = MAKE_SYNTAX ("tempo", @$, $2, $3, $5);
}
| TEMPO scalar {
}
;
+braced_music_list:
+ '{' music_list '}'
+ {
+ $$ = scm_reverse_x ($2, SCM_EOL);
+ }
+ ;
+
music:
simple_music
- | composite_music
+ | prefix_composite_music { $$ = $1; }
+ | grouped_music_list { $$ = $1; }
| MUSIC_IDENTIFIER
;
-alternative_music:
- /* empty */ {
- $$ = SCM_EOL;
- }
- | ALTERNATIVE '{' music_list '}' {
- $$ = scm_reverse_x ($3, SCM_EOL);
- }
- ;
-
repeated_music:
- REPEAT simple_string unsigned_number music alternative_music
+ REPEAT simple_string unsigned_number music
{
- $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $5);
+ $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, SCM_EOL);
+ }
+ | REPEAT simple_string unsigned_number music ALTERNATIVE braced_music_list
+ {
+ $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $6);
}
;
sequential_music:
- SEQUENTIAL '{' music_list '}' {
- $$ = MAKE_SYNTAX ("sequential-music", @$, scm_reverse_x ($3, SCM_EOL));
+ SEQUENTIAL braced_music_list {
+ $$ = MAKE_SYNTAX ("sequential-music", @$, $2);
}
- | '{' music_list '}' {
- $$ = MAKE_SYNTAX ("sequential-music", @$, scm_reverse_x ($2, SCM_EOL));
+ | braced_music_list {
+ $$ = MAKE_SYNTAX ("sequential-music", @$, $1);
}
;
simultaneous_music:
- SIMULTANEOUS '{' music_list '}'{
- $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_reverse_x ($3, SCM_EOL));
+ SIMULTANEOUS braced_music_list {
+ $$ = MAKE_SYNTAX ("simultaneous-music", @$, $2);
}
| DOUBLE_ANGLE_OPEN music_list DOUBLE_ANGLE_CLOSE {
$$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_reverse_x ($2, SCM_EOL));
}
;
-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
- | 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 EXPECT_NO_MORE_ARGS
and this rule returns the reversed list of arguments. */
function_arglist:
- closed_function_arglist
- | open_function_arglist
+ function_arglist_bare
+ | EXPECT_MUSIC function_arglist music {
+ $$ = scm_cons ($3, $2);
+ }
+ | EXPECT_SCM function_arglist embedded_scm {
+ $$ = scm_cons ($3, $2);
+ }
;
-open_function_arglist:
- EXPECT_MUSIC function_arglist open_music {
+function_arglist_closed:
+ function_arglist_bare
+ | EXPECT_MUSIC function_arglist closed_music {
$$ = scm_cons ($3, $2);
}
+ | EXPECT_SCM function_arglist embedded_scm_closed {
+ $$ = scm_cons ($3, $2);
+ }
;
-/* a closed argument list is one that does not end in a music
- expression that could still take a duration or event */
+embedded_scm_closed:
+ embedded_scm_bare
+ | scm_function_call_closed
+ ;
-closed_function_arglist:
- function_arglist_nonmusic_last
- | EXPECT_MUSIC function_arglist closed_music {
- $$ = scm_cons ($3, $2);
- }
+scm_function_call_closed:
+ SCM_FUNCTION function_arglist_closed {
+ $$ = run_music_function (PARSER, @$,
+ $1, $2);
+ }
;
-function_arglist_nonmusic_last:
+function_arglist_bare:
EXPECT_NO_MORE_ARGS {
/* This is for 0-ary functions, so they don't need to
read a lookahead token */
| EXPECT_MARKUP function_arglist simple_string {
$$ = scm_cons ($3, $2);
}
- | EXPECT_PITCH function_arglist pitch {
+ | EXPECT_PITCH function_arglist pitch_also_in_chords {
$$ = scm_cons ($3, $2);
}
- | EXPECT_DURATION closed_function_arglist duration_length {
+ | EXPECT_DURATION function_arglist_closed duration_length {
$$ = scm_cons ($3, $2);
}
- | EXPECT_SCM function_arglist function_scm_argument {
- $$ = scm_cons ($3, $2);
+ | EXPECT_SCM function_arglist simple_string {
+ $$ = scm_cons ($3, $2);
}
;
generic_prefix_music_scm:
MUSIC_FUNCTION function_arglist {
$$ = run_music_function (PARSER, @$,
- $1,
- scm_reverse_x ($2, SCM_EOL));
+ $1, $2);
}
;
$$ = 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"))
{
Pitch start = *unsmob_pitch ($2);
$$ = make_music_relative (start, $3, @$);
}
- | RELATIVE composite_music {
+ | RELATIVE closed_music {
Pitch middle_c (0, 0, 0);
$$ = make_music_relative (middle_c, $2, @$);
}
property_path_revved:
- embedded_scm {
+ embedded_scm_closed {
$$ = scm_cons ($1, SCM_EOL);
}
- | property_path_revved embedded_scm {
+ | property_path_revved embedded_scm_closed {
$$ = scm_cons ($2, $1);
}
;
}
;
-scalar: string {
+scalar_bare:
+ string {
$$ = $1;
}
| lyric_element {
| bare_number {
$$ = $1;
}
- | embedded_scm {
+ | embedded_scm_bare {
$$ = $1;
}
| full_markup {
$$ = $1;
}
- | DIGIT {
- $$ = scm_from_int ($1);
- }
;
+scalar:
+ scalar_bare |
+ scm_function_call
+ ;
+
+scalar_closed:
+ scalar_bare |
+ scm_function_call_closed
+ ;
+
+
event_chord:
/* TODO: Create a special case that avoids the creation of
EventChords around simple_elements that have no post_events?
*/
music_function_chord_body_arglist:
- function_arglist_nonmusic_last
+ function_arglist_bare
| EXPECT_MUSIC music_function_chord_body_arglist chord_body_element {
$$ = scm_cons ($3, $2);
}
+ | EXPECT_SCM function_arglist embedded_scm_chord_body {
+ $$ = scm_cons ($3, $2);
+ }
+ ;
+
+embedded_scm_chord_body:
+ embedded_scm_bare
+ | SCM_FUNCTION music_function_chord_body_arglist {
+ $$ = run_music_function (PARSER, @$,
+ $1, $2);
+ }
;
music_function_chord_body:
MUSIC_FUNCTION music_function_chord_body_arglist {
$$ = run_music_function (PARSER, @$,
- $1, scm_reverse_x ($2, SCM_EOL));
+ $1, $2);
}
;
* refrain from doing so.
*/
music_function_event_arglist:
- function_arglist_nonmusic_last
+ function_arglist_bare
| EXPECT_MUSIC music_function_event_arglist post_event {
$$ = scm_cons ($3, $2);
}
+ | EXPECT_SCM function_arglist embedded_scm_event {
+ $$ = scm_cons ($3, $2);
+ }
+ ;
+
+embedded_scm_event:
+ embedded_scm_bare
+ | SCM_FUNCTION music_function_event_arglist {
+ $$ = run_music_function (PARSER, @$,
+ $1, $2);
+ }
;
music_function_event:
MUSIC_FUNCTION music_function_event_arglist {
$$ = run_music_function (PARSER, @$,
- $1, scm_reverse_x ($2, SCM_EOL));
+ $1, $2);
}
;
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));
$$ = MAKE_SYNTAX ("bar-check", @$, SCM_UNDEFINED);
}
- | PARTIAL duration_length {
- $$ = MAKE_SYNTAX ("partial", @$, $2);
- }
-
| TIME_T fraction {
SCM proc = ly_lily_module_constant ("make-time-signature-set");
}
;
-post_event:
+post_event_nofinger:
direction_less_event {
$$ = $1;
}
| 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", @$);
steno_pitch {
$$ = $1;
}
+ | PITCH_IDENTIFIER
;
pitch_also_in_chords:
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 ();
absolute_pitch:
- steno_pitch {
+ pitch {
$$ = $1;
}
;
;
bass_number:
- DIGIT {
- $$ = scm_from_int ($1);
- }
- | UNSIGNED {
+ UNSIGNED {
$$ = scm_from_int ($1);
}
| STRING { $$ = $1; }
UNSIGNED {
$$ = $1;
}
- | DIGIT {
- $$ = $1;
- }
;
unsigned_number:
EXPECT_MARKUP_LIST markup_command_list_arguments markup_list {
$$ = scm_cons ($3, $2);
}
- | EXPECT_SCM markup_command_list_arguments embedded_scm {
+ | EXPECT_SCM markup_command_list_arguments embedded_scm_closed {
$$ = scm_cons ($3, $2);
}
| EXPECT_NO_MORE_ARGS {
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;
SCM type_check_proc = ly_lily_module_constant ("type-check-list");
+ 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)));
}
- SCM syntax_args = scm_list_4 (parser->self_scm (), make_input (loc), func, args);
- return LOWLEVEL_MAKE_SYNTAX (scm_car (sig), syntax_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);
}
bool
projects / lilypond.git / blobdiff