+/* -*- mode: c++; c-file-style: "linux"; indent-tabs-mode: t -*- */
/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
-%{
+/* Mode and indentation are at best a rough approximation based on TAB
+ * formatting (reasonable for compatibility with unspecific editor
+ * modes as Bison modes are hard to find) and need manual correction
+ * frequently. Without a reasonably dependable way of formatting a
+ * Bison file sensibly, there is little point in trying to fix the
+ * inconsistent state of indentation.
+ */
-#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 yyerror PARSER->parser_error
+#define yyerror Lily_parser::parser_error
/* We use custom location type: Input objects */
#define YYLTYPE Input
+#define YYSTYPE SCM
#define YYLLOC_DEFAULT(Current,Rhs,N) \
((Current).set_location ((Rhs)[1], (Rhs)[N]))
+#define YYPRINT(file, type, value) \
+ do { \
+ if (scm_is_eq (value, SCM_UNSPECIFIED)) \
+ break; \
+ char *p = scm_to_locale_string \
+ (scm_simple_format (SCM_BOOL_F, \
+ scm_from_locale_string ("~S"), \
+ scm_list_1 (value))); \
+ fputs (p, file); \
+ free (p); \
+ } while (0)
%}
+%parse-param {Lily_parser *parser}
+%parse-param {SCM *retval}
+%lex-param {Lily_parser *parser}
+%error-verbose
+%debug
+
/* 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
+deleting them. Let's hope that a stack overflow doesn't trigger a move
of the parse stack onto the heap. */
%left PREC_BOT
#include "text-interface.hh"
#include "warn.hh"
+void
+Lily_parser::parser_error (Input const *i, Lily_parser *parser, SCM *, 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); \
+ parser->lexer_->push_extra_token (Token, Value); \
+ parser->lexer_->push_extra_token (BACKUP); \
} else { \
- PARSER->parser_error \
+ parser->parser_error \
(Location, _("Too much lookahead")); \
} \
while (0)
-#define MYREPARSE(Location, Default, Pred, Token, Value) \
+#define MYREPARSE(Location, Pred, Token, Value) \
do \
if (yychar == YYEMPTY) \
{ \
- PARSER->lexer_->push_extra_token (Token, Value); \
- if (Default != SCM_UNDEFINED) \
- PARSER->lexer_->push_extra_token (REPARSE, \
- scm_cons (Default, Pred)); \
- else \
- PARSER->lexer_->push_extra_token (REPARSE, \
- Pred); \
+ parser->lexer_->push_extra_token (Token, Value); \
+ parser->lexer_->push_extra_token (REPARSE, \
+ Pred); \
} else { \
- PARSER->parser_error \
+ parser->parser_error \
(Location, _("Too much lookahead")); \
} \
while (0)
%}
-%union {
- Book *book;
- Output_def *outputdef;
- SCM scm;
- std::string *string;
- Score *score;
- int i;
-}
-
%{
#define MY_MAKE_MUSIC(x, spot) make_music_with_input (ly_symbol2scm (x), spot)
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)))))
+ 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 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_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list);
+SCM make_chord_step (SCM 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);
%}
*/
/* Keyword tokens with plain escaped name. */
+%token END_OF_FILE 0 "end of input"
%token ACCEPTS "\\accepts"
%token ADDLYRICS "\\addlyrics"
%token ALIAS "\\alias"
%token DRUMS "\\drums"
%token FIGUREMODE "\\figuremode"
%token FIGURES "\\figures"
-%token GROBDESCRIPTIONS "\\grobdescriptions"
%token HEADER "\\header"
%token INVALID "\\version-error"
%token LAYOUT "\\layout"
%token MULTI_MEASURE_REST
-%token <i> E_UNSIGNED
-%token <scm> UNSIGNED
+%token E_UNSIGNED
+%token UNSIGNED
/* Artificial tokens, for more generic function syntax */
-%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?"
+%token EXPECT_MARKUP "markup?"
+%token EXPECT_PITCH "ly:pitch?"
+%token EXPECT_DURATION "ly:duration?"
+%token EXPECT_SCM "scheme?"
+%token BACKUP "(backed-up?)"
+%token REPARSE "(reparsed?)"
+%token EXPECT_MARKUP_LIST "markup-list?"
+%token EXPECT_OPTIONAL "optional?"
/* After the last argument. */
-%token <i> EXPECT_NO_MORE_ARGS;
+%token 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> CHORD_REPETITION
-%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_ELEMENT_P
-%token <scm> LYRIC_MARKUP_IDENTIFIER
-%token <scm> MARKUP_FUNCTION
-%token <scm> MARKUP_LIST_FUNCTION
-%token <scm> MARKUP_IDENTIFIER
-%token <scm> MARKUPLIST_IDENTIFIER
-%token <scm> MUSIC_FUNCTION
-%token <scm> MUSIC_IDENTIFIER
-%token <scm> NOTENAME_PITCH
-%token <scm> NUMBER_IDENTIFIER
-%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
-%token <scm> STRING
-%token <scm> STRING_IDENTIFIER
-%token <scm> TONICNAME_PITCH
-
-
-%type <book> book_block
-%type <book> book_body
-%type <book> bookpart_block
-%type <book> bookpart_body
-
-%type <i> bare_unsigned
-%type <scm> figured_bass_alteration
-%type <i> dots
-%type <i> exclamations
-%type <i> optional_rest
-%type <i> questions
-%type <i> script_dir
-%type <i> sub_quotes
-%type <i> sup_quotes
-%type <i> tremolo_type
-
-/* Music */
-%type <scm> composite_music
-%type <scm> grouped_music_list
-%type <scm> braced_music_list
-%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> repeated_music
-%type <scm> sequential_music
-%type <scm> simple_music
-%type <scm> simultaneous_music
-%type <scm> chord_body
-%type <scm> chord_body_element
-%type <scm> command_element
-%type <scm> command_event
-%type <scm> context_modification
-%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> 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_body
-%type <outputdef> output_def_head
-%type <outputdef> output_def_head_with_mode_switch
-%type <outputdef> output_def
-%type <outputdef> paper_block
-
-%type <scm> music_function_call
-%type <scm> music_list
-%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> br_bass_figure
-%type <scm> bass_number
-%type <scm> chord_body_elements
-%type <scm> chord_item
-%type <scm> chord_items
-%type <scm> chord_separator
-%type <scm> context_def_mod
-%type <scm> context_def_spec_block
-%type <scm> context_def_spec_body
-%type <scm> context_mod
-%type <scm> context_mod_list
-%type <scm> context_prop_spec
-%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_arglist
-%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_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> markup_braced_list_body
-%type <scm> markup_composed_list
-%type <scm> markup_command_list
-%type <scm> markup_command_list_arguments
-%type <scm> markup_command_basic_arguments
-%type <scm> markup_head_1_item
-%type <scm> markup_head_1_list
-%type <scm> markup_list
-%type <scm> markup_top
-%type <scm> mode_changing_head
-%type <scm> mode_changing_head_with_context
-%type <scm> multiplied_duration
-%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> number_factor
-%type <scm> number_term
-%type <scm> octave_check
-%type <scm> optional_context_mod
-%type <scm> optional_id
-%type <scm> optional_notemode_duration
-%type <scm> pitch
-%type <scm> pitch_also_in_chords
-%type <scm> post_events
-%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
-%type <scm> simple_string
-%type <scm> steno_duration
-%type <scm> steno_pitch
-%type <scm> steno_tonic_pitch
-%type <scm> step_number
-%type <scm> step_numbers
-%type <scm> string
-%type <scm> tempo_range
-
-%type <score> score_block
-%type <score> score_body
-
+%token EMBEDDED_LILY "#{"
+
+%token BOOK_IDENTIFIER
+%token CHORDMODIFIER_PITCH
+%token CHORD_MODIFIER
+%token CHORD_REPETITION
+%token CONTEXT_DEF_IDENTIFIER
+%token CONTEXT_MOD_IDENTIFIER
+%token DRUM_PITCH
+%token PITCH_IDENTIFIER
+%token DURATION_IDENTIFIER
+%token EVENT_IDENTIFIER
+%token EVENT_FUNCTION
+%token FRACTION
+%token LYRICS_STRING
+%token LYRIC_ELEMENT
+%token LYRIC_MARKUP_IDENTIFIER
+%token MARKUP_FUNCTION
+%token MARKUP_LIST_FUNCTION
+%token MARKUP_IDENTIFIER
+%token MARKUPLIST_IDENTIFIER
+%token MUSIC_FUNCTION
+%token MUSIC_IDENTIFIER
+%token NOTENAME_PITCH
+%token NUMBER_IDENTIFIER
+%token OUTPUT_DEF_IDENTIFIER
+%token REAL
+%token RESTNAME
+%token SCM_FUNCTION
+%token SCM_IDENTIFIER
+%token SCM_TOKEN
+%token SCORE_IDENTIFIER
+%token STRING
+%token STRING_IDENTIFIER
+%token TONICNAME_PITCH
%left '-' '+'
start_symbol:
lilypond
| EMBEDDED_LILY {
- SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames");
- PARSER->lexer_->push_note_state (alist_to_hashq (nn));
+ SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
+ parser->lexer_->push_note_state (nn);
} embedded_lilypond {
- PARSER->lexer_->pop_state ();
- PARSER->lexer_->set_identifier (ly_symbol2scm ("parseStringResult"), $3);
+ parser->lexer_->pop_state ();
+ *retval = $3;
}
;
-lilypond: /* empty */ { }
+lilypond: /* empty */ { $$ = SCM_UNSPECIFIED; }
| lilypond toplevel_expression {
}
| lilypond assignment {
}
| lilypond error {
- PARSER->error_level_ = 1;
+ parser->error_level_ = 1;
}
| lilypond INVALID {
- PARSER->error_level_ = 1;
+ parser->error_level_ = 1;
}
;
toplevel_expression:
- lilypond_header {
- PARSER->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
+ {
+ parser->lexer_->add_scope (get_header (parser));
+ } lilypond_header {
+ parser->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $2);
}
| book_block {
- Book *book = $1;
- SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-book-handler");
- scm_call_2 (proc, PARSER->self_scm (), book->self_scm ());
- book->unprotect ();
+ SCM proc = parser->lexer_->lookup_identifier ("toplevel-book-handler");
+ scm_call_2 (proc, parser->self_scm (), $1);
}
| bookpart_block {
- Book *bookpart = $1;
- SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-bookpart-handler");
- scm_call_2 (proc, PARSER->self_scm (), bookpart->self_scm ());
- bookpart->unprotect ();
+ SCM proc = parser->lexer_->lookup_identifier ("toplevel-bookpart-handler");
+ scm_call_2 (proc, parser->self_scm (), $1);
}
| score_block {
- Score *score = $1;
-
- SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-score-handler");
- scm_call_2 (proc, PARSER->self_scm (), score->self_scm ());
- score->unprotect ();
+ SCM proc = parser->lexer_->lookup_identifier ("toplevel-score-handler");
+ scm_call_2 (proc, parser->self_scm (), $1);
}
| composite_music {
- Music *music = unsmob_music ($1);
- SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-music-handler");
- scm_call_2 (proc, PARSER->self_scm (), music->self_scm ());
+ SCM proc = parser->lexer_->lookup_identifier ("toplevel-music-handler");
+ scm_call_2 (proc, parser->self_scm (), $1);
}
| full_markup {
- SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-text-handler");
- scm_call_2 (proc, PARSER->self_scm (), scm_list_1 ($1));
+ SCM proc = parser->lexer_->lookup_identifier ("toplevel-text-handler");
+ scm_call_2 (proc, parser->self_scm (), scm_list_1 ($1));
}
| full_markup_list {
- SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-text-handler");
- scm_call_2 (proc, PARSER->self_scm (), $1);
+ SCM proc = parser->lexer_->lookup_identifier ("toplevel-text-handler");
+ scm_call_2 (proc, parser->self_scm (), $1);
}
| output_def {
SCM id = SCM_EOL;
- Output_def * od = $1;
+ Output_def * od = unsmob_output_def ($1);
- if ($1->c_variable ("is-paper") == SCM_BOOL_T)
+ if (od->c_variable ("is-paper") == SCM_BOOL_T)
id = ly_symbol2scm ("$defaultpaper");
- else if ($1->c_variable ("is-midi") == SCM_BOOL_T)
+ else if (od->c_variable ("is-midi") == SCM_BOOL_T)
id = ly_symbol2scm ("$defaultmidi");
- else if ($1->c_variable ("is-layout") == SCM_BOOL_T)
+ else if (od->c_variable ("is-layout") == SCM_BOOL_T)
id = ly_symbol2scm ("$defaultlayout");
- PARSER->lexer_->set_identifier (id, od->self_scm ());
- od->unprotect();
+ parser->lexer_->set_identifier (id, $1);
}
;
embedded_scm_bare:
SCM_TOKEN
{
- $$ = PARSER->lexer_->eval_scm ($1);
+ $$ = parser->lexer_->eval_scm_token ($1);
}
| SCM_IDENTIFIER
;
| 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 */
$$ = MAKE_SYNTAX ("void-music", @$);
}
| identifier_init
- | music music music_list {
- $$ = MAKE_SYNTAX ("sequential-music", @$,
- scm_cons2 ($1, $2, scm_reverse_x ($3, SCM_EOL)));
+ | music_embedded music_embedded music_list {
+ $3 = scm_reverse_x ($3, SCM_EOL);
+ if (unsmob_music ($2))
+ $3 = scm_cons ($2, $3);
+ if (unsmob_music ($1))
+ $3 = scm_cons ($1, $3);
+ $$ = MAKE_SYNTAX ("sequential-music", @$, $3);
}
| error {
- PARSER->error_level_ = 1;
+ parser->error_level_ = 1;
+ $$ = SCM_UNSPECIFIED;
}
| INVALID embedded_lilypond {
- PARSER->error_level_ = 1;
+ parser->error_level_ = 1;
+ $$ = $2;
}
;
lilypond_header_body:
- {
- $$ = get_header (PARSER);
- PARSER->lexer_->add_scope ($$);
- }
+ /* empty */ { $$ = SCM_UNSPECIFIED; }
| lilypond_header_body assignment {
}
lilypond_header:
HEADER '{' lilypond_header_body '}' {
- $$ = PARSER->lexer_->remove_scope ();
+ $$ = parser->lexer_->remove_scope ();
}
;
assignment:
assignment_id '=' identifier_init {
- PARSER->lexer_->set_identifier ($1, $3);
+ parser->lexer_->set_identifier ($1, $3);
+ $$ = SCM_UNSPECIFIED;
}
| assignment_id property_path '=' identifier_init {
SCM path = scm_cons (scm_string_to_symbol ($1), $2);
- PARSER->lexer_->set_identifier (path, $4);
- ;
-/*
- TODO: devise standard for protection in parser.
-
- The parser stack lives on the C-stack, which means that
-all objects can be unprotected as soon as they're here.
-
-*/
+ parser->lexer_->set_identifier (path, $4);
+ $$ = SCM_UNSPECIFIED;
}
- | embedded_scm { }
+ | embedded_scm { $$ = SCM_UNSPECIFIED; }
;
identifier_init:
- score_block {
- $$ = $1->self_scm ();
- $1->unprotect ();
- }
- | book_block {
- $$ = $1->self_scm ();
- $1->unprotect ();
- }
- | bookpart_block {
- $$ = $1->self_scm ();
- $1->unprotect ();
- }
- | output_def {
- $$ = $1->self_scm ();
- $1->unprotect ();
- }
- | context_def_spec_block {
- $$ = $1;
- }
- | music {
- /* Hack: Create event-chord around standalone events.
- Prevents the identifier from being interpreted as a post-event. */
- Music *mus = unsmob_music ($1);
- bool is_event = mus &&
- (scm_memq (ly_symbol2scm ("event"), mus->get_property ("types"))
- != SCM_BOOL_F);
- if (!is_event)
- $$ = $1;
- else
- $$ = MAKE_SYNTAX ("event-chord", @$, scm_list_1 ($1));
- }
- | post_event_nofinger {
- $$ = $1;
- }
- | number_expression {
- $$ = $1;
- }
- | string {
- $$ = $1;
- }
- | embedded_scm {
- $$ = $1;
- }
- | full_markup {
- $$ = $1;
- }
- | full_markup_list {
- $$ = $1;
- }
- | context_modification {
- $$ = $1;
- }
+ score_block
+ | book_block
+ | bookpart_block
+ | output_def
+ | context_def_spec_block
+ | music_assign
+ | post_event_nofinger
+ | number_expression
+ | FRACTION
+ | string
+ | embedded_scm
+ | full_markup
+ | full_markup_list
+ | context_modification
;
context_def_spec_block:
}
;
+context_mod_arg:
+ embedded_scm
+ | composite_music
+ ;
+
+context_mod_embedded:
+ context_mod_arg
+ {
+ if (unsmob_music ($1)) {
+ SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler");
+ $1 = scm_call_2 (proc, parser->self_scm (), $1);
+ }
+ if (unsmob_context_mod ($1))
+ $$ = $1;
+ else {
+ parser->parser_error (@1, _ ("not a context mod"));
+ }
+ }
+ ;
+
+
context_def_spec_body:
/**/ {
$$ = Context_def::make_scm ();
$$ = $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);
-
- /* 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)));
- }
- }
| context_def_spec_body context_mod {
unsmob_context_def ($$)->add_context_mod ($2);
}
td->add_context_mod (scm_car (m));
}
}
+ | context_def_spec_body context_mod_embedded {
+ Context_def *td = unsmob_context_def ($$);
+ SCM new_mods = unsmob_context_mod ($2)->get_mods ();
+ for (SCM m = new_mods; scm_is_pair (m); m = scm_cdr (m)) {
+ td->add_context_mod (scm_car (m));
+ }
+ }
;
book_block:
BOOK '{' book_body '}' {
$$ = $3;
- pop_paper (PARSER);
- PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-book"), SCM_BOOL_F);
+ pop_paper (parser);
+ parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), SCM_BOOL_F);
}
;
* grok \layout and \midi? */
book_body:
{
- $$ = new Book;
- init_papers (PARSER);
- $$->origin ()->set_spot (@$);
- $$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (PARSER->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
- $$->paper_->unprotect ();
- push_paper (PARSER, $$->paper_);
- $$->header_ = PARSER->lexer_->lookup_identifier ("$defaultheader");
- PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $$->self_scm ());
- PARSER->lexer_->set_identifier (ly_symbol2scm ("book-output-suffix"), SCM_BOOL_F);
- PARSER->lexer_->set_identifier (ly_symbol2scm ("book-filename"), SCM_BOOL_F);
+ Book *book = new Book;
+ init_papers (parser);
+ book->origin ()->set_spot (@$);
+ book->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (parser->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
+ book->paper_->unprotect ();
+ push_paper (parser, book->paper_);
+ book->header_ = get_header (parser);
+ $$ = book->unprotect ();
+ parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $$);
}
| BOOK_IDENTIFIER {
- $$ = unsmob_book ($1);
- $$->protect ();
- $$->origin ()->set_spot (@$);
- PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $1);
+ unsmob_book ($1)->origin ()->set_spot (@$);
+ parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $1);
}
| book_body paper_block {
- $$->paper_ = $2;
- $2->unprotect ();
- set_paper (PARSER, $2);
+ unsmob_book ($1)->paper_ = unsmob_output_def ($2);
+ set_paper (parser, unsmob_output_def ($2));
}
| book_body bookpart_block {
- Book *bookpart = $2;
- SCM proc = PARSER->lexer_->lookup_identifier ("book-bookpart-handler");
- scm_call_2 (proc, $$->self_scm (), bookpart->self_scm ());
- bookpart->unprotect ();
+ SCM proc = parser->lexer_->lookup_identifier ("book-bookpart-handler");
+ scm_call_2 (proc, $1, $2);
}
| book_body score_block {
- Score *score = $2;
- SCM proc = PARSER->lexer_->lookup_identifier ("book-score-handler");
- scm_call_2 (proc, $$->self_scm (), score->self_scm ());
- score->unprotect ();
+ SCM proc = parser->lexer_->lookup_identifier ("book-score-handler");
+ scm_call_2 (proc, $1, $2);
}
| book_body composite_music {
- Music *music = unsmob_music ($2);
- SCM proc = PARSER->lexer_->lookup_identifier ("book-music-handler");
- scm_call_3 (proc, PARSER->self_scm (), $$->self_scm (), music->self_scm ());
+ SCM proc = parser->lexer_->lookup_identifier ("book-music-handler");
+ scm_call_3 (proc, parser->self_scm (), $1, $2);
}
| book_body full_markup {
- SCM proc = PARSER->lexer_->lookup_identifier ("book-text-handler");
- scm_call_2 (proc, $$->self_scm (), scm_list_1 ($2));
+ SCM proc = parser->lexer_->lookup_identifier ("book-text-handler");
+ scm_call_2 (proc, $1, scm_list_1 ($2));
}
| book_body full_markup_list {
- SCM proc = PARSER->lexer_->lookup_identifier ("book-text-handler");
- scm_call_2 (proc, $$->self_scm (), $2);
- }
- | book_body lilypond_header {
- $$->header_ = $2;
+ SCM proc = parser->lexer_->lookup_identifier ("book-text-handler");
+ scm_call_2 (proc, $1, $2);
}
+ | book_body
+ {
+ parser->lexer_->add_scope (unsmob_book ($1)->header_);
+ } lilypond_header
| book_body embedded_scm { }
| book_body error {
- $$->paper_ = 0;
- $$->scores_ = SCM_EOL;
- $$->bookparts_ = SCM_EOL;
+ Book *book = unsmob_book ($1);
+ book->paper_ = 0;
+ book->scores_ = SCM_EOL;
+ book->bookparts_ = SCM_EOL;
}
;
bookpart_block:
BOOKPART '{' bookpart_body '}' {
$$ = $3;
- PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), SCM_BOOL_F);
+ parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), SCM_BOOL_F);
}
;
bookpart_body:
{
- $$ = new Book;
- $$->origin ()->set_spot (@$);
- PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $$->self_scm ());
+ Book *book = new Book;
+ book->origin ()->set_spot (@$);
+ $$ = book->unprotect ();
+ parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $$);
}
| BOOK_IDENTIFIER {
- $$ = unsmob_book ($1);
- $$->protect ();
- $$->origin ()->set_spot (@$);
- PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $1);
+ unsmob_book ($1)->origin ()->set_spot (@$);
+ parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $1);
}
| bookpart_body paper_block {
- $$->paper_ = $2;
- $2->unprotect ();
+ unsmob_book ($$)->paper_ = unsmob_output_def ($2);
}
| bookpart_body score_block {
- Score *score = $2;
- SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-score-handler");
- scm_call_2 (proc, $$->self_scm (), score->self_scm ());
- score->unprotect ();
+ SCM proc = parser->lexer_->lookup_identifier ("bookpart-score-handler");
+ scm_call_2 (proc, $1, $2);
}
| bookpart_body composite_music {
- Music *music = unsmob_music ($2);
- SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-music-handler");
- scm_call_3 (proc, PARSER->self_scm (), $$->self_scm (), music->self_scm ());
+ SCM proc = parser->lexer_->lookup_identifier ("bookpart-music-handler");
+ scm_call_3 (proc, parser->self_scm (), $1, $2);
}
| bookpart_body full_markup {
- SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-text-handler");
- scm_call_2 (proc, $$->self_scm (), scm_list_1 ($2));
+ SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler");
+ scm_call_2 (proc, $1, scm_list_1 ($2));
}
| bookpart_body full_markup_list {
- SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-text-handler");
- scm_call_2 (proc, $$->self_scm (), $2);
- }
- | bookpart_body lilypond_header {
- $$->header_ = $2;
+ SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler");
+ scm_call_2 (proc, $1, $2);
}
+ | bookpart_body
+ {
+ Book *book = unsmob_book ($1);
+ if (!ly_is_module (book->header_))
+ book->header_ = ly_make_module (false);
+ parser->lexer_->add_scope (book->header_);
+ } lilypond_header
| bookpart_body embedded_scm { }
| bookpart_body error {
- $$->paper_ = 0;
- $$->scores_ = SCM_EOL;
+ Book *book = unsmob_book ($1);
+ book->paper_ = 0;
+ book->scores_ = SCM_EOL;
}
;
score_body:
music {
- SCM m = $1;
SCM scorify = ly_lily_module_constant ("scorify-music");
- SCM score = scm_call_2 (scorify, m, PARSER->self_scm ());
+ $$ = scm_call_2 (scorify, $1, parser->self_scm ());
- // pass ownernship to C++ again.
- $$ = unsmob_score (score);
- $$->protect ();
- $$->origin ()->set_spot (@$);
+ unsmob_score ($$)->origin ()->set_spot (@$);
}
| SCORE_IDENTIFIER {
- $$ = unsmob_score ($1);
- $$->protect ();
- $$->origin ()->set_spot (@$);
- }
- | score_body lilypond_header {
- $$->set_header ($2);
+ unsmob_score ($$)->origin ()->set_spot (@$);
}
+ | score_body
+ {
+ Score *score = unsmob_score ($1);
+ if (!ly_is_module (score->get_header ()))
+ score->set_header (ly_make_module (false));
+ parser->lexer_->add_scope (score->get_header ());
+ } lilypond_header
| score_body output_def {
- if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T)
+ Output_def *od = unsmob_output_def ($2);
+ if (od->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T)
{
- PARSER->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead"));
+ parser->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead"));
}
else
{
- $$->add_output_def ($2);
+ unsmob_score ($1)->add_output_def (od);
}
- $2->unprotect ();
}
| score_body error {
- $$->error_found_ = true;
+ unsmob_score ($$)->error_found_ = true;
}
;
paper_block:
output_def {
- $$ = $1;
- if ($$->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T)
+ Output_def *od = unsmob_output_def ($1);
+
+ if (od->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T)
{
- PARSER->parser_error (@1, _ ("need \\paper for paper block"));
- $1->unprotect ();
- $$ = get_paper (PARSER);
+ parser->parser_error (@1, _ ("need \\paper for paper block"));
+ $$ = get_paper (parser)->unprotect ();
}
}
;
output_def_body '}' {
$$ = $1;
- PARSER->lexer_->remove_scope ();
- PARSER->lexer_->pop_state ();
+ parser->lexer_->remove_scope ();
+ parser->lexer_->pop_state ();
}
;
output_def_head:
PAPER {
- $$ = get_paper (PARSER);
- $$->input_origin_ = @$;
- PARSER->lexer_->add_scope ($$->scope_);
+ Output_def *p = get_paper (parser);
+ p->input_origin_ = @$;
+ parser->lexer_->add_scope (p->scope_);
+ $$ = p->unprotect ();
}
| MIDI {
- Output_def *p = get_midi (PARSER);
- $$ = p;
- PARSER->lexer_->add_scope (p->scope_);
+ Output_def *p = get_midi (parser);
+ $$ = p->unprotect ();
+ parser->lexer_->add_scope (p->scope_);
}
| LAYOUT {
- Output_def *p = get_layout (PARSER);
+ Output_def *p = get_layout (parser);
- PARSER->lexer_->add_scope (p->scope_);
- $$ = p;
+ parser->lexer_->add_scope (p->scope_);
+ $$ = p->unprotect ();
}
;
output_def_head_with_mode_switch:
output_def_head {
- PARSER->lexer_->push_initial_state ();
+ parser->lexer_->push_initial_state ();
$$ = $1;
}
;
+// We need this weird nonterminal because both music as well as a
+// context definition can start with \context and the difference is
+// only apparent after looking at the next token. If it is '{', there
+// is still time to escape from notes mode.
+
+music_or_context_def:
+ music_arg
+ {
+ parser->lexer_->pop_state ();
+ }
+ | CONTEXT
+ {
+ parser->lexer_->pop_state ();
+ } '{' context_def_spec_body '}'
+ {
+ $$ = $4;
+ }
+ ;
+
output_def_body:
output_def_head_with_mode_switch '{' {
$$ = $1;
- $$->input_origin_.set_spot (@$);
+ unsmob_output_def ($$)->input_origin_.set_spot (@$);
}
| output_def_head_with_mode_switch '{' OUTPUT_DEF_IDENTIFIER {
- $1->unprotect ();
-
Output_def *o = unsmob_output_def ($3);
o->input_origin_.set_spot (@$);
- $$ = o;
- $$->protect ();
- PARSER->lexer_->remove_scope ();
- PARSER->lexer_->add_scope (o->scope_);
+ $$ = o->self_scm ();
+ parser->lexer_->remove_scope ();
+ parser->lexer_->add_scope (o->scope_);
}
| output_def_body assignment {
}
- | output_def_body context_def_spec_block {
- assign_context_def ($$, $2);
+ | output_def_body
+ {
+ SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
+ parser->lexer_->push_note_state (nn);
+ } music_or_context_def
+ {
+ if (unsmob_context_def ($3))
+ assign_context_def (unsmob_output_def ($1), $3);
+ else {
+
+ SCM proc = parser->lexer_->lookup_identifier
+ ("output-def-music-handler");
+ scm_call_3 (proc, parser->self_scm (),
+ $1, $3);
+ }
}
| output_def_body error {
/* empty */ {
$$ = SCM_EOL;
}
- | music_list music {
- $$ = scm_cons ($2, $1);
- }
- | music_list embedded_scm {
-
+ | music_list music_embedded {
+ if (unsmob_music ($2))
+ $$ = scm_cons ($2, $1);
}
| music_list error {
Music *m = MY_MAKE_MUSIC("Music", @$);
}
;
-music: simple_music
+music: music_arg
| lyric_element_music
- | composite_music %prec COMPOSITE
+ ;
+
+music_embedded:
+ music
+ | embedded_scm
+ {
+ if (unsmob_music ($1)
+ || scm_is_eq ($1, SCM_UNSPECIFIED))
+ $$ = $1;
+ else
+ {
+ @$.warning (_ ("Ignoring non-music expression"));
+ $$ = SCM_UNSPECIFIED;
+ }
+ }
;
music_arg:
simple_music
+ {
+ if (unsmob_pitch ($1)) {
+ Music *n = MY_MAKE_MUSIC ("NoteEvent", @1);
+ n->set_property ("pitch", $1);
+ n->set_property ("duration",
+ parser->default_duration_.smobbed_copy ());
+ $$ = n->unprotect ();
+ }
+ }
| composite_music %prec COMPOSITE
;
+music_assign:
+ simple_music
+ | composite_music %prec COMPOSITE
+ | lyric_element_music
+ ;
+
repeated_music:
REPEAT simple_string unsigned_number music
{
;
context_modification:
- WITH { PARSER->lexer_->push_initial_state (); } '{' context_mod_list '}'
+ WITH { parser->lexer_->push_initial_state (); } '{' context_mod_list '}'
{
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
$$ = $4;
}
| WITH CONTEXT_MOD_IDENTIFIER
{
$$ = $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 context_mod_embedded {
+ unsmob_context_mod ($1)->add_context_mods
+ (unsmob_context_mod ($2)->get_mods ());
+ }
;
composite_music:
{
$$ = FINISH_MAKE_SYNTAX ($1, @$, $2);
}
+ | music_function_call_closed
;
music_bare:
{
$$ = scm_cons ($1, $3);
} %prec FUNCTION_ARGLIST
- | EXPECT_SCM EXPECT_DURATION function_arglist_skip
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip
{
$$ = scm_cons ($1, $3);
} %prec FUNCTION_ARGLIST
;
-function_arglist_nonbackup:
+function_arglist_nonbackup_common:
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
+ | 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 bare_number
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed post_event_nofinger
{
- $$ = check_scheme_arg (PARSER, @4, $1, $4, $3, $2);
+ $$ = 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 fraction
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed '-' REAL
{
- $$ = check_scheme_arg (PARSER, @4, $1, $4, $3, $2);
+ $$ = check_scheme_arg (parser, @4,
+ scm_difference ($5, SCM_UNDEFINED),
+ $3, $2);
}
- | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed post_event
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed '-' NUMBER_IDENTIFIER
{
- $$ = check_scheme_arg (PARSER, @4, $1, $4, $3, $2);
+ $$ = check_scheme_arg (parser, @4,
+ scm_difference ($5, SCM_UNDEFINED),
+ $3, $2);
}
;
+function_arglist_closed_nonbackup:
+ function_arglist_nonbackup_common
+ | 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);
+ }
+ ;
+
+function_arglist_nonbackup:
+ function_arglist_nonbackup_common
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg
+ {
+ $$ = check_scheme_arg (parser, @4, $4, $3, $2);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number
+ {
+ $$ = check_scheme_arg (parser, @4, $4, $3, $2);
+ }
+ ;
function_arglist_keep:
function_arglist_common
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
if (scm_is_true (scm_call_1 ($2, $4)))
{
$$ = $3;
- MYREPARSE (@4, $1, $2, UNSIGNED, $4);
+ 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)))
{
$$ = $3;
- MYREPARSE (@4, $1, $2, REAL, $4);
+ 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);
}
| function_arglist_backup REPARSE embedded_scm_arg_closed
{
- $$ = check_scheme_arg (PARSER, @3, scm_car ($2),
- $3, $1, scm_cdr ($2));
+ $$ = check_scheme_arg (parser, @3,
+ $3, $1, $2);
}
| function_arglist_backup REPARSE bare_number
{
- $$ = check_scheme_arg (PARSER, @3, scm_car ($2),
- $3, $1, scm_cdr ($2));
- }
- | function_arglist_backup REPARSE fraction
- {
- $$ = check_scheme_arg (PARSER, @3, scm_car ($2),
- $3, $1, scm_cdr ($2));
+ $$ = check_scheme_arg (parser, @3,
+ $3, $1, $2);
}
;
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
+ | 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
+ | EXPECT_SCM function_arglist_closed_optional post_event_nofinger
{
- $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
+ $$ = check_scheme_arg (parser, @3,
$3, $2, $1);
}
+ | function_arglist_common_minus
| function_arglist_common_lyric
;
// 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 ());
+ 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, SCM_UNDEFINED, $1, LYRIC_ELEMENT_P, $3);
+ 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, SCM_UNDEFINED, $1, LYRIC_ELEMENT, $3);
+ 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, SCM_UNDEFINED,
+ 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, SCM_UNDEFINED,
+ $$ = 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_nonbackup
;
function_arglist_closed_common:
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 post_event
+ | 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, SCM_UNDEFINED,
+ $$ = check_scheme_arg (parser, @3,
$3, $2, $1);
}
| EXPECT_SCM function_arglist_optional lyric_element
{
- $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
+ $$ = check_scheme_arg (parser, @3,
$3, $2, $1);
}
;
{
$$ = $2;
}
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
}
| mode_changing_head_with_context optional_context_mod grouped_music_list {
Context_mod *ctxmod = unsmob_context_mod ($2);
{
$$ = MAKE_SYNTAX ("unrelativable-music", @$, $$);
}
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
}
;
mode_changing_head:
NOTEMODE {
- SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames");
- PARSER->lexer_->push_note_state (alist_to_hashq (nn));
+ SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
+ parser->lexer_->push_note_state (nn);
$$ = ly_symbol2scm ("notes");
}
| DRUMMODE
{
- SCM nn = PARSER->lexer_->lookup_identifier ("drumPitchNames");
- PARSER->lexer_->push_note_state (alist_to_hashq (nn));
+ SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames");
+ parser->lexer_->push_note_state (nn);
$$ = ly_symbol2scm ("drums");
}
| FIGUREMODE {
- PARSER->lexer_->push_figuredbass_state ();
+ parser->lexer_->push_figuredbass_state ();
$$ = ly_symbol2scm ("figures");
}
| CHORDMODE {
- SCM nn = PARSER->lexer_->lookup_identifier ("chordmodifiers");
- PARSER->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
- nn = PARSER->lexer_->lookup_identifier ("pitchnames");
- PARSER->lexer_->push_chord_state (alist_to_hashq (nn));
+ SCM nn = parser->lexer_->lookup_identifier ("chordmodifiers");
+ parser->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
+ nn = parser->lexer_->lookup_identifier ("pitchnames");
+ parser->lexer_->push_chord_state (nn);
$$ = ly_symbol2scm ("chords");
}
| LYRICMODE
- { PARSER->lexer_->push_lyric_state ();
+ { parser->lexer_->push_lyric_state ();
$$ = ly_symbol2scm ("lyrics");
}
;
mode_changing_head_with_context:
DRUMS {
- SCM nn = PARSER->lexer_->lookup_identifier ("drumPitchNames");
- PARSER->lexer_->push_note_state (alist_to_hashq (nn));
+ SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames");
+ parser->lexer_->push_note_state (nn);
$$ = ly_symbol2scm ("DrumStaff");
}
| FIGURES {
- PARSER->lexer_->push_figuredbass_state ();
+ parser->lexer_->push_figuredbass_state ();
$$ = ly_symbol2scm ("FiguredBass");
}
| CHORDS {
- SCM nn = PARSER->lexer_->lookup_identifier ("chordmodifiers");
- PARSER->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
- nn = PARSER->lexer_->lookup_identifier ("pitchnames");
- PARSER->lexer_->push_chord_state (alist_to_hashq (nn));
+ SCM nn = parser->lexer_->lookup_identifier ("chordmodifiers");
+ parser->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
+ nn = parser->lexer_->lookup_identifier ("pitchnames");
+ parser->lexer_->push_chord_state (nn);
$$ = ly_symbol2scm ("ChordNames");
}
| LYRICS
- { PARSER->lexer_->push_lyric_state ();
+ { parser->lexer_->push_lyric_state ();
$$ = ly_symbol2scm ("Lyrics");
}
;
new_lyrics:
- ADDLYRICS { PARSER->lexer_->push_lyric_state (); }
+ ADDLYRICS { parser->lexer_->push_lyric_state (); }
/*cont */
composite_music {
/* Can also use music at the expensive of two S/Rs similar to
\repeat \alternative */
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
$$ = scm_cons ($3, SCM_EOL);
}
| new_lyrics ADDLYRICS {
- PARSER->lexer_->push_lyric_state ();
+ parser->lexer_->push_lyric_state ();
} composite_music {
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
$$ = scm_cons ($4, $1);
}
;
$$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL));
} %prec COMPOSITE
| LYRICSTO simple_string {
- PARSER->lexer_->push_lyric_state ();
+ parser->lexer_->push_lyric_state ();
} music {
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
$$ = MAKE_SYNTAX ("lyric-combine", @$, $2, $4);
}
;
| context_def_mod STRING {
$$ = scm_list_2 ($1, $2);
}
- | context_def_mod embedded_scm {
- if (ly_symbol2scm ("consists") != $1)
- {
- $$ = SCM_EOL;
- PARSER->parser_error (@1, _ ("only \\consists takes non-string argument."));
- }
- else
- {
- $$ = scm_list_2 ($1, $2);
- }
+ | context_def_mod embedded_scm
+ {
+ if (!scm_is_string ($2)
+ && ly_symbol2scm ("consists") != $1
+ && ly_symbol2scm ("remove") != $1)
+ {
+ $$ = SCM_EOL;
+ parser->parser_error (@1, _ ("only \\consists and \\remove take non-string argument."));
+ }
+ else
+ {
+ $$ = scm_list_2 ($1, $2);
+ }
}
;
music_property_def:
simple_music_property_def {
- $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons2 (PARSER->self_scm (), make_input (@$), $1));
+ $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons2 (parser->self_scm (), make_input (@$), $1));
}
;
scalar:
embedded_scm_arg
| bare_number
+ | FRACTION
| lyric_element
;
scalar_closed:
embedded_scm_arg_closed
| bare_number
+ | FRACTION
| lyric_element
;
event_chord:
- /* TODO: Create a special case that avoids the creation of
- EventChords around simple_elements that have no post_events?
- */
- simple_chord_elements post_events {
+ simple_element post_events {
+ // Let the rhythmic music iterator sort this mess out.
+ if (scm_is_pair ($2)) {
+ if (unsmob_pitch ($1)) {
+ Music *n = MY_MAKE_MUSIC ("NoteEvent", @1);
+ n->set_property ("pitch", $1);
+ n->set_property ("duration",
+ parser->default_duration_.smobbed_copy ());
+ $$ = n->unprotect ();
+ }
+ unsmob_music ($$)->set_property ("articulations",
+ scm_reverse_x ($2, SCM_EOL));
+ }
+ }
+ | simple_chord_elements post_events {
SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL));
Input i;
Input i;
i.set_location (@1, @3);
$$ = MAKE_SYNTAX ("repetition-chord", i,
- PARSER->lexer_->chord_repetition_.last_chord_,
- PARSER->lexer_->chord_repetition_.repetition_function_,
$2, scm_reverse_x ($3, SCM_EOL));
}
| MULTI_MEASURE_REST optional_notemode_duration post_events {
scm_reverse_x ($3, SCM_EOL));
}
| command_element
- /* note chord elements are memorized into
- PARSER->lexer_->chord_repetition_ so that the chord repetition
- mechanism copy them when a chord repetition symbol is found
- */
- | note_chord_element {
- PARSER->lexer_->chord_repetition_.last_chord_ = $$;
- }
+ | note_chord_element
;
chord_body_elements:
/* empty */ { $$ = SCM_EOL; }
| chord_body_elements chord_body_element {
- $$ = scm_cons ($2, $1);
+ if (!SCM_UNBNDP ($2))
+ $$ = scm_cons ($2, $1);
}
;
chord_body_element:
pitch exclamations questions octave_check post_events
{
- int q = $3;
- int ex = $2;
+ bool q = to_boolean ($3);
+ bool ex = to_boolean ($2);
SCM check = $4;
SCM post = $5;
Music *n = MY_MAKE_MUSIC ("NoteEvent", @$);
n->set_property ("pitch", $1);
- if (q % 2)
+ if (q)
n->set_property ("cautionary", SCM_BOOL_T);
- if (ex % 2 || q % 2)
+ if (ex || q)
n->set_property ("force-accidental", SCM_BOOL_T);
if (scm_is_pair (post)) {
$$ = n->unprotect ();
}
| 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, SCM_UNDEFINED,
- $3, $2, $1);
- }
- ;
+ Music *m = unsmob_music ($1);
-embedded_scm_chord_body:
- embedded_scm_bare_arg
- | SCM_FUNCTION music_function_chord_body_arglist {
- $$ = MAKE_SYNTAX ("music-function", @$,
- $1, $2);
+ while (m && m->is_mus_type ("music-wrapper-music")) {
+ $$ = m->get_property ("element");
+ m = unsmob_music ($$);
+ }
+
+ if (!(m && m->is_mus_type ("rhythmic-event"))) {
+ parser->parser_error (@$, _ ("not a rhythmic event"));
+ $$ = SCM_UNDEFINED;
+ }
}
- | bare_number
- | fraction
- | lyric_element
- | chord_body_element
;
music_function_chord_body:
- MUSIC_FUNCTION music_function_chord_body_arglist {
- $$ = MAKE_SYNTAX ("music-function", @$,
- $1, $2);
- }
+ music_function_call
+ | MUSIC_IDENTIFIER
;
// Event functions may only take closed arglists, otherwise it would
// 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_call_closed:
MUSIC_FUNCTION function_arglist_closed {
$$ = MAKE_SYNTAX ("music-function", @$,
$1, $2);
$$ = MAKE_SYNTAX ("voice-separator", @$);
}
| '|' {
- SCM pipe = PARSER->lexer_->lookup_identifier ("pipeSymbol");
+ SCM pipe = parser->lexer_->lookup_identifier ("pipeSymbol");
Music *m = unsmob_music (pipe);
if (m)
direction_less_event {
$$ = $1;
}
- | script_dir music_function_event {
+ | script_dir music_function_call_closed {
$$ = $2;
- if ($1)
+ if (!SCM_UNBNDP ($1))
{
- unsmob_music ($$)->set_property ("direction", scm_from_int ($1));
+ unsmob_music ($$)->set_property ("direction", $1);
}
}
| HYPHEN {
- if (!PARSER->lexer_->is_lyric_state ())
- PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
+ if (!parser->lexer_->is_lyric_state ())
+ parser->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
$$ = MY_MAKE_MUSIC ("HyphenEvent", @$)->unprotect ();
}
| EXTENDER {
- if (!PARSER->lexer_->is_lyric_state ())
- PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
+ if (!parser->lexer_->is_lyric_state ())
+ parser->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
$$ = MY_MAKE_MUSIC ("ExtenderEvent", @$)->unprotect ();
}
| script_dir direction_reqd_event {
- if ($1)
+ if (!SCM_UNBNDP ($1))
{
Music *m = unsmob_music ($2);
- m->set_property ("direction", scm_from_int ($1));
+ m->set_property ("direction", $1);
}
$$ = $2;
}
| script_dir direction_less_event {
- if ($1)
+ if (!SCM_UNBNDP ($1))
{
Music *m = unsmob_music ($2);
- m->set_property ("direction", scm_from_int ($1));
+ m->set_property ("direction", $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;
}
;
string_number_event:
E_UNSIGNED {
Music *s = MY_MAKE_MUSIC ("StringNumberEvent", @$);
- s->set_property ("string-number", scm_from_int ($1));
+ s->set_property ("string-number", $1);
$$ = s->unprotect ();
}
;
direction_less_event:
direction_less_char {
- SCM predefd = PARSER->lexer_->lookup_identifier_symbol ($1);
+ SCM predefd = parser->lexer_->lookup_identifier_symbol ($1);
Music *m = 0;
if (unsmob_music (predefd))
{
}
$$ = m->unprotect ();
}
+ | string_number_event
| EVENT_IDENTIFIER {
$$ = $1;
}
| tremolo_type {
Music *a = MY_MAKE_MUSIC ("TremoloEvent", @$);
- a->set_property ("tremolo-type", scm_from_int ($1));
+ a->set_property ("tremolo-type", $1);
$$ = a->unprotect ();
}
| event_function_event
$$ = $1;
}
| script_abbreviation {
- SCM s = PARSER->lexer_->lookup_identifier ("dash" + ly_scm2string ($1));
+ SCM s = parser->lexer_->lookup_identifier ("dash" + ly_scm2string ($1));
Music *a = MY_MAKE_MUSIC ("ArticulationEvent", @$);
if (scm_is_string (s))
a->set_property ("articulation-type", s);
- else PARSER->parser_error (@1, _ ("expecting string as script definition"));
+ else parser->parser_error (@1, _ ("expecting string as script definition"));
$$ = a->unprotect ();
}
;
octave_check:
/**/ { $$ = SCM_EOL; }
- | '=' { $$ = scm_from_int (0); }
- | '=' sub_quotes { $$ = scm_from_int (-$2); }
- | '=' sup_quotes { $$ = scm_from_int ($2); }
+ | '=' quotes { $$ = $2; }
;
+quotes:
+ /* empty */
+ {
+ $$ = SCM_INUM0;
+ }
+ | sub_quotes
+ | sup_quotes
+ ;
+
sup_quotes:
'\'' {
- $$ = 1;
+ $$ = scm_from_int (1);
}
| sup_quotes '\'' {
- $$ ++;
+ $$ = scm_oneplus ($1);
}
;
sub_quotes:
',' {
- $$ = 1;
+ $$ = scm_from_int (-1);
}
| sub_quotes ',' {
- $$++;
+ $$ = scm_oneminus ($1);
}
;
steno_pitch:
- NOTENAME_PITCH {
- $$ = $1;
- }
- | NOTENAME_PITCH sup_quotes {
- Pitch p = *unsmob_pitch ($1);
- p = p.transposed (Pitch ($2,0,0));
- $$ = p.smobbed_copy ();
- }
- | NOTENAME_PITCH sub_quotes {
- Pitch p =* unsmob_pitch ($1);
- p = p.transposed (Pitch (-$2,0,0));
- $$ = p.smobbed_copy ();
+ NOTENAME_PITCH quotes {
+ if (!scm_is_eq (SCM_INUM0, $2))
+ {
+ Pitch p = *unsmob_pitch ($1);
+ p = p.transposed (Pitch (scm_to_int ($2),0,0));
+ $$ = p.smobbed_copy ();
+ }
}
;
*/
steno_tonic_pitch:
- TONICNAME_PITCH {
- $$ = $1;
- }
- | TONICNAME_PITCH sup_quotes {
- Pitch p = *unsmob_pitch ($1);
- p = p.transposed (Pitch ($2,0,0));
- $$ = p.smobbed_copy ();
- }
- | TONICNAME_PITCH sub_quotes {
- Pitch p = *unsmob_pitch ($1);
-
- p = p.transposed (Pitch (-$2,0,0));
- $$ = p.smobbed_copy ();
+ TONICNAME_PITCH quotes {
+ if (!scm_is_eq (SCM_INUM0, $2))
+ {
+ Pitch p = *unsmob_pitch ($1);
+ p = p.transposed (Pitch (scm_to_int ($2),0,0));
+ $$ = p.smobbed_copy ();
+ }
}
;
pitch:
- steno_pitch {
- $$ = $1;
- }
+ steno_pitch
| PITCH_IDENTIFIER
;
;
script_dir:
- '_' { $$ = DOWN; }
- | '^' { $$ = UP; }
- | '-' { $$ = CENTER; }
+ '_' { $$ = scm_from_int (DOWN); }
+ | '^' { $$ = scm_from_int (UP); }
+ | '-' { $$ = SCM_UNDEFINED; }
;
duration_length:
}
;
-optional_notemode_duration:
+maybe_notemode_duration:
{
- Duration dd = PARSER->default_duration_;
- $$ = dd.smobbed_copy ();
+ $$ = SCM_UNDEFINED;
}
| multiplied_duration {
$$ = $1;
- PARSER->default_duration_ = *unsmob_duration ($$);
+ parser->default_duration_ = *unsmob_duration ($$);
+ }
+;
+
+
+optional_notemode_duration:
+ maybe_notemode_duration
+ {
+ if (SCM_UNBNDP ($$))
+ $$ = parser->default_duration_.smobbed_copy ();
}
;
steno_duration:
- bare_unsigned dots {
+ UNSIGNED dots {
int len = 0;
- if (!is_duration ($1))
- PARSER->parser_error (@1, _f ("not a duration: %d", $1));
+ int n = scm_to_int ($1);
+ if (!is_duration (n))
+ parser->parser_error (@1, _f ("not a duration: %d", n));
else
- len = intlog2 ($1);
+ len = intlog2 (n);
- $$ = Duration (len, $2).smobbed_copy ();
+ $$ = Duration (len, scm_to_int ($2)).smobbed_copy ();
}
| DURATION_IDENTIFIER dots {
Duration *d = unsmob_duration ($1);
- Duration k (d->duration_log (), d->dot_count () + $2);
+ Duration k (d->duration_log (),
+ d->dot_count () + scm_to_int ($2));
k = k.compressed (d->factor ());
- *d = k;
- $$ = $1;
+ scm_remember_upto_here_1 ($1);
+ $$ = k.smobbed_copy ();
}
;
steno_duration {
$$ = $1;
}
- | multiplied_duration '*' bare_unsigned {
- $$ = unsmob_duration ($$)->compressed ( $3) .smobbed_copy ();
+ | multiplied_duration '*' UNSIGNED {
+ $$ = unsmob_duration ($$)->compressed (scm_to_int ($3)).smobbed_copy ();
}
| multiplied_duration '*' FRACTION {
Rational m (scm_to_int (scm_car ($3)), scm_to_int (scm_cdr ($3)));
}
;
-fraction:
- FRACTION { $$ = $1; }
- | UNSIGNED '/' UNSIGNED {
- $$ = scm_cons ($1, $3);
- }
- ;
-
dots:
/* empty */ {
- $$ = 0;
+ $$ = SCM_INUM0;
}
| dots '.' {
- $$ ++;
+ $$ = scm_oneplus ($1);
}
;
tremolo_type:
':' {
- $$ = 0;
+ $$ = SCM_INUM0;
}
- | ':' bare_unsigned {
- if (!is_duration ($2))
- PARSER->parser_error (@2, _f ("not a duration: %d", $2));
+ | ':' UNSIGNED {
+ int n = scm_to_int ($2);
+ if (!is_duration (n))
+ parser->parser_error (@2, _f ("not a duration: %d", n));
$$ = $2;
}
;
optional_rest:
- /**/ { $$ = 0; }
- | REST { $$ = 1; }
+ /**/ { $$ = SCM_BOOL_F; }
+ | REST { $$ = SCM_BOOL_T; }
;
simple_element:
- pitch exclamations questions octave_check optional_notemode_duration optional_rest {
- if (!PARSER->lexer_->is_note_state ())
- PARSER->parser_error (@1, _ ("have to be in Note mode for notes"));
-
- Music *n = 0;
- if ($6)
- n = MY_MAKE_MUSIC ("RestEvent", @$);
- else
- n = MY_MAKE_MUSIC ("NoteEvent", @$);
-
- n->set_property ("pitch", $1);
- n->set_property ("duration", $5);
-
- if (scm_is_number ($4))
+ pitch exclamations questions octave_check maybe_notemode_duration optional_rest {
+ if (!parser->lexer_->is_note_state ())
+ parser->parser_error (@1, _ ("have to be in Note mode for notes"));
+ if (!SCM_UNBNDP ($2)
+ || !SCM_UNBNDP ($3)
+ || scm_is_number ($4)
+ || !SCM_UNBNDP ($5)
+ || scm_is_true ($6))
{
- int q = scm_to_int ($4);
- n->set_property ("absolute-octave", scm_from_int (q-1));
+ Music *n = 0;
+ if (scm_is_true ($6))
+ n = MY_MAKE_MUSIC ("RestEvent", @$);
+ else
+ n = MY_MAKE_MUSIC ("NoteEvent", @$);
+
+ n->set_property ("pitch", $1);
+ if (SCM_UNBNDP ($5))
+ n->set_property ("duration",
+ parser->default_duration_.smobbed_copy ());
+ else
+ n->set_property ("duration", $5);
+
+ if (scm_is_number ($4))
+ {
+ int q = scm_to_int ($4);
+ n->set_property ("absolute-octave", scm_from_int (q-1));
+ }
+
+ if (to_boolean ($3))
+ n->set_property ("cautionary", SCM_BOOL_T);
+ if (to_boolean ($2) || to_boolean ($3))
+ n->set_property ("force-accidental", SCM_BOOL_T);
+
+ $$ = n->unprotect ();
}
-
- if ($3 % 2)
- n->set_property ("cautionary", SCM_BOOL_T);
- if ($2 % 2 || $3 % 2)
- n->set_property ("force-accidental", SCM_BOOL_T);
-
- $$ = n->unprotect ();
}
| DRUM_PITCH optional_notemode_duration {
Music *n = MY_MAKE_MUSIC ("NoteEvent", @$);
;
simple_chord_elements:
- simple_element {
- $$ = scm_list_1 ($1);
- }
- | new_chord {
- if (!PARSER->lexer_->is_chord_state ())
- PARSER->parser_error (@1, _ ("have to be in Chord mode for chords"));
+ new_chord {
+ if (!parser->lexer_->is_chord_state ())
+ parser->parser_error (@1, _ ("have to be in Chord mode for chords"));
$$ = $1;
}
| figure_spec optional_notemode_duration {
| LYRICS_STRING {
$$ = $1;
}
- | LYRIC_ELEMENT_P
;
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)));
+ $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
+ if (scm_is_pair ($3))
+ unsmob_music ($$)->set_property
+ ("articulations", 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)));
-
+ $$ = MAKE_SYNTAX ("lyric-event", @$, $1,
+ parser->default_duration_.smobbed_copy ());
+ unsmob_music ($$)->set_property
+ ("articulations", scm_cons ($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)));
+ $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
+ if (scm_is_pair ($3))
+ unsmob_music ($$)->set_property
+ ("articulations", 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)));
+ $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
+ if (scm_is_pair ($3))
+ unsmob_music ($$)->set_property
+ ("articulations", scm_reverse_x ($3, SCM_EOL));
}
;
new_chord:
steno_tonic_pitch optional_notemode_duration {
- $$ = make_chord_elements ($1, $2, SCM_EOL);
+ $$ = make_chord_elements (@$, $1, $2, SCM_EOL);
}
| steno_tonic_pitch optional_notemode_duration chord_separator chord_items {
SCM its = scm_reverse_x ($4, SCM_EOL);
- $$ = make_chord_elements ($1, $2, scm_cons ($3, its));
+ $$ = make_chord_elements (@$, $1, $2, scm_cons ($3, its));
}
;
;
step_number:
- bare_unsigned {
+ UNSIGNED {
$$ = make_chord_step ($1, 0);
}
- | bare_unsigned '+' {
+ | UNSIGNED '+' {
$$ = make_chord_step ($1, SHARP_ALTERATION);
}
- | bare_unsigned CHORD_MINUS {
+ | UNSIGNED CHORD_MINUS {
$$ = make_chord_step ($1, FLAT_ALTERATION);
}
;
tempo_range:
- bare_unsigned {
- $$ = scm_from_int ($1);
+ UNSIGNED {
+ $$ = $1;
}
- | bare_unsigned '~' bare_unsigned {
- $$ = scm_cons (scm_from_int ($1), scm_from_int ($3));
+ | UNSIGNED '~' UNSIGNED {
+ $$ = scm_cons ($1, $3);
}
;
bare_number:
bare_number_closed
| UNSIGNED NUMBER_IDENTIFIER {
- $$ = scm_product ($1, $2)
+ $$ = scm_product ($1, $2);
}
| REAL NUMBER_IDENTIFIER {
- $$ = scm_product ($1, $2)
+ $$ = scm_product ($1, $2);
}
;
| NUMBER_IDENTIFIER
;
-bare_unsigned:
- UNSIGNED {
- $$ = scm_to_int ($1);
- }
- ;
-
unsigned_number:
UNSIGNED
| NUMBER_IDENTIFIER
;
exclamations:
- { $$ = 0; }
- | exclamations '!' { $$ ++; }
+ { $$ = SCM_UNDEFINED; }
+ | exclamations '!'
+ {
+ if (SCM_UNBNDP ($1))
+ $$ = SCM_BOOL_T;
+ else
+ $$ = scm_not ($1);
+ }
;
questions:
- { $$ = 0; }
- | questions '?' { $$ ++; }
+ { $$ = SCM_UNDEFINED; }
+ | questions '?'
+ {
+ if (SCM_UNBNDP ($1))
+ $$ = SCM_BOOL_T;
+ else
+ $$ = scm_not ($1);
+ }
;
/*
$$ = $1;
}
| LYRIC_MARKUP
- { PARSER->lexer_->push_markup_state (); }
+ { parser->lexer_->push_markup_state (); }
markup_top {
$$ = $3;
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
}
;
$$ = $1;
}
| MARKUPLIST
- { PARSER->lexer_->push_markup_state (); }
+ { parser->lexer_->push_markup_state (); }
markup_list {
$$ = $3;
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
}
;
$$ = $1;
}
| MARKUP
- { PARSER->lexer_->push_markup_state (); }
+ { parser->lexer_->push_markup_state (); }
markup_top {
$$ = $3;
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
}
;
}
;
+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;
$$ = $1;
}
| SCORE {
- SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames");
- PARSER->lexer_->push_note_state (alist_to_hashq (nn));
+ SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
+ parser->lexer_->push_note_state (nn);
} '{' score_body '}' {
- Score * sc = $4;
- $$ = scm_list_2 (ly_lily_module_constant ("score-markup"), sc->self_scm ());
- sc->unprotect ();
- PARSER->lexer_->pop_state ();
+ $$ = scm_list_2 (ly_lily_module_constant ("score-markup"), $4);
+ parser->lexer_->pop_state ();
}
| MARKUP_FUNCTION markup_command_basic_arguments {
$$ = scm_cons ($1, scm_reverse_x ($2, SCM_EOL));
}
+ | markup_scm MARKUP_IDENTIFIER
+ {
+ $$ = $2;
+ }
;
markup:
yydebug = x;
}
-void
+SCM
Lily_parser::do_yyparse ()
{
- yyparse ((void*)this);
+ SCM retval = SCM_UNDEFINED;
+ yyparse (this, &retval);
+ return retval;
}
unsmob_music (*destination)->
set_property ("origin", make_input (last_input_));
- bool is_event = scm_memq (ly_symbol2scm ("event"), mus->get_property ("types"))
- != SCM_BOOL_F;
-
+ bool is_event = mus->is_mus_type ("post-event");
mus->unprotect ();
return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER;
} else if (unsmob_pitch (sid)) {
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)
{
SCM
-make_chord_step (int step, Rational alter)
+make_chord_step (SCM step_scm, Rational alter)
{
+ int step = scm_to_int (step_scm);
+
if (step == 7)
alter += FLAT_ALTERATION;
SCM
-make_chord_elements (SCM pitch, SCM dur, SCM modification_list)
+make_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list)
{
SCM chord_ctor = ly_lily_module_constant ("construct-chord-elements");
- 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)));
+ SCM res = scm_call_3 (chord_ctor, pitch, dur, modification_list);
+ for (SCM s = res; scm_is_pair (s); s = scm_cdr (s))
+ {
+ unsmob_music (scm_car (s))->set_spot (loc);
+ }
+ return res;
}
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