#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. */
/* expressions with units are permitted into argument lists */
%right PITCH_IDENTIFIER NOTENAME_PITCH TONICNAME_PITCH
- UNSIGNED REAL DURATION_IDENTIFIER
+ 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
+%nonassoc NUMBER_IDENTIFIER '/'
/* Number-unit expressions, where permitted, are concatenated into
- * function arguments.
+ * 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
#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) \
} \
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)
+ 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)))))
static Music *make_music_with_input (SCM name, Input where);
-SCM check_scheme_arg (Lily_parser *parser, Input loc, SCM fallback,
+SCM check_scheme_arg (Lily_parser *parser, Input loc,
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);
SCM make_simple_markup (SCM a);
-SCM try_unpack_lyrics (SCM pred, SCM arg);
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 "\\version-error"
%token LAYOUT "\\layout"
%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 <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
%type <scm> closed_music
%type <scm> 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> embedded_scm_bare_arg
%type <scm> embedded_scm_closed
%type <scm> embedded_scm_chord_body
-%type <scm> embedded_scm_event
%type <scm> event_function_event
%type <scm> figure_list
%type <scm> figure_spec
%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> 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_with_context
%type <scm> multiplied_duration
%type <scm> music_function_event
-%type <scm> music_function_event_arglist
%type <scm> music_function_chord_body
%type <scm> music_function_chord_body_arglist
%type <scm> new_chord
%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
embedded_scm_bare:
SCM_TOKEN
+ {
+ $$ = PARSER->lexer_->eval_scm ($1);
+ }
| SCM_IDENTIFIER
;
embedded_scm_arg:
embedded_scm_bare_arg
| scm_function_call
- | music
+ | music_arg
;
scm_function_call:
$$ = $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 {
}
;
-music:
- simple_music
+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
{
$$ = $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:
}
| EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg_closed
{
- $$ = check_scheme_arg (PARSER, @4, $1, $4, $3, $2);
+ $$ = check_scheme_arg (PARSER, @4, $4, $3, $2);
}
| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number_closed
{
- $$ = check_scheme_arg (PARSER, @4, $1, $4, $3, $2);
+ $$ = check_scheme_arg (PARSER, @4, $4, $3, $2);
}
| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed FRACTION
{
- $$ = check_scheme_arg (PARSER, @4, $1, $4, $3, $2);
+ $$ = 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);
}
;
{
$$ = scm_cons ($4, $3);
} else {
- $$ = try_unpack_lyrics ($2, $4);
- if (!SCM_UNBNDP ($$))
- $$ = scm_cons ($$, $3);
- else {
- $$ = scm_cons (loc_on_music (@3, $1), $3);
- MYBACKUP (SCM_IDENTIFIER, $4, @4);
- }
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (SCM_IDENTIFIER, $4, @4);
}
}
- | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep UNSIGNED
+ | 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_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);
{
if (scm_is_true (scm_call_1 ($2, $4)))
{
- $$ = scm_cons ($4, $3);
+ $$ = $3;
+ MYREPARSE (@4, $2, REAL, $4);
} else {
$$ = scm_cons (loc_on_music (@3, $1), $3);
MYBACKUP (REAL, $4, @4);
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);
$$ = 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:
function_arglist_bare
| EXPECT_SCM function_arglist_optional embedded_scm_arg
{
- $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
+ $$ = check_scheme_arg (PARSER, @3,
$3, $2, $1);
}
| EXPECT_SCM function_arglist_closed_optional bare_number
{
- $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
+ $$ = check_scheme_arg (PARSER, @3,
$3, $2, $1);
}
| EXPECT_SCM function_arglist_closed_optional fraction
{
- $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
+ $$ = check_scheme_arg (PARSER, @3,
$3, $2, $1);
}
+ | 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_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_bare
| EXPECT_SCM function_arglist_optional embedded_scm_arg_closed
{
- $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
+ $$ = check_scheme_arg (PARSER, @3,
$3, $2, $1);
}
- | EXPECT_SCM function_arglist_closed_optional bare_number_closed
+ | EXPECT_SCM function_arglist_closed_optional bare_number
{
- $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
+ $$ = check_scheme_arg (PARSER, @3,
$3, $2, $1);
}
- | EXPECT_SCM function_arglist_closed_optional FRACTION
+ | EXPECT_SCM function_arglist_closed_optional '-' UNSIGNED
{
- $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
+ 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);
}
;
}
;
-scalar_bare:
- string {
- $$ = $1;
- }
- | lyric_element {
- $$ = $1;
- }
- | bare_number {
- $$ = $1;
- }
- | embedded_scm_bare {
- $$ = $1;
- }
- | full_markup {
- $$ = $1;
- }
- | full_markup_list
- {
- $$ = $1;
- }
- ;
-
scalar:
- scalar_bare |
- scm_function_call
+ embedded_scm_arg
+ | bare_number
+ | lyric_element
;
scalar_closed:
- scalar_bare |
- scm_function_call_closed
+ embedded_scm_arg_closed
+ | bare_number
+ | lyric_element
;
function_arglist_bare
| EXPECT_SCM music_function_chord_body_arglist embedded_scm_chord_body
{
- $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
+ $$ = check_scheme_arg (PARSER, @3,
$3, $2, $1);
}
;
$$ = MAKE_SYNTAX ("music-function", @$,
$1, $2);
}
+ | bare_number
+ | fraction
+ | lyric_element
| chord_body_element
;
}
;
-/* 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_bare
- | EXPECT_SCM music_function_event_arglist embedded_scm_event
- {
- $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
- $3, $2, $1);
- }
- ;
-
-embedded_scm_event:
- embedded_scm_bare_arg
- | SCM_FUNCTION music_function_event_arglist {
- $$ = MAKE_SYNTAX ("music-function", @$,
- $1, $2);
- }
- | post_event
- ;
+// 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:
- MUSIC_FUNCTION music_function_event_arglist {
+ MUSIC_FUNCTION function_arglist_closed {
$$ = MAKE_SYNTAX ("music-function", @$,
$1, $2);
}
;
event_function_event:
- EVENT_FUNCTION music_function_event_arglist {
+ EVENT_FUNCTION function_arglist_closed {
$$ = MAKE_SYNTAX ("music-function", @$,
$1, $2);
}
$$ = $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
- | script_dir fingering {
- if ($1)
- {
- Music *m = unsmob_music ($2);
- m->set_property ("direction", scm_from_int ($1));
- }
+ | '-' fingering {
$$ = $2;
}
;
t->set_property ("text", $1);
$$ = t->unprotect ();
}
- | string {
+ | simple_string {
Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$);
t->set_property ("text",
make_simple_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);
}
;
+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:
MARKUPLIST_IDENTIFIER {
$$ = $1;
| markup_command_list {
$$ = scm_list_1 ($1);
}
+ | markup_scm MARKUPLIST_IDENTIFIER
+ {
+ $$ = $2;
+ }
;
markup_composed_list:
$$ = scm_cons ($3, $2);
}
| EXPECT_SCM markup_command_list_arguments embedded_scm_closed {
- $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, $3, $2, $1);
+ $$ = 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);
}
return scm_from_locale_string (s);
}
-SCM check_scheme_arg (Lily_parser *my_lily_parser, Input loc, SCM fallback,
+SCM check_scheme_arg (Lily_parser *parser, Input loc,
SCM arg, SCM args, SCM pred)
{
- SCM unwrap = SCM_UNDEFINED;
+ args = scm_cons (arg, args);
if (scm_is_true (scm_call_1 (pred, arg)))
- return scm_cons (arg, args);
- unwrap = try_unpack_lyrics (pred, arg);
- if (!SCM_UNBNDP (unwrap))
- return scm_cons (unwrap, args);
- if (SCM_UNBNDP (fallback)) {
- args = scm_cons (SCM_BOOL_F, args);
- fallback = SCM_BOOL_F;
- } else {
- args = scm_cons (loc_on_music (loc, fallback), args);
- fallback = SCM_CDR (scm_last_pair (args));
- }
+ 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), fallback);
+ scm_set_cdr_x (scm_last_pair (args), SCM_BOOL_F);
return args;
}
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);
}
-SCM
-try_unpack_lyrics (SCM pred, SCM arg)
-{
- if (Music *m = unsmob_music (arg))
- if (m->is_mus_type ("lyric-event")) {
- SCM text = m->get_property ("text");
- if (scm_is_true (scm_call_1 (pred, text)))
- return text;
- }
- return SCM_UNDEFINED;
-}
-
-/* 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)));
-}
-
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