#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. */
#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) \
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);
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 <scm> FRACTION
%token <scm> LYRICS_STRING
%token <scm> LYRIC_ELEMENT
-%token <scm> LYRIC_ELEMENT_P
%token <scm> LYRIC_MARKUP_IDENTIFIER
%token <scm> MARKUP_FUNCTION
%token <scm> MARKUP_LIST_FUNCTION
%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
$$ = $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 {
{
$$ = $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:
{
$$ = check_scheme_arg (PARSER, @4, $4, $3, $2);
}
- | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number
+ | 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
+ | 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
+ | 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);
+ }
;
MYBACKUP (SCM_IDENTIFIER, $4, @4);
}
}
- | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep post_event
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep post_event_nofinger
{
if (scm_is_true (scm_call_1 ($2, $4)))
{
// well: see how we do this at the mandatory argument
// point.
if (scm_is_true (scm_call_1 ($2, $4)))
- $$ = scm_cons ($3, $2);
+ $$ = scm_cons ($4, $3);
else {
$$ = scm_cons (loc_on_music (@3, $1), $3);
- MYBACKUP (LYRIC_MARKUP_IDENTIFIER, $4, @4);
+ MYBACKUP (LYRICS_STRING, $4, @4);
}
}
| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep UNSIGNED
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);
$$ = check_scheme_arg (PARSER, @3,
$3, $2, $1);
}
- | EXPECT_SCM function_arglist_closed_optional post_event
+ | 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
;
if (scm_is_true (scm_call_1 ($1, lyric_event)))
{
$$ = $2;
- MYREPARSE (@3, $1, LYRIC_ELEMENT_P, $3);
+ MYREPARSE (@3, $1, LYRICS_STRING, $3);
} else {
$$ = scm_cons ($3, $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
$$ = 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,
$3, $2, $1);
}
- | EXPECT_SCM function_arglist_closed_optional post_event
+ | 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
+ | EXPECT_SCM function_arglist_closed_optional fraction
{
$$ = check_scheme_arg (PARSER, @3,
$3, $2, $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
- | script_dir fingering {
- if ($1)
- {
- Music *m = unsmob_music ($2);
- m->set_property ("direction", scm_from_int ($1));
- }
+ | '-' fingering {
$$ = $2;
}
;
| LYRICS_STRING {
$$ = $1;
}
- | LYRIC_ELEMENT_P
;
lyric_element_arg:
else if (Text_interface::is_markup_list ($1))
MYBACKUP (MARKUPLIST_IDENTIFIER, $1, @1);
else {
- PARSER->parser_error (@1, _("markup expected"));
+ PARSER->parser_error (@1, _ ("not a markup"));
MYBACKUP (MARKUP_IDENTIFIER, scm_string (SCM_EOL), @1);
}
} BACKUP
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 check_scheme_arg (Lily_parser *parser, Input loc,
SCM arg, SCM args, SCM pred)
{
args = scm_cons (arg, 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 ();