%left PREC_BOT
%nonassoc REPEAT
%nonassoc ALTERNATIVE
-%left ADDLYRICS
-%left PREC_TOP
-
/* The above precedences tackle the shift/reduce problem
\repeat { \repeat } \alternative
*/
+%right FUNCTION_ARGUMENTS
+ MARKUP LYRICS_STRING MARKUP_IDENTIFIER STRING STRING_IDENTIFIER
+ MARKUPLINES WITH CONTEXT_MOD_IDENTIFIER MARKUPLINES_IDENTIFIER
+ SEQUENTIAL SIMULTANEOUS DOUBLE_ANGLE_OPEN MUSIC_IDENTIFIER '{'
+ PITCH_IDENTIFIER NOTENAME_PITCH TONICNAME_PITCH
+ SCM_FUNCTION SCM_IDENTIFIER SCM_TOKEN
+ UNSIGNED DURATION_IDENTIFIER
+ CHORDMODE CHORDS DRUMMODE DRUMS FIGUREMODE FIGURES LYRICMODE LYRICS
+ NOTEMODE
+ CONTEXT TIMES NEWCONTEXT
+
+ /* The above are the symbols that can start function arguments */
+
+%left ADDLYRICS
+%left PREC_TOP
+
+
+
%pure_parser
%locations
#include "main.hh"
#include "misc.hh"
#include "music.hh"
-#include "music.hh"
#include "output-def.hh"
#include "paper-book.hh"
-#include "program-option.hh"
#include "scm-hash.hh"
#include "score.hh"
#include "text-interface.hh"
#include "warn.hh"
+#define MYBACKUP(Token, Value, Location) \
+ do \
+ if (yychar == YYEMPTY) \
+ PARSER->lexer_->push_extra_token (Token, Value); \
+ else \
+ PARSER->parser_error \
+ (Location, _("cannot backup token")); \
+ while (0)
+
%}
scm_apply_0 (proc, args)
/* Syntactic Sugar. */
#define MAKE_SYNTAX(name, location, ...) \
- LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (PARSER->self_scm (), make_input (location), __VA_ARGS__, SCM_UNDEFINED));
+ LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (PARSER->self_scm (), make_input (location), ##__VA_ARGS__, SCM_UNDEFINED));
+#define START_MAKE_SYNTAX(name, ...) \
+ scm_list_n (ly_lily_module_constant (name), ##__VA_ARGS__, SCM_UNDEFINED)
+#define FINISH_MAKE_SYNTAX(start, location, ...) \
+ LOWLEVEL_MAKE_SYNTAX (scm_car (start), scm_cons2 (PARSER->self_scm (), make_input (location), scm_append_x (scm_list_2 (scm_cdr (start), scm_list_n (__VA_ARGS__, SCM_UNDEFINED)))))
SCM get_next_unique_context_id ();
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 *parser, Input loc, SCM func, SCM args);
+SCM check_scheme_arg (Lily_parser *parser, Input loc, SCM fallback,
+ SCM arg, SCM args, SCM pred);
+SCM loc_on_music (Input loc, SCM arg);
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);
%token ONCE "\\once"
%token OVERRIDE "\\override"
%token PAPER "\\paper"
-%token RELATIVE "\\relative"
%token REMOVE "\\remove"
%token REPEAT "\\repeat"
%token REST "\\rest"
%token <i> EXPECT_MUSIC "ly:music?"
%token <i> EXPECT_PITCH "ly:pitch?"
%token <i> EXPECT_DURATION "ly:duration?"
-%token <i> EXPECT_SCM "scheme?"
+%token <scm> EXPECT_SCM "scheme?"
+%token <scm> SKIPPED_SCM "(scheme?)"
%token <i> EXPECT_MARKUP_LIST "markup-list?"
+%token <scm> EXPECT_OPTIONAL "optional?"
/* After the last argument. */
%token <i> EXPECT_NO_MORE_ARGS;
%type <scm> braced_music_list
%type <scm> closed_music
%type <scm> music
+%type <scm> music_bare
%type <scm> complex_music
+%type <scm> complex_music_prefix
%type <scm> mode_changed_music
%type <scm> repeated_music
%type <scm> sequential_music
%type <scm> post_event
%type <scm> post_event_nofinger
%type <scm> re_rhythmed_music
-%type <scm> relative_music
%type <scm> simple_element
%type <scm> simple_music_property_def
%type <scm> start_symbol
%type <scm> music_function_call
%type <scm> music_list
-%type <scm> absolute_pitch
%type <scm> assignment_id
%type <scm> bare_number
%type <scm> unsigned_number
%type <scm> direction_less_char
%type <scm> duration_length
%type <scm> embedded_scm
+%type <scm> embedded_scm_arg
+%type <scm> embedded_scm_arg_closed
%type <scm> embedded_scm_bare
+%type <scm> embedded_scm_bare_arg
%type <scm> embedded_scm_closed
%type <scm> embedded_scm_chord_body
%type <scm> embedded_scm_event
%type <scm> full_markup
%type <scm> full_markup_list
%type <scm> function_arglist
+%type <scm> function_arglist_optional
+%type <scm> function_arglist_keep
%type <scm> function_arglist_bare
%type <scm> function_arglist_closed
+%type <scm> function_arglist_closed_optional
+%type <scm> function_arglist_closed_keep
%type <scm> identifier_init
%type <scm> lilypond
%type <scm> lilypond_header
| SCM_IDENTIFIER
;
+embedded_scm_bare_arg:
+ embedded_scm_bare
+ | simple_string
+ | full_markup
+ | full_markup_list
+ | context_modification
+ ;
+
/* The generic version may end in music, or not */
embedded_scm:
| scm_function_call
;
+embedded_scm_arg:
+ embedded_scm_bare_arg
+ | scm_function_call
+ ;
+
scm_function_call:
SCM_FUNCTION function_arglist {
- $$ = run_music_function (PARSER, @$,
+ $$ = MAKE_SYNTAX ("music-function", @$,
$1, $2);
}
;
embedded_lilypond:
- { $$ = MAKE_SYNTAX ("void-music", @$, SCM_UNDEFINED); }
+ /* empty */
+ {
+ $$ = MAKE_SYNTAX ("void-music", @$);
+ }
| identifier_init
| music music music_list {
$$ = MAKE_SYNTAX ("sequential-music", @$,
music:
simple_music
- | composite_music
+ | composite_music %prec FUNCTION_ARGUMENTS
;
composite_music:
complex_music
- | closed_music
+ | music_bare
;
-/* Music that can't be followed by additional events or durations */
+/* Music that can be parsed without lookahead */
closed_music:
+ music_bare
+ | complex_music_prefix closed_music
+ {
+ $$ = FINISH_MAKE_SYNTAX ($1, @$, $2);
+ }
+ ;
+
+music_bare:
mode_changed_music
| MUSIC_IDENTIFIER
| grouped_music_list
function_arglist:
function_arglist_bare
- | EXPECT_MUSIC function_arglist music {
+ | EXPECT_MUSIC function_arglist_optional music
+ {
$$ = scm_cons ($3, $2);
}
- | EXPECT_SCM function_arglist embedded_scm {
- $$ = scm_cons ($3, $2);
+ | EXPECT_SCM function_arglist_optional embedded_scm_arg
+ {
+ $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, $3, $2, $1);
+ }
+ ;
+
+function_arglist_optional:
+ function_arglist_keep %prec FUNCTION_ARGUMENTS
+ | EXPECT_OPTIONAL EXPECT_MUSIC function_arglist_optional
+ {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_optional
+ {
+ $$ = scm_cons ($1, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_optional
+ {
+ $$ = scm_cons ($1, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_optional
+ {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ }
+ ;
+
+function_arglist_keep:
+ EXPECT_OPTIONAL EXPECT_PITCH function_arglist_keep pitch_also_in_chords {
+ $$ = scm_cons ($4, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_keep duration_length {
+ $$ = scm_cons ($4, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_MUSIC function_arglist_keep closed_music
+ {
+ $$ = scm_cons ($4, $3);
+ }
+ | function_arglist
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep embedded_scm_arg_closed
+ {
+ if (scm_is_true (scm_call_1 ($2, $4)))
+ {
+ $$ = scm_cons ($4, $3);
+ } else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (SKIPPED_SCM, $4, @4);
+ }
}
;
+
function_arglist_closed:
function_arglist_bare
- | EXPECT_MUSIC function_arglist closed_music {
+ | EXPECT_MUSIC function_arglist_optional closed_music
+ {
$$ = scm_cons ($3, $2);
}
- | EXPECT_SCM function_arglist embedded_scm_closed {
- $$ = scm_cons ($3, $2);
+ | EXPECT_SCM function_arglist_optional embedded_scm_arg_closed
+ {
+ $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, $3, $2, $1);
+ }
+ ;
+
+function_arglist_closed_optional:
+ function_arglist_closed_keep %prec FUNCTION_ARGUMENTS
+ | EXPECT_OPTIONAL EXPECT_MUSIC function_arglist_closed_optional
+ {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_closed_optional
+ {
+ $$ = scm_cons ($1, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_optional
+ {
+ $$ = scm_cons ($1, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_optional
+ {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ }
+ ;
+
+function_arglist_closed_keep:
+ EXPECT_OPTIONAL EXPECT_PITCH function_arglist_keep pitch_also_in_chords {
+ $$ = scm_cons ($4, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_keep duration_length {
+ $$ = scm_cons ($4, $3);
}
+ | EXPECT_OPTIONAL EXPECT_MUSIC function_arglist_keep closed_music
+ {
+ $$ = scm_cons ($4, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep embedded_scm_arg_closed
+ {
+ if (scm_is_true (scm_call_1 ($2, $4)))
+ {
+ $$ = scm_cons ($4, $3);
+ } else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (SKIPPED_SCM, $4, @4);
+ }
+ }
+ | function_arglist_closed
;
embedded_scm_closed:
| scm_function_call_closed
;
+embedded_scm_arg_closed:
+ embedded_scm_bare_arg
+ | scm_function_call_closed
+ ;
+
scm_function_call_closed:
SCM_FUNCTION function_arglist_closed {
- $$ = run_music_function (PARSER, @$,
+ $$ = MAKE_SYNTAX ("music-function", @$,
$1, $2);
}
;
function_arglist_bare:
EXPECT_NO_MORE_ARGS {
- /* This is for 0-ary functions, so they don't need to
- read a lookahead token */
$$ = SCM_EOL;
}
- | EXPECT_MARKUP function_arglist full_markup {
+ | EXPECT_PITCH function_arglist_optional pitch_also_in_chords {
$$ = scm_cons ($3, $2);
}
- | EXPECT_MARKUP function_arglist simple_string {
+ | EXPECT_DURATION function_arglist_closed_optional duration_length {
$$ = scm_cons ($3, $2);
}
- | EXPECT_PITCH function_arglist pitch_also_in_chords {
- $$ = scm_cons ($3, $2);
- }
- | EXPECT_DURATION function_arglist_closed duration_length {
- $$ = scm_cons ($3, $2);
- }
- | EXPECT_SCM function_arglist simple_string {
- $$ = scm_cons ($3, $2);
+ | EXPECT_SCM function_arglist_optional SKIPPED_SCM
+ {
+ $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, $3, $2, $1);
}
;
music_function_call:
MUSIC_FUNCTION function_arglist {
- $$ = run_music_function (PARSER, @$,
+ $$ = MAKE_SYNTAX ("music-function", @$,
$1, $2);
}
;
complex_music:
music_function_call
- | CONTEXT simple_string optional_id optional_context_mod music {
+ | repeated_music { $$ = $1; }
+ | re_rhythmed_music { $$ = $1; }
+ | complex_music_prefix music
+ {
+ $$ = FINISH_MAKE_SYNTAX ($1, @$, $2);
+ }
+ ;
+
+complex_music_prefix:
+ CONTEXT simple_string optional_id optional_context_mod {
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);
+ $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_F);
}
- | NEWCONTEXT simple_string optional_id optional_context_mod music {
+ | NEWCONTEXT simple_string optional_id optional_context_mod {
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);
+ $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_T);
}
-
- | TIMES fraction music {
- $$ = MAKE_SYNTAX ("time-scaled-music", @$, $2, $3);
+ | TIMES fraction {
+ $$ = START_MAKE_SYNTAX ("time-scaled-music", $2);
}
- | repeated_music { $$ = $1; }
- | relative_music { $$ = $1; }
- | re_rhythmed_music { $$ = $1; }
;
mode_changed_music:
SCM mods = SCM_EOL;
if (ctxmod)
mods = ctxmod->get_mods ();
- $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, $3, mods, SCM_BOOL_T);
+ $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, mods, SCM_BOOL_T, $3);
if ($1 == ly_symbol2scm ("ChordNames"))
{
$$ = MAKE_SYNTAX ("unrelativable-music", @$, $$);
}
;
-
-relative_music:
- RELATIVE absolute_pitch music {
- Pitch start = *unsmob_pitch ($2);
- $$ = make_music_relative (start, $3, @$);
- }
- | RELATIVE composite_music {
- Pitch middle_c (0, 0, 0);
- $$ = make_music_relative (middle_c, $2, @$);
- }
- ;
-
new_lyrics:
ADDLYRICS { PARSER->lexer_->push_lyric_state (); }
/*cont */
- closed_music {
+ composite_music {
/* Can also use music at the expensive of two S/Rs similar to
\repeat \alternative */
PARSER->lexer_->pop_state ();
}
| new_lyrics ADDLYRICS {
PARSER->lexer_->push_lyric_state ();
- } closed_music {
+ } composite_music {
PARSER->lexer_->pop_state ();
$$ = scm_cons ($4, $1);
}
;
re_rhythmed_music:
- closed_music new_lyrics {
+ composite_music new_lyrics {
$$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL));
- }
+ } %prec FUNCTION_ARGUMENTS
| LYRICSTO simple_string {
PARSER->lexer_->push_lyric_state ();
} music {
| 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);
+ | EXPECT_SCM function_arglist_optional embedded_scm_chord_body {
+ $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, $3, $2, $1);
}
;
embedded_scm_chord_body:
- embedded_scm_bare
+ embedded_scm_bare_arg
| SCM_FUNCTION music_function_chord_body_arglist {
- $$ = run_music_function (PARSER, @$,
+ $$ = MAKE_SYNTAX ("music-function", @$,
$1, $2);
}
;
music_function_chord_body:
MUSIC_FUNCTION music_function_chord_body_arglist {
- $$ = run_music_function (PARSER, @$,
+ $$ = MAKE_SYNTAX ("music-function", @$,
$1, $2);
}
;
| EXPECT_MUSIC music_function_event_arglist post_event {
$$ = scm_cons ($3, $2);
}
- | EXPECT_SCM function_arglist embedded_scm_event {
- $$ = scm_cons ($3, $2);
+ | EXPECT_SCM function_arglist_optional embedded_scm_event {
+ $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, $3, $2, $1);
}
;
embedded_scm_event:
- embedded_scm_bare
+ embedded_scm_bare_arg
| SCM_FUNCTION music_function_event_arglist {
- $$ = run_music_function (PARSER, @$,
+ $$ = MAKE_SYNTAX ("music-function", @$,
$1, $2);
}
;
music_function_event:
MUSIC_FUNCTION music_function_event_arglist {
- $$ = run_music_function (PARSER, @$,
+ $$ = MAKE_SYNTAX ("music-function", @$,
$1, $2);
}
;
event_function_event:
EVENT_FUNCTION music_function_event_arglist {
- $$ = run_music_function (PARSER, @$,
+ $$ = MAKE_SYNTAX ("music-function", @$,
$1, $2);
}
;
$$ = m->unprotect ();
}
| E_BACKSLASH {
- $$ = MAKE_SYNTAX ("voice-separator", @$, SCM_UNDEFINED);
+ $$ = MAKE_SYNTAX ("voice-separator", @$);
}
| '|' {
SCM pipe = PARSER->lexer_->lookup_identifier ("pipeSymbol");
$$ = m->unprotect ();
}
else
- $$ = MAKE_SYNTAX ("bar-check", @$, SCM_UNDEFINED);
+ $$ = MAKE_SYNTAX ("bar-check", @$);
}
| TIME_T fraction {
| '-' { $$ = CENTER; }
;
-
-absolute_pitch:
- pitch {
- $$ = $1;
- }
- ;
-
duration_length:
multiplied_duration {
$$ = $1;
$$ = scm_cons ($3, $2);
}
| EXPECT_SCM markup_command_list_arguments embedded_scm_closed {
- $$ = scm_cons ($3, $2);
+ $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, $3, $2, $1);
}
| EXPECT_NO_MORE_ARGS {
$$ = SCM_EOL;
}
-SCM
-run_music_function (Lily_parser *parser, Input loc, SCM func, SCM args)
+SCM check_scheme_arg (Lily_parser *parser, Input loc, SCM fallback,
+ SCM arg, SCM args, SCM pred)
{
- SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature"));
-
- SCM type_check_proc = ly_lily_module_constant ("type-check-list");
-
- args = scm_reverse_x (args, SCM_EOL);
-
- SCM fallback = SCM_BOOL_F;
- SCM pred = scm_car (sig);
-
- if (scm_is_pair (pred))
+ SCM type_check_arg = ly_lily_module_constant ("type-check-arg");
+ if (scm_is_false (scm_call_4 (type_check_arg, make_input (loc),
+ arg, args, pred)))
{
- fallback = scm_cdr (pred);
- if (Music *m = unsmob_music (fallback)) {
- m = m->clone ();
- m->set_spot (loc);
- fallback = m->unprotect ();
- }
- pred = scm_car (pred);
+ if (SCM_UNBNDP (fallback))
+ fallback = SCM_BOOL_F;
+ else
+ fallback = loc_on_music (loc, fallback);
+
+ parser->error_level_ = 1;
+
+ return scm_cons (fallback, args);
}
+ return scm_cons (arg, args);
+}
- if (!to_boolean (scm_call_3 (type_check_proc, make_input (loc), scm_cdr (sig), args)))
+SCM loc_on_music (Input loc, SCM arg)
+{
+ if (Music *m = unsmob_music (arg))
{
- parser->error_level_ = 1;
- return fallback;
+ m = m->clone ();
+ m->set_spot (loc);
+ return m->unprotect ();
}
-
- SCM syntax_args = scm_list_n (parser->self_scm (), make_input (loc), pred, fallback, func, args, SCM_UNDEFINED);
- return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("music-function"), syntax_args);
+ return arg;
}
bool
|| (scm_is_pair (x) && ly_is_procedure (scm_car (x)));
}
-SCM
-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)
- m->set_property ("last-pitch", last.smobbed_copy ());
- return relative->unprotect ();
-}
-
int
yylex (YYSTYPE *s, YYLTYPE *loc, void *v)
{
projects / lilypond.git / blobdiff