#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 <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
td->add_context_mod (scm_car (p));
}
} else {
- PARSER->parser_error (@2, "context-mod expected");
+ PARSER->parser_error (@2, _ ("not a context mod"));
}
}
| context_def_spec_body context_mod {
if (unsmob_context_mod ($2))
$$ = $2;
else {
- PARSER->parser_error (@2, "context-mod expected");
+ PARSER->parser_error (@2, _ ("not a context mod"));
$$ = Context_mod ().smobbed_copy ();
}
}
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:
// 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
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);
}
| 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 ();