#define YYDEBUG 1
#define YYERROR_VERBOSE 1
-#define YYPARSE_PARAM my_lily_parser
-#define YYLEX_PARAM my_lily_parser
-#define PARSER ((Lily_parser *) my_lily_parser)
+#define PARSER parser
-#define yyerror PARSER->parser_error
+#define yyerror Lily_parser::parser_error
/* We use custom location type: Input objects */
#define YYLTYPE Input
%}
+%parse-param {Lily_parser *parser}
+%lex-param {Lily_parser *parser}
+
/* We use SCMs to do strings, because it saves us the trouble of
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
-%expect 1
-
-/* One shift/reduce problem
+/* The above precedences tackle the shift/reduce problem
1. \repeat
\repeat .. \alternative
\repeat { \repeat } \alternative
*/
+%nonassoc COMPOSITE
+%left ADDLYRICS
+
+ /* ADDLYRICS needs to have lower precedence than argument scanning,
+ * or we won't be able to tell music apart from closed_music without
+ * lookahead in the context of function calls.
+ */
+
+%nonassoc DEFAULT
+
+ /* \default is only applied after exhausting function arguments */
+
+%nonassoc FUNCTION_ARGLIST
+
+ /* expressions with units are permitted into argument lists */
+
+%right PITCH_IDENTIFIER NOTENAME_PITCH TONICNAME_PITCH
+ UNSIGNED REAL DURATION_IDENTIFIER ':'
+
+ /* The above are the symbols that can start optional function arguments
+ that are recognized in the grammar rather than by predicate
+ */
+
+%nonassoc NUMBER_IDENTIFIER '/'
+
+ /* Number-unit expressions, where permitted, are concatenated into
+ * function arguments, just like fractions and tremoli. Tremoli must
+ * not have higher precedence than UNSIGNED, or Lilypond will not
+ * join ':' with a following optional number.
+ */
+
+%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"
+void
+Lily_parser::parser_error (Input const *i, Lily_parser *parser, string s)
+{
+ parser->parser_error (*i, s);
+}
+
+#define MYBACKUP(Token, Value, Location) \
+do \
+ if (yychar == YYEMPTY) \
+ { \
+ if (Token) \
+ PARSER->lexer_->push_extra_token (Token, Value); \
+ PARSER->lexer_->push_extra_token (BACKUP); \
+ } else { \
+ PARSER->parser_error \
+ (Location, _("Too much lookahead")); \
+ } \
+while (0)
+
+
+#define MYREPARSE(Location, Pred, Token, Value) \
+do \
+ if (yychar == YYEMPTY) \
+ { \
+ PARSER->lexer_->push_extra_token (Token, Value); \
+ PARSER->lexer_->push_extra_token (REPARSE, \
+ Pred); \
+ } else { \
+ PARSER->parser_error \
+ (Location, _("Too much lookahead")); \
+ } \
+while (0)
+
%}
Output_def *outputdef;
SCM scm;
std::string *string;
- Music *music;
Score *score;
int i;
}
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 *, SCM expr);
-SCM get_first_context_id (SCM type, Music *m);
+SCM check_scheme_arg (Lily_parser *parser, Input loc,
+ SCM arg, SCM args, SCM pred);
+SCM loc_on_music (Input loc, SCM arg);
SCM make_chord_elements (SCM pitch, SCM dur, SCM modification_list);
SCM make_chord_step (int step, Rational alter);
SCM make_simple_markup (SCM a);
bool is_duration (int t);
bool is_regular_identifier (SCM id);
-bool ly_input_procedure_p (SCM x);
-int yylex (YYSTYPE *s, YYLTYPE *loc, void *v);
+int yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser);
void set_music_properties (Music *p, SCM a);
%}
%token DRUMS "\\drums"
%token FIGUREMODE "\\figuremode"
%token FIGURES "\\figures"
-%token GROBDESCRIPTIONS "\\grobdescriptions"
%token HEADER "\\header"
-%token INVALID "\\invalid"
-%token KEY "\\key"
+%token INVALID "\\version-error"
%token LAYOUT "\\layout"
%token LYRICMODE "\\lyricmode"
%token LYRICS "\\lyrics"
%token LYRICSTO "\\lyricsto"
-%token MARK "\\mark"
%token MARKUP "\\markup"
-%token MARKUPLINES "\\markuplines"
+%token MARKUPLIST "\\markuplist"
%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 REST "\\rest"
%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"
/* Keyword token exceptions. */
-%token TIME_T "\\time"
%token NEWCONTEXT "\\new"
%token MULTI_MEASURE_REST
-%token <i> DIGIT
%token <i> E_UNSIGNED
-%token <i> UNSIGNED
+%token <scm> UNSIGNED
/* Artificial tokens, for more generic function syntax */
-%token <i> EXPECT_MARKUP;
-%token <i> EXPECT_MUSIC;
-%token <i> EXPECT_SCM;
-%token <i> EXPECT_MARKUP_LIST
+%token <i> EXPECT_MARKUP "markup?"
+%token <i> EXPECT_PITCH "ly:pitch?"
+%token <i> EXPECT_DURATION "ly:duration?"
+%token <scm> EXPECT_SCM "scheme?"
+%token <scm> BACKUP "(backed-up?)"
+%token <scm> REPARSE "(reparsed?)"
+%token <i> EXPECT_MARKUP_LIST "markup-list?"
+%token <scm> EXPECT_OPTIONAL "optional?"
/* After the last argument. */
%token <i> EXPECT_NO_MORE_ARGS;
+/* An artificial token for parsing embedded Lilypond */
+%token <i> EMBEDDED_LILY "#{"
+
%token <scm> BOOK_IDENTIFIER
%token <scm> CHORDMODIFIER_PITCH
%token <scm> CHORD_MODIFIER
%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> EVENT_FUNCTION
%token <scm> FRACTION
%token <scm> LYRICS_STRING
+%token <scm> LYRIC_ELEMENT
%token <scm> LYRIC_MARKUP_IDENTIFIER
%token <scm> MARKUP_FUNCTION
%token <scm> MARKUP_LIST_FUNCTION
%token <scm> MARKUP_IDENTIFIER
-%token <scm> MARKUPLINES_IDENTIFIER
+%token <scm> MARKUPLIST_IDENTIFIER
%token <scm> MUSIC_FUNCTION
%token <scm> MUSIC_IDENTIFIER
%token <scm> NOTENAME_PITCH
%token <scm> OUTPUT_DEF_IDENTIFIER
%token <scm> REAL
%token <scm> RESTNAME
+%token <scm> SCM_FUNCTION
%token <scm> SCM_IDENTIFIER
%token <scm> SCM_TOKEN
%token <scm> SCORE_IDENTIFIER
/* Music */
%type <scm> composite_music
%type <scm> grouped_music_list
+%type <scm> braced_music_list
+%type <scm> closed_music
%type <scm> music
-%type <scm> prefix_composite_music
+%type <scm> music_bare
+%type <scm> music_arg
+%type <scm> complex_music
+%type <scm> complex_music_prefix
+%type <scm> mode_changed_music
%type <scm> repeated_music
%type <scm> sequential_music
%type <scm> simple_music
%type <scm> context_change
%type <scm> direction_less_event
%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 <scm> simple_music_property_def
+%type <scm> start_symbol
%type <scm> string_number_event
%type <scm> tempo_event
%type <outputdef> output_def
%type <outputdef> paper_block
-%type <scm> alternative_music
-%type <scm> generic_prefix_music_scm
+%type <scm> music_function_call
%type <scm> music_list
-%type <scm> absolute_pitch
%type <scm> assignment_id
%type <scm> bare_number
+%type <scm> bare_number_closed
%type <scm> unsigned_number
%type <scm> bass_figure
%type <scm> figured_bass_modification
%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> event_function_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_music_last
-%type <scm> function_arglist_nonmusic_last
-%type <scm> function_arglist_nonmusic
+%type <scm> function_arglist_optional
+%type <scm> function_arglist_backup
+%type <scm> function_arglist_nonbackup
+%type <scm> function_arglist_skip
+%type <scm> function_arglist_bare
+%type <scm> function_arglist_closed
+%type <scm> function_arglist_closed_optional
+%type <scm> function_arglist_common
+%type <scm> function_arglist_common_lyric
+%type <scm> function_arglist_common_minus
+%type <scm> function_arglist_closed_common
+%type <scm> function_arglist_keep
+%type <scm> function_arglist_closed_keep
%type <scm> identifier_init
+%type <scm> lilypond
%type <scm> lilypond_header
%type <scm> lilypond_header_body
%type <scm> lyric_element
+%type <scm> lyric_element_arg
+%type <scm> lyric_element_music
%type <scm> lyric_markup
%type <scm> markup
%type <scm> markup_braced_list
%type <scm> mode_changing_head
%type <scm> mode_changing_head_with_context
%type <scm> multiplied_duration
-%type <scm> music_function_identifier_musicless_prefix
%type <scm> music_function_event
%type <scm> music_function_chord_body
+%type <scm> music_function_chord_body_arglist
%type <scm> new_chord
%type <scm> new_lyrics
%type <scm> number_expression
%type <scm> property_operation
%type <scm> property_path property_path_revved
%type <scm> scalar
+%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
%%
-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 {
}
;
-embedded_scm:
+embedded_scm_bare:
SCM_TOKEN
+ {
+ $$ = PARSER->lexer_->eval_scm ($1);
+ }
| SCM_IDENTIFIER
;
+embedded_scm_bare_arg:
+ embedded_scm_bare
+ | STRING
+ | STRING_IDENTIFIER
+ | full_markup
+ | full_markup_list
+ | context_modification
+ | score_block
+ {
+ $$ = $1->self_scm ();
+ $1->unprotect ();
+ }
+ | context_def_spec_block
+ | book_block
+ {
+ $$ = $1->self_scm ();
+ $1->unprotect ();
+ }
+ | bookpart_block
+ {
+ $$ = $1->self_scm ();
+ $1->unprotect ();
+ }
+ | output_def
+ {
+ $$ = $1->self_scm ();
+ $1->unprotect ();
+ }
+ ;
+
+/* The generic version may end in music, or not */
+
+embedded_scm:
+ embedded_scm_bare
+ | scm_function_call
+ ;
+
+embedded_scm_arg:
+ embedded_scm_bare_arg
+ | scm_function_call
+ | music_arg
+ ;
+
+scm_function_call:
+ SCM_FUNCTION function_arglist {
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $1, $2);
+ }
+ ;
+
+embedded_lilypond:
+ /* empty */
+ {
+ $$ = MAKE_SYNTAX ("void-music", @$);
+ }
+ | 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;
+ }
+ ;
+
lilypond_header_body:
{
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;
}
$$ = $1;
unsmob_context_def ($$)->origin ()->set_spot (@$);
}
- | context_def_spec_body GROBDESCRIPTIONS embedded_scm {
- Context_def*td = unsmob_context_def ($$);
-
- for (SCM p = $3; scm_is_pair (p); p = scm_cdr (p)) {
- SCM tag = scm_caar (p);
+ | context_def_spec_body embedded_scm {
+ if (Context_mod *cm = unsmob_context_mod ($2)) {
+ SCM p = cm->get_mods ();
+ Context_def*td = unsmob_context_def ($$);
- /* TODO: should make new tag "grob-definition" ? */
- td->add_context_mod (scm_list_3 (ly_symbol2scm ("assign"),
- tag, scm_cons (scm_cdar (p), SCM_EOL)));
+ for (; scm_is_pair (p); p = scm_cdr (p)) {
+ td->add_context_mod (scm_car (p));
+ }
+ } else {
+ PARSER->parser_error (@2, _ ("not a context mod"));
}
}
| context_def_spec_body context_mod {
| book_body lilypond_header {
$$->header_ = $2;
}
+ | book_body embedded_scm { }
| book_body error {
$$->paper_ = 0;
$$->scores_ = SCM_EOL;
| 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 {
;
/*
-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 *m = MY_MAKE_MUSIC("Music", @$);
// 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
+braced_music_list:
+ '{' music_list '}'
+ {
+ $$ = scm_reverse_x ($2, SCM_EOL);
+ }
;
-alternative_music:
- /* empty */ {
- $$ = SCM_EOL;
- }
- | ALTERNATIVE '{' music_list '}' {
- $$ = scm_car ($3);
- }
+music: simple_music
+ | lyric_element_music
+ | composite_music %prec COMPOSITE
;
+music_arg:
+ simple_music
+ | composite_music %prec COMPOSITE
+ ;
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_car ($3));
+ SEQUENTIAL braced_music_list {
+ $$ = MAKE_SYNTAX ("sequential-music", @$, $2);
}
- | '{' music_list '}' {
- $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($2));
+ | braced_music_list {
+ $$ = MAKE_SYNTAX ("sequential-music", @$, $1);
}
;
simultaneous_music:
- SIMULTANEOUS '{' music_list '}'{
- $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($3));
+ SIMULTANEOUS braced_music_list {
+ $$ = MAKE_SYNTAX ("simultaneous-music", @$, $2);
}
| 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
;
{
$$ = $1;
}
+ | WITH embedded_scm_closed
+ {
+ if (unsmob_context_mod ($2))
+ $$ = $2;
+ else {
+ PARSER->parser_error (@2, _ ("not a context mod"));
+ $$ = Context_mod ().smobbed_copy ();
+ }
+ }
;
optional_context_mod:
if (md)
unsmob_context_mod ($1)->add_context_mods (md->get_mods ());
}
+ | context_mod_list embedded_scm {
+ Context_mod *md = unsmob_context_mod ($2);
+ if (md)
+ unsmob_context_mod ($1)->add_context_mods (md->get_mods ());
+ else
+ PARSER->parser_error (@2, _ ("not a context mod"));
+ }
;
composite_music:
- prefix_composite_music { $$ = $1; }
- | grouped_music_list { $$ = $1; }
+ complex_music
+ | music_bare
+ ;
+
+/* 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
;
grouped_music_list:
| sequential_music { $$ = $1; }
;
-function_scm_argument:
- embedded_scm
- | simple_string
+/* An argument list. If a function \foo expects scm scm pitch, then the lexer expands \foo into the token sequence:
+ MUSIC_FUNCTION EXPECT_PITCH EXPECT_SCM EXPECT_SCM EXPECT_NO_MORE_ARGS
+and this rule returns the reversed list of arguments. */
+
+function_arglist_skip:
+ function_arglist_common
+ | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_skip
+ {
+ $$ = scm_cons ($1, $3);
+ } %prec FUNCTION_ARGLIST
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_skip
+ {
+ $$ = scm_cons ($1, $3);
+ } %prec FUNCTION_ARGLIST
+ | EXPECT_SCM EXPECT_DURATION function_arglist_skip
+ {
+ $$ = scm_cons ($1, $3);
+ } %prec FUNCTION_ARGLIST
;
-/* 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_music_last:
- EXPECT_MUSIC function_arglist music {
- $$ = scm_cons ($3, $2);
+function_arglist_nonbackup:
+ EXPECT_OPTIONAL EXPECT_PITCH function_arglist pitch_also_in_chords {
+ $$ = scm_cons ($4, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed duration_length {
+ $$ = scm_cons ($4, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg_closed
+ {
+ $$ = check_scheme_arg (PARSER, @4, $4, $3, $2);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number_closed
+ {
+ $$ = check_scheme_arg (PARSER, @4, $4, $3, $2);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed FRACTION
+ {
+ $$ = check_scheme_arg (PARSER, @4, $4, $3, $2);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed post_event_nofinger
+ {
+ $$ = check_scheme_arg (PARSER, @4, $4, $3, $2);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed '-' UNSIGNED
+ {
+ SCM n = scm_difference ($5, SCM_UNDEFINED);
+ if (scm_is_true (scm_call_1 ($2, n)))
+ $$ = scm_cons (n, $3);
+ else {
+ Music *t = MY_MAKE_MUSIC ("FingeringEvent", @5);
+ t->set_property ("digit", $5);
+ $$ = t->unprotect ();
+ if (scm_is_true (scm_call_1 ($2, $$)))
+ $$ = scm_cons ($$, $3);
+ else
+ $$ = check_scheme_arg (PARSER, @4, n, $3, $2);
+ }
+
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed '-' REAL
+ {
+ $$ = check_scheme_arg (PARSER, @4,
+ scm_difference ($5, SCM_UNDEFINED),
+ $3, $2);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed '-' NUMBER_IDENTIFIER
+ {
+ $$ = check_scheme_arg (PARSER, @4,
+ scm_difference ($5, SCM_UNDEFINED),
+ $3, $2);
}
;
-function_arglist_nonmusic_last:
- EXPECT_MARKUP function_arglist full_markup {
- $$ = scm_cons ($3, $2);
+
+function_arglist_keep:
+ function_arglist_common
+ | function_arglist_backup
+ ;
+
+function_arglist_closed_keep:
+ function_arglist_closed_common
+ | function_arglist_backup
+ ;
+
+function_arglist_backup:
+ 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 (SCM_IDENTIFIER, $4, @4);
+ }
}
- | EXPECT_MARKUP function_arglist simple_string {
- $$ = scm_cons ($3, $2);
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep post_event_nofinger
+ {
+ if (scm_is_true (scm_call_1 ($2, $4)))
+ {
+ $$ = scm_cons ($4, $3);
+ } else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (EVENT_IDENTIFIER, $4, @4);
+ }
}
- | EXPECT_SCM function_arglist function_scm_argument {
- $$ = scm_cons ($3, $2);
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep lyric_element
+ {
+ // There is no point interpreting a lyrics string as
+ // an event, since we don't allow music possibly
+ // followed by durations or postevent into closed
+ // music, and we only accept closed music in optional
+ // arguments at the moment. If this changes, more
+ // complex schemes might become interesting here as
+ // well: see how we do this at the mandatory argument
+ // point.
+ if (scm_is_true (scm_call_1 ($2, $4)))
+ $$ = scm_cons ($4, $3);
+ else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (LYRICS_STRING, $4, @4);
+ }
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep UNSIGNED
+ {
+ if (scm_is_true (scm_call_1 ($2, $4)))
+ {
+ $$ = $3;
+ MYREPARSE (@4, $2, UNSIGNED, $4);
+ } else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (UNSIGNED, $4, @4);
+ }
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep REAL
+ {
+ if (scm_is_true (scm_call_1 ($2, $4)))
+ {
+ $$ = $3;
+ MYREPARSE (@4, $2, REAL, $4);
+ } else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (REAL, $4, @4);
+ }
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep NUMBER_IDENTIFIER
+ {
+ if (scm_is_true (scm_call_1 ($2, $4)))
+ {
+ $$ = scm_cons ($4, $3);
+ } else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (NUMBER_IDENTIFIER, $4, @4);
+ }
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep FRACTION
+ {
+ if (scm_is_true (scm_call_1 ($2, $4)))
+ {
+ $$ = scm_cons ($4, $3);
+ } else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (FRACTION, $4, @4);
+ }
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep '-' UNSIGNED
+ {
+ SCM n = scm_difference ($5, SCM_UNDEFINED);
+ if (scm_is_true (scm_call_1 ($2, n))) {
+ $$ = $3;
+ MYREPARSE (@5, $2, REAL, n);
+ } else {
+ Music *t = MY_MAKE_MUSIC ("FingeringEvent", @5);
+ t->set_property ("digit", $5);
+ $$ = t->unprotect ();
+ if (scm_is_true (scm_call_1 ($2, $$)))
+ $$ = scm_cons ($$, $3);
+ else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (UNSIGNED, $5, @5);
+ PARSER->lexer_->push_extra_token ('-');
+ }
+ }
+
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep '-' REAL
+ {
+ SCM n = scm_difference ($5, SCM_UNDEFINED);
+ if (scm_is_true (scm_call_1 ($2, n))) {
+ MYREPARSE (@5, $2, REAL, n);
+ $$ = $3;
+ } else {
+ MYBACKUP (REAL, n, @5);
+ }
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep '-' NUMBER_IDENTIFIER
+ {
+ SCM n = scm_difference ($5, SCM_UNDEFINED);
+ if (scm_is_true (scm_call_1 ($2, n))) {
+ $$ = scm_cons (n, $3);
+ } else {
+ MYBACKUP (NUMBER_IDENTIFIER, n, @5);
+ }
+ }
+ | 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_SCM function_arglist_backup BACKUP
+ {
+ $$ = scm_cons ($1, $3);
+ MYBACKUP(0, SCM_UNDEFINED, @3);
+ }
+ | function_arglist_backup REPARSE embedded_scm_arg_closed
+ {
+ $$ = check_scheme_arg (PARSER, @3,
+ $3, $1, $2);
+ }
+ | function_arglist_backup REPARSE bare_number
+ {
+ $$ = check_scheme_arg (PARSER, @3,
+ $3, $1, $2);
+ }
+ | function_arglist_backup REPARSE fraction
+ {
+ $$ = check_scheme_arg (PARSER, @3,
+ $3, $1, $2);
}
;
-function_arglist_nonmusic: EXPECT_NO_MORE_ARGS {
- $$ = SCM_EOL;
+function_arglist:
+ function_arglist_common
+ | function_arglist_nonbackup
+ ;
+
+function_arglist_common:
+ function_arglist_bare
+ | EXPECT_SCM function_arglist_optional embedded_scm_arg
+ {
+ $$ = check_scheme_arg (PARSER, @3,
+ $3, $2, $1);
}
- | EXPECT_MARKUP function_arglist_nonmusic full_markup {
- $$ = scm_cons ($3, $2);
+ | EXPECT_SCM function_arglist_closed_optional bare_number
+ {
+ $$ = check_scheme_arg (PARSER, @3,
+ $3, $2, $1);
}
- | EXPECT_MARKUP function_arglist_nonmusic simple_string {
- $$ = scm_cons ($3, $2);
+ | EXPECT_SCM function_arglist_closed_optional fraction
+ {
+ $$ = check_scheme_arg (PARSER, @3,
+ $3, $2, $1);
}
- | EXPECT_SCM function_arglist_nonmusic function_scm_argument {
- $$ = scm_cons ($3, $2);
+ | EXPECT_SCM function_arglist_closed_optional post_event_nofinger
+ {
+ $$ = check_scheme_arg (PARSER, @3,
+ $3, $2, $1);
}
+ | function_arglist_common_minus
+ | function_arglist_common_lyric
;
-function_arglist: EXPECT_NO_MORE_ARGS {
- /* This is for 0-ary functions, so they don't need to
- read a lookahead token */
+function_arglist_common_lyric:
+ EXPECT_SCM function_arglist_optional lyric_element
+ {
+ // We check how the predicate thinks about a lyrics
+ // event or about a markup. If it accepts neither, we
+ // backup the original token. Otherwise we commit to
+ // taking the token. Depending on what the predicate
+ // is willing to accept, we interpret as a string, as
+ // a lyric event, or ambiguously (meaning that if
+ // something looking like a duration or post event
+ // follows, we take the event, otherwise the string).
+ SCM lyric_event = MAKE_SYNTAX ("lyric-event", @3, $3,
+ PARSER->default_duration_.smobbed_copy ());
+ if (scm_is_true (scm_call_1 ($1, $3)))
+ if (scm_is_true (scm_call_1 ($1, lyric_event)))
+ {
+ $$ = $2;
+ MYREPARSE (@3, $1, LYRICS_STRING, $3);
+ } else {
+ $$ = scm_cons ($3, $2);
+ }
+ else if (scm_is_true (scm_call_1 ($1, lyric_event)))
+ {
+ $$ = $2;
+ MYREPARSE (@3, $1, LYRIC_ELEMENT, $3);
+ } else {
+ // This is going to flag a syntax error, we
+ // know the predicate to be false.
+ check_scheme_arg (PARSER, @3,
+ $3, $2, $1);
+ }
+ }
+ | function_arglist_common_lyric REPARSE lyric_element_arg
+ {
+ // This should never be false
+ $$ = check_scheme_arg (PARSER, @3,
+ $3, $1, $2);
+ }
+ ;
+
+function_arglist_common_minus:
+ EXPECT_SCM function_arglist_closed_optional '-' UNSIGNED
+ {
+ SCM n = scm_difference ($4, SCM_UNDEFINED);
+ if (scm_is_true (scm_call_1 ($1, n))) {
+ $$ = $2;
+ MYREPARSE (@4, $1, REAL, n);
+ } else {
+ Music *t = MY_MAKE_MUSIC ("FingeringEvent", @4);
+ t->set_property ("digit", $4);
+ $$ = t->unprotect ();
+ if (scm_is_true (scm_call_1 ($1, $$)))
+ $$ = scm_cons ($$, $2);
+ else
+ $$ = check_scheme_arg (PARSER, @3, n, $2, $1);
+ }
+
+ }
+ | EXPECT_SCM function_arglist_closed_optional '-' REAL
+ {
+ $$ = $2;
+ SCM n = scm_difference ($4, SCM_UNDEFINED);
+ MYREPARSE (@4, $1, REAL, n);
+ }
+ | EXPECT_SCM function_arglist_closed_optional '-' NUMBER_IDENTIFIER
+ {
+ SCM n = scm_difference ($4, SCM_UNDEFINED);
+ $$ = check_scheme_arg (PARSER, @4, n, $2, $1);
+ }
+ | function_arglist_common_minus REPARSE bare_number
+ {
+ $$ = check_scheme_arg (PARSER, @3, $3, $1, $2);
+ }
+ ;
+
+function_arglist_closed:
+ function_arglist_closed_common
+ | function_arglist_nonbackup
+ ;
+
+function_arglist_closed_common:
+ function_arglist_bare
+ | EXPECT_SCM function_arglist_optional embedded_scm_arg_closed
+ {
+ $$ = check_scheme_arg (PARSER, @3,
+ $3, $2, $1);
+ }
+ | EXPECT_SCM function_arglist_closed_optional bare_number
+ {
+ $$ = check_scheme_arg (PARSER, @3,
+ $3, $2, $1);
+ }
+ | EXPECT_SCM function_arglist_closed_optional '-' UNSIGNED
+ {
+ SCM n = scm_difference ($4, SCM_UNDEFINED);
+ if (scm_is_true (scm_call_1 ($1, n))) {
+ $$ = scm_cons (n, $2);
+ } else {
+ Music *t = MY_MAKE_MUSIC ("FingeringEvent", @4);
+ t->set_property ("digit", $4);
+ $$ = t->unprotect ();
+ if (scm_is_true (scm_call_1 ($1, $$)))
+ $$ = scm_cons ($$, $2);
+ else
+ $$ = check_scheme_arg (PARSER, @3, n, $2, $1);
+ }
+
+ }
+ | EXPECT_SCM function_arglist_closed_optional '-' REAL
+ {
+ $$ = check_scheme_arg (PARSER, @3,
+ scm_difference ($4, SCM_UNDEFINED),
+ $2, $1);
+ }
+ | EXPECT_SCM function_arglist_closed_optional '-' NUMBER_IDENTIFIER
+ {
+ $$ = check_scheme_arg (PARSER, @3,
+ scm_difference ($4, SCM_UNDEFINED),
+ $2, $1);
+ }
+ | EXPECT_SCM function_arglist_closed_optional post_event_nofinger
+ {
+ $$ = check_scheme_arg (PARSER, @3,
+ $3, $2, $1);
+ }
+ | EXPECT_SCM function_arglist_closed_optional fraction
+ {
+ $$ = check_scheme_arg (PARSER, @3,
+ $3, $2, $1);
+ }
+ | EXPECT_SCM function_arglist_optional lyric_element
+ {
+ $$ = check_scheme_arg (PARSER, @3,
+ $3, $2, $1);
+ }
+ ;
+
+function_arglist_optional:
+ function_arglist_keep %prec FUNCTION_ARGLIST
+ | function_arglist_backup BACKUP
+ | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_optional
+ {
+ $$ = scm_cons ($1, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_optional
+ {
+ $$ = scm_cons ($1, $3);
+ }
+ ;
+
+function_arglist_closed_optional:
+ function_arglist_closed_keep %prec FUNCTION_ARGLIST
+ | function_arglist_backup BACKUP
+ | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_closed_optional
+ {
+ $$ = scm_cons ($1, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_optional
+ {
+ $$ = scm_cons ($1, $3);
+ }
+ ;
+
+embedded_scm_closed:
+ embedded_scm_bare
+ | scm_function_call_closed
+ ;
+
+embedded_scm_arg_closed:
+ embedded_scm_bare_arg
+ | scm_function_call_closed
+ | closed_music
+ ;
+
+scm_function_call_closed:
+ SCM_FUNCTION function_arglist_closed {
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $1, $2);
+ } %prec FUNCTION_ARGLIST
+ ;
+
+function_arglist_bare:
+ EXPECT_NO_MORE_ARGS {
$$ = SCM_EOL;
}
- | function_arglist_music_last
- | function_arglist_nonmusic_last
+ | EXPECT_PITCH function_arglist_optional pitch_also_in_chords {
+ $$ = scm_cons ($3, $2);
+ }
+ | EXPECT_DURATION function_arglist_closed_optional duration_length {
+ $$ = scm_cons ($3, $2);
+ }
+ | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_skip DEFAULT {
+ $$ = scm_cons ($1, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_skip DEFAULT {
+ $$ = scm_cons ($1, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip DEFAULT {
+ $$ = scm_cons ($1, $3);
+ }
;
-generic_prefix_music_scm:
+music_function_call:
MUSIC_FUNCTION function_arglist {
- $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL));
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $1, $2);
}
;
}
;
-
-prefix_composite_music:
- generic_prefix_music_scm {
- $$ = run_music_function (PARSER, $1);
+complex_music:
+ music_function_call
+ | repeated_music { $$ = $1; }
+ | re_rhythmed_music { $$ = $1; }
+ | complex_music_prefix music
+ {
+ $$ = FINISH_MAKE_SYNTAX ($1, @$, $2);
}
- | CONTEXT simple_string optional_id optional_context_mod music {
+ ;
+
+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);
- }
- | 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 {
+mode_changed_music:
+ mode_changing_head grouped_music_list {
if ($1 == ly_symbol2scm ("chords"))
{
$$ = MAKE_SYNTAX ("unrelativable-music", @$, $2);
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", @$, $$);
}
PARSER->lexer_->pop_state ();
}
- | relative_music { $$ = $1; }
- | re_rhythmed_music { $$ = $1; }
;
mode_changing_head:
}
;
-
-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 */
- grouped_music_list {
+ composite_music {
/* Can also use music at the expensive of two S/Rs similar to
\repeat \alternative */
PARSER->lexer_->pop_state ();
$$ = scm_cons ($3, SCM_EOL);
}
- | ADDLYRICS {
- PARSER->lexer_->push_lyric_state (); }
- MUSIC_IDENTIFIER {
- PARSER->lexer_->pop_state ();
- $$ = scm_cons ($3, SCM_EOL);
- }
| new_lyrics ADDLYRICS {
PARSER->lexer_->push_lyric_state ();
- } grouped_music_list {
- PARSER->lexer_->pop_state ();
- $$ = scm_cons ($4, $1);
- }
- | new_lyrics ADDLYRICS {
- PARSER->lexer_->push_lyric_state ();
- } MUSIC_IDENTIFIER {
+ } composite_music {
PARSER->lexer_->pop_state ();
$$ = scm_cons ($4, $1);
}
;
re_rhythmed_music:
- grouped_music_list new_lyrics {
+ composite_music new_lyrics {
$$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL));
- }
- | MUSIC_IDENTIFIER new_lyrics {
- $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL));
- }
+ } %prec COMPOSITE
| LYRICSTO simple_string {
PARSER->lexer_->push_lyric_state ();
} music {
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);
}
;
music_property_def:
simple_music_property_def {
- $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons (PARSER->self_scm (), scm_cons2 (make_input (@$), SCM_BOOL_F, $1)));
- }
- | ONCE simple_music_property_def {
- $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons (PARSER->self_scm (), scm_cons2 (make_input (@$), SCM_BOOL_T, $2)));
+ $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons2 (PARSER->self_scm (), make_input (@$), $1));
}
;
}
;
-scalar: string {
- $$ = $1;
- }
- | LYRICS_STRING {
- $$ = $1;
- }
- | bare_number {
- $$ = $1;
- }
- | embedded_scm {
- $$ = $1;
- }
- | full_markup {
- $$ = $1;
- }
- | DIGIT {
- $$ = scm_from_int ($1);
- }
+scalar:
+ embedded_scm_arg
+ | bare_number
+ | lyric_element
;
+scalar_closed:
+ embedded_scm_arg_closed
+ | bare_number
+ | lyric_element
+ ;
+
+
event_chord:
/* TODO: Create a special case that avoids the creation of
EventChords around simple_elements that have no post_events?
}
| 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)) {
}
$$ = n->unprotect ();
}
- | music_function_chord_body {
- $$ = run_music_function (PARSER, $1);
+ | music_function_chord_body
+ ;
+
+/* 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_bare
+ | EXPECT_SCM music_function_chord_body_arglist embedded_scm_chord_body
+ {
+ $$ = check_scheme_arg (PARSER, @3,
+ $3, $2, $1);
}
;
-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.");
- }
+embedded_scm_chord_body:
+ embedded_scm_bare_arg
+ | SCM_FUNCTION music_function_chord_body_arglist {
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $1, $2);
}
+ | bare_number
+ | fraction
+ | lyric_element
+ | chord_body_element
;
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_identifier_musicless_prefix function_arglist_nonmusic {
- $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL));
+ MUSIC_FUNCTION music_function_chord_body_arglist {
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $1, $2);
}
;
+// Event functions may only take closed arglists, otherwise it would
+// not be clear whether a following postevent should be associated
+// with the last argument of the event function or with the expression
+// for which the function call acts itself as event.
+
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 function_arglist_closed {
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $1, $2);
}
- | music_function_identifier_musicless_prefix function_arglist_nonmusic {
- $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL));
+ ;
+
+event_function_event:
+ EVENT_FUNCTION function_arglist_closed {
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $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));
$$ = 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);
-
- }
- | PARTIAL duration_length {
- $$ = MAKE_SYNTAX ("partial", @$, $2);
- }
-
- | TIME_T fraction {
- SCM proc = ly_lily_module_constant ("make-time-signature-set");
+ $$ = MAKE_SYNTAX ("bar-check", @$);
- $$ = scm_apply_2 (proc, scm_car ($2), scm_cdr ($2), SCM_EOL);
- }
- | MARK scalar {
- $$ = MAKE_SYNTAX ("make-mark-set", @$, $2);
}
;
E_TILDE {
$$ = MY_MAKE_MUSIC ("PesOrFlexaEvent", @$)->unprotect ();
}
- | MARK DEFAULT {
- Music *m = MY_MAKE_MUSIC ("MarkEvent", @$);
- $$ = m->unprotect ();
- }
| tempo_event {
$$ = $1;
}
- | KEY DEFAULT {
- Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$);
- $$ = key->unprotect ();
- }
- | KEY NOTENAME_PITCH SCM_IDENTIFIER {
-
- 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));
- } else {
- PARSER->parser_error (@3, _ ("second argument must be pitch list"));
- }
-
- $$ = key->unprotect ();
- }
;
}
;
-post_event:
+post_event_nofinger:
direction_less_event {
$$ = $1;
}
| script_dir music_function_event {
- $$ = run_music_function (PARSER, $2);
+ $$ = $2;
if ($1)
{
unsmob_music ($$)->set_property ("direction", scm_from_int ($1));
$$ = $2;
}
| string_number_event
+ | '^' fingering
+ {
+ $$ = $2;
+ unsmob_music ($$)->set_property ("direction", scm_from_int (UP));
+ }
+ | '_' fingering
+ {
+ $$ = $2;
+ unsmob_music ($$)->set_property ("direction", scm_from_int (DOWN));
+ }
+ ;
+
+post_event:
+ post_event_nofinger
+ | '-' fingering {
+ $$ = $2;
+ }
;
string_number_event:
a->set_property ("tremolo-type", scm_from_int ($1));
$$ = a->unprotect ();
}
+ | event_function_event
;
direction_reqd_event:
steno_pitch {
$$ = $1;
}
+ | PITCH_IDENTIFIER
;
pitch_also_in_chords:
t->set_property ("text", $1);
$$ = t->unprotect ();
}
- | string {
+ | simple_string {
Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$);
t->set_property ("text",
make_simple_markup ($1));
$$ = t->unprotect ();
}
- | DIGIT {
+ ;
+
+fingering:
+ UNSIGNED {
Music *t = MY_MAKE_MUSIC ("FingeringEvent", @$);
- t->set_property ("digit", scm_from_int ($1));
+ t->set_property ("digit", $1);
$$ = t->unprotect ();
}
;
| '-' { $$ = CENTER; }
;
-
-absolute_pitch:
- steno_pitch {
- $$ = $1;
- }
- ;
-
duration_length:
multiplied_duration {
$$ = $1;
fraction:
FRACTION { $$ = $1; }
| UNSIGNED '/' UNSIGNED {
- $$ = scm_cons (scm_from_int ($1), scm_from_int ($3));
+ $$ = scm_cons ($1, $3);
}
;
;
bass_number:
- DIGIT {
- $$ = scm_from_int ($1);
- }
- | UNSIGNED {
- $$ = scm_from_int ($1);
- }
+ UNSIGNED { $$ = $1; }
| STRING { $$ = $1; }
| full_markup { $$ = $1; }
;
ev->set_property ("duration", $2);
$$ = ev->unprotect ();
}
- | lyric_element optional_notemode_duration {
- if (!PARSER->lexer_->is_lyric_state ())
- PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
-
- Music *levent = MY_MAKE_MUSIC ("LyricEvent", @$);
- levent->set_property ("text", $1);
- levent->set_property ("duration",$2);
- $$= levent->unprotect ();
- }
;
simple_chord_elements:
}
;
+lyric_element_arg:
+ lyric_element
+ | lyric_element multiplied_duration post_events {
+ SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
+ $$ = MAKE_SYNTAX ("event-chord", @$,
+ scm_cons (lyric_event,
+ scm_reverse_x ($3, SCM_EOL)));
+ }
+ | lyric_element post_event post_events {
+ SCM lyric_event =
+ MAKE_SYNTAX ("lyric-event", @$, $1,
+ PARSER->default_duration_.smobbed_copy ());
+ $$ = MAKE_SYNTAX ("event-chord", @$,
+ scm_cons2 (lyric_event, $2,
+ scm_reverse_x ($3, SCM_EOL)));
+
+ }
+ | LYRIC_ELEMENT optional_notemode_duration post_events {
+ SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
+ $$ = MAKE_SYNTAX ("event-chord", @$,
+ scm_cons (lyric_event,
+ scm_reverse_x ($3, SCM_EOL)));
+ }
+ ;
+
+
+lyric_element_music:
+ lyric_element optional_notemode_duration post_events {
+ SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
+ $$ = MAKE_SYNTAX ("event-chord", @$,
+ scm_cons (lyric_event,
+ scm_reverse_x ($3, SCM_EOL)));
+ }
+ ;
+
new_chord:
steno_tonic_pitch optional_notemode_duration {
$$ = make_chord_elements ($1, $2, SCM_EOL);
bare_number:
- UNSIGNED {
- $$ = scm_from_int ($1);
- }
- | REAL {
- $$ = $1;
- }
- | NUMBER_IDENTIFIER {
- $$ = $1;
+ bare_number_closed
+ | UNSIGNED NUMBER_IDENTIFIER {
+ $$ = scm_product ($1, $2)
}
| REAL NUMBER_IDENTIFIER {
- $$ = scm_from_double (scm_to_double ($1) *scm_to_double ($2));
- }
- | UNSIGNED NUMBER_IDENTIFIER {
- $$ = scm_from_double ($1 *scm_to_double ($2));
+ $$ = scm_product ($1, $2)
}
;
+bare_number_closed:
+ UNSIGNED
+ | REAL
+ | NUMBER_IDENTIFIER
+ ;
bare_unsigned:
UNSIGNED {
- $$ = $1;
- }
- | DIGIT {
- $$ = $1;
+ $$ = scm_to_int ($1);
}
;
unsigned_number:
- bare_unsigned { $$ = scm_from_int ($1); }
- | NUMBER_IDENTIFIER {
- $$ = $1;
- }
+ UNSIGNED
+ | NUMBER_IDENTIFIER
;
exclamations:
;
full_markup_list:
- MARKUPLINES_IDENTIFIER {
+ MARKUPLIST_IDENTIFIER {
$$ = $1;
}
- | MARKUPLINES
+ | MARKUPLIST
{ PARSER->lexer_->push_markup_state (); }
markup_list {
$$ = $3;
}
;
+markup_scm:
+ embedded_scm_bare
+ {
+ if (Text_interface::is_markup ($1))
+ MYBACKUP (MARKUP_IDENTIFIER, $1, @1);
+ else if (Text_interface::is_markup_list ($1))
+ MYBACKUP (MARKUPLIST_IDENTIFIER, $1, @1);
+ else {
+ PARSER->parser_error (@1, _ ("not a markup"));
+ MYBACKUP (MARKUP_IDENTIFIER, scm_string (SCM_EOL), @1);
+ }
+ } BACKUP
+ ;
+
+
markup_list:
- MARKUPLINES_IDENTIFIER {
+ MARKUPLIST_IDENTIFIER {
$$ = $1;
}
| markup_composed_list {
| markup_command_list {
$$ = scm_list_1 ($1);
}
+ | markup_scm MARKUPLIST_IDENTIFIER
+ {
+ $$ = $2;
+ }
;
markup_composed_list:
EXPECT_MARKUP_LIST markup_command_list_arguments markup_list {
$$ = scm_cons ($3, $2);
}
- | EXPECT_SCM markup_command_list_arguments embedded_scm {
- $$ = scm_cons ($3, $2);
+ | EXPECT_SCM markup_command_list_arguments embedded_scm_closed {
+ $$ = check_scheme_arg (PARSER, @3, $3, $2, $1);
}
| EXPECT_NO_MORE_ARGS {
$$ = SCM_EOL;
| MARKUP_FUNCTION markup_command_basic_arguments {
$$ = scm_cons ($1, scm_reverse_x ($2, SCM_EOL));
}
+ | markup_scm MARKUP_IDENTIFIER
+ {
+ $$ = $2;
+ }
;
markup:
void
Lily_parser::do_yyparse ()
{
- yyparse ((void*)this);
+ yyparse (this);
}
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;
return MARKUP_IDENTIFIER;
} else if (Text_interface::is_markup_list (sid)) {
*destination = sid;
- return MARKUPLINES_IDENTIFIER;
+ return MARKUPLIST_IDENTIFIER;
}
return -1;
return scm_from_locale_string (s);
}
-
-SCM
-run_music_function (Lily_parser *parser, SCM expr)
+SCM check_scheme_arg (Lily_parser *parser, Input loc,
+ SCM arg, SCM args, SCM pred)
{
- 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");
+ args = scm_cons (arg, args);
+ if (scm_is_true (scm_call_1 (pred, arg)))
+ return args;
+ scm_set_cdr_x (scm_last_pair (args), SCM_EOL);
+ MAKE_SYNTAX ("argument-error", loc, scm_length (args), pred, arg);
+ scm_set_cdr_x (scm_last_pair (args), SCM_BOOL_F);
+ return args;
+}
- if (!to_boolean (scm_call_3 (type_check_proc, scm_cadr (expr), sig, args)))
+SCM loc_on_music (Input loc, SCM arg)
+{
+ if (Music *m = unsmob_music (arg))
{
- parser->error_level_ = 1;
- return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("void-music"), scm_list_2 (parser->self_scm (), make_input (*loc)));
+ m = m->clone ();
+ m->set_spot (loc);
+ return m->unprotect ();
}
-
- SCM syntax_args = scm_list_4 (parser->self_scm (), make_input (*loc), func, args);
- return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("music-function"), syntax_args);
+ return arg;
}
bool
return m;
}
-SCM
-get_first_context_id (SCM type, Music *m)
-{
- SCM id = m->get_property ("context-id");
- if (SCM_BOOL_T == scm_equal_p (m->get_property ("context-type"), type)
- && scm_is_string (m->get_property ("context-id"))
- && scm_c_string_length (id) > 0)
- {
- return id;
- }
- return SCM_EOL;
-}
-
SCM
make_simple_markup (SCM a)
{
return scm_call_3 (chord_ctor, pitch, dur, modification_list);
}
-
-/* Todo: actually also use apply iso. call too ... */
-bool
-ly_input_procedure_p (SCM x)
-{
- return ly_is_procedure (x)
- || (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)
+yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser)
{
- Lily_parser *pars = (Lily_parser*) v;
- Lily_lexer *lex = pars->lexer_;
+ Lily_lexer *lex = parser->lexer_;
- lex->lexval_ = (void*) s;
+ lex->lexval_ = s;
lex->lexloc_ = loc;
lex->prepare_for_next_token ();
return lex->yylex ();
projects / lilypond.git / blobdiff