-%{ // -*-Fundamental-*-
-
/*
parser.yy -- Bison/C++ parser for LilyPond
source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
-/*
-FIXME:
-
- * The rules for who is protecting what are very shady. Uniformise
- this.
-
- * There are too many lexical modes?
-*/
-
-#include "config.hh"
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-
-#include "book.hh"
-#include "context-def.hh"
-#include "dimensions.hh"
-#include "music.hh"
-#include "file-path.hh"
-#include "input-smob.hh"
-#include "input.hh"
-#include "lily-guile.hh"
-#include "lilypond-input-version.hh"
-#include "main.hh"
-#include "misc.hh"
-#include "lily-lexer.hh"
-#include "lily-parser.hh"
-#include "paper-book.hh"
-#include "output-def.hh"
-#include "scm-hash.hh"
-#include "program-option.hh"
-#include "score.hh"
-#include "text-interface.hh"
-#include "warn.hh"
-#include "music.hh"
-
-#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x))
-
-Music *property_op_to_music (SCM op);
-Music *context_spec_music (SCM type, SCM id, Music *m, SCM ops);
-SCM get_next_unique_context_id ();
-SCM get_next_unique_lyrics_context_id ();
-
-#undef _
-#if !HAVE_GETTEXT
-#define _(x) x
-#else
-#include <libintl.h>
-#define _(x) gettext (x)
-#endif
+%{
+#define YYDEBUG 1
#define YYERROR_VERBOSE 1
-
#define YYPARSE_PARAM my_lily_parser
#define YYLEX_PARAM my_lily_parser
-#define THIS\
- ((Lily_parser *) my_lily_parser)
+#define PARSER ((Lily_parser *) my_lily_parser)
-#define yyerror THIS->parser_error
+#define yyerror PARSER->parser_error
/* We use custom location type: Input objects */
#define YYLTYPE Input
((Current).set_location ((Rhs)[1], (Rhs)[N]))
-/* Add symbols to the TAGS field of a music object. */
+%}
-void
-tag_music (Music *m, SCM tag, Input ip)
-{
- SCM tags = m->get_property ("tags");
- if (scm_is_symbol (tag))
- tags = scm_cons (tag, tags);
- else if (ly_is_list (tag))
- tags = ly_append2 (tag, tags);
- else
- ip.warning (_ ("tag must be symbol or list of symbols"));
-
- m->set_property ("tags", tags);
-}
+/* 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. */
-bool
-is_regular_identifier (SCM id)
-{
- String str = ly_scm2string (id);
- char const *s = str.to_str0 ();
+%left PREC_TOP
+%left ADDLYRICS
+%left PREC_BOT
- bool v = true;
-#if 0
- isalpha (*s);
- s++;
-#endif
- while (*s && v)
- {
- v = v && isalnum (*s);
- s++;
- }
- return v;
-}
+%expect 1
+/* One shift/reduce problem
-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;
-}
+1. \repeat
+ \repeat .. \alternative
-SCM
-make_simple_markup (SCM a)
-{
- return a;
-}
+ \repeat { \repeat .. \alternative }
-bool
-is_duration (int t)
-{
- return t && t == 1 << intlog2 (t);
-}
+or
-void
-set_music_properties (Music *p, SCM a)
-{
- for (SCM k = a; scm_is_pair (k); k = scm_cdr (k))
- p->internal_set_property (scm_caar (k), scm_cdar (k));
-}
+ \repeat { \repeat } \alternative
+*/
-SCM
-make_chord_step (int step, int alter)
-{
- if (step == 7)
- alter += FLAT;
- while (step < 0)
- step += 7;
- Pitch m ((step -1) / 7, (step - 1) % 7, alter);
- return m.smobbed_copy ();
-}
+%pure_parser
+%locations
-SCM
-make_chord (SCM pitch, SCM dur, SCM modification_list)
-{
- SCM chord_ctor = ly_lily_module_constant ("construct-chord");
- SCM ch = scm_call_3 (chord_ctor, pitch, dur, modification_list);
- unsmob_music (ch)->protect();
- return ch;
-}
+%{ // -*-Fundamental-*-
-/* 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)));
-}
+/*
+FIXME:
-Music*
-set_property_music (SCM sym, SCM value)
-{
- Music *p = MY_MAKE_MUSIC ("PropertySet");
- p->set_property ("symbol", sym);
- p->set_property ("value", value);
- return p;
-}
+ * The rules for who is protecting what are very shady. Uniformise
+ this.
-Music*
-make_music_relative (Pitch start, Music *music)
-{
- Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic");
- relative->set_property ("element", music->self_scm ());
-
- Pitch last = music->to_relative_octave (start);
- if (lily_1_8_relative)
- music->set_property ("last-pitch", last.smobbed_copy ());
- return relative;
-}
+ * There are too many lexical modes?
+*/
-Music*
-make_lyric_combine_music (SCM name, Music *music)
-{
- Music *combine = MY_MAKE_MUSIC ("LyricCombineMusic");
- combine->set_property ("element", music->self_scm ());
- combine->set_property ("associated-context", name);
- return combine;
-}
+#include "config.hh"
-%}
+#include <cctype>
+#include <cstdlib>
+#include <cstdio>
+using namespace std;
-/* 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 "book.hh"
+#include "context-def.hh"
+#include "dimensions.hh"
+#include "file-path.hh"
+#include "input.hh"
+#include "international.hh"
+#include "lily-guile.hh"
+#include "lily-lexer.hh"
+#include "lily-parser.hh"
+#include "main.hh"
+#include "misc.hh"
+#include "music.hh"
+#include "music.hh"
+#include "output-def.hh"
+#include "paper-book.hh"
+#include "program-option.hh"
+#include "scm-hash.hh"
+#include "score.hh"
+#include "text-interface.hh"
+#include "warn.hh"
+
+%}
-%left ADDLYRICS
%union {
Book *book;
Output_def *outputdef;
SCM scm;
- String *string;
+ std::string *string;
Music *music;
Score *score;
int i;
}
-%{
-int
-yylex (YYSTYPE *s, YYLTYPE *loc, void *v)
-{
- Lily_parser *pars = (Lily_parser*) v;
- Lily_lexer *lex = pars->lexer_;
-
- lex->lexval = (void*) s;
- lex->lexloc = loc;
- lex->prepare_for_next_token ();
- return lex->yylex ();
-}
-
-
-%}
-
-%expect 1
+%{
-/* One shift/reduce problem
+#define MY_MAKE_MUSIC(x, spot) make_music_with_input (ly_symbol2scm (x), spot)
-1. \repeat
- \repeat .. \alternative
+/* ES TODO:
+- Don't use lily module, create a new module instead.
+- delay application of the function
+*/
+#define LOWLEVEL_MAKE_SYNTAX(proc, args) \
+ 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));
- \repeat { \repeat .. \alternative }
+SCM get_next_unique_context_id ();
+SCM get_next_unique_lyrics_context_id ();
-or
+#undef _
+#if !HAVE_GETTEXT
+#define _(x) x
+#else
+#include <libintl.h>
+#define _(x) gettext (x)
+#endif
- \repeat { \repeat } \alternative
-*/
+static Music *make_music_with_input (SCM name, Input where);
+SCM make_music_relative (Pitch start, SCM music, Input loc);
+SCM run_music_function (Lily_parser *, SCM expr);
+SCM get_first_context_id (SCM type, Music *m);
+SCM make_chord_elements (SCM pitch, SCM dur, SCM modification_list);
+SCM make_chord_step (int step, int 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);
+void set_music_properties (Music *p, SCM a);
-%pure_parser
-%locations
+%}
/* The third option is an alias that will be used to display the
syntax error. Bison CVS now correctly handles backslash escapes.
/* Keyword tokens with plain escaped name. */
%token ACCEPTS "\\accepts"
%token ADDLYRICS "\\addlyrics"
-%token ADDQUOTE "\\addquote"
%token ALIAS "\\alias"
%token ALTERNATIVE "\\alternative"
-%token BAR "\\bar"
-%token BOOK "\book"
+%token BOOK "\\book"
%token CHANGE "\\change"
%token CHORDMODE "\\chordmode"
%token CHORDS "\\chords"
-%token CLEF "\\clef"
%token CONSISTS "\\consists"
%token CONTEXT "\\context"
%token DEFAULT "\\default"
%token SET "\\set"
%token SIMULTANEOUS "\\simultaneous"
%token SKIP "\\skip"
-%token TAG "\\tag"
%token TEMPO "\\tempo"
%token TIMES "\\times"
%token TRANSPOSE "\\transpose"
-%token TRANSPOSITION "\\transposition"
%token TYPE "\\type"
%token UNSET "\\unset"
%token WITH "\\with"
%token CHORD_COLON ":"
%token CHORD_MINUS "-"
%token CHORD_SLASH "/"
-%token DOUBLE_ANGLE_CLOSE ">>"
+%token ANGLE_OPEN "<"
+%token ANGLE_CLOSE ">"
%token DOUBLE_ANGLE_OPEN "<<"
+%token DOUBLE_ANGLE_CLOSE ">>"
%token E_BACKSLASH "\\"
%token E_ANGLE_CLOSE "\\>"
%token E_CHAR "\\C[haracter]"
%token E_OPEN "\\("
%token E_BRACKET_CLOSE "\\]"
%token E_ANGLE_OPEN "\\<"
+%token E_PLUS "\\+"
%token E_TILDE "\\~"
%token EXTENDER "__"
-/* These used at all?
- %token FIGURE_BRACKET_CLOSE
- %token FIGURE_BRACKET_OPEN
-
-parser.yy:348.8-25: warning: symbol `"\\>"' used more than once as a literal string
-parser.yy:352.8-24: warning: symbol `"\\<"' used more than once as a literal string
+/*
+If we give names, Bison complains.
*/
%token FIGURE_CLOSE /* "\\>" */
%token FIGURE_OPEN /* "\\<" */
%token CHORDMODIFIERS
%token LYRIC_MARKUP
%token MULTI_MEASURE_REST
-%token SCM_T
%token <i> DIGIT
%token <i> E_UNSIGNED
%token <i> UNSIGNED
-%token <id> IDENTIFIER
+/* Artificial tokens, for more generic function syntax */
+%token <i> EXPECT_MARKUP;
+%token <i> EXPECT_MUSIC;
+%token <i> EXPECT_SCM;
+/* After the last argument. */
+%token <i> EXPECT_NO_MORE_ARGS;
+%token <scm> BOOK_IDENTIFIER
%token <scm> CHORDMODIFIER_PITCH
%token <scm> CHORD_MODIFIER
%token <scm> CONTEXT_DEF_IDENTIFIER
%token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
%token <scm> MARKUP_IDENTIFIER
%token <scm> MUSIC_FUNCTION
-%token <scm> MUSIC_FUNCTION_MARKUP
-%token <scm> MUSIC_FUNCTION_MARKUP_MARKUP
-%token <scm> MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC
-%token <scm> MUSIC_FUNCTION_MARKUP_MUSIC
-%token <scm> MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC
-%token <scm> MUSIC_FUNCTION_MUSIC
-%token <scm> MUSIC_FUNCTION_MUSIC_MUSIC
-%token <scm> MUSIC_FUNCTION_SCM
-%token <scm> MUSIC_FUNCTION_SCM_MUSIC
-%token <scm> MUSIC_FUNCTION_SCM_MUSIC_MUSIC
-%token <scm> MUSIC_FUNCTION_SCM_SCM
-%token <scm> MUSIC_FUNCTION_SCM_SCM_MUSIC
%token <scm> MUSIC_IDENTIFIER
%token <scm> NOTENAME_PITCH
%token <scm> NUMBER_IDENTIFIER
%token <scm> REAL
%token <scm> RESTNAME
%token <scm> SCM_IDENTIFIER
-%token <scm> SCM_T
+%token <scm> SCM_TOKEN
%token <scm> SCORE_IDENTIFIER
%token <scm> STRING
%token <scm> STRING_IDENTIFIER
%type <book> book_body
%type <i> bare_unsigned
-%type <i> bass_mod
+%type <i> figured_bass_alteration
%type <i> dots
%type <i> exclamations
%type <i> optional_rest
%type <i> sup_quotes
%type <i> tremolo_type
-%type <music> Composite_music
-%type <music> Generic_prefix_music
-%type <music> Grouped_music_list
-%type <music> Music
-%type <music> Prefix_composite_music
-%type <music> Repeated_music
-%type <music> Sequential_music
-%type <music> Simple_music
-%type <music> Simultaneous_music
-%type <music> chord_body
-%type <music> chord_body_element
-%type <music> command_element
-%type <music> command_event
-%type <music> context_change
-%type <music> direction_less_event
-%type <music> direction_reqd_event
-%type <music> event_chord
-%type <music> gen_text_def
-%type <music> music_property_def
-%type <music> note_chord_element
-%type <music> post_event
-%type <music> re_rhythmed_music
-%type <music> relative_music
-%type <music> simple_element
-%type <music> string_number_event
-%type <music> tagged_post_event
-%type <music> tempo_event
-%type <music> toplevel_music
+/* Music */
+%type <scm> composite_music
+%type <scm> grouped_music_list
+%type <scm> music
+%type <scm> prefix_composite_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_change
+%type <scm> direction_less_event
+%type <scm> direction_reqd_event
+%type <scm> event_chord
+%type <scm> gen_text_def
+%type <scm> music_property_def
+%type <scm> note_chord_element
+%type <scm> post_event
+%type <scm> re_rhythmed_music
+%type <scm> relative_music
+%type <scm> simple_element
+%type <scm> simple_music_property_def
+%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> Alternative_music
-%type <scm> Generic_prefix_music_scm
-%type <scm> Music_list
+%type <scm> alternative_music
+%type <scm> generic_prefix_music_scm
+%type <scm> music_list
%type <scm> absolute_pitch
%type <scm> assignment_id
%type <scm> bare_number
%type <scm> bass_figure
-%type <scm> bass_number
+%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> figure_spec
%type <scm> fraction
%type <scm> full_markup
+%type <scm> function_scm_argument
+%type <scm> function_arglist
+%type <scm> function_arglist_music_last
+%type <scm> function_arglist_nonmusic_last
+%type <scm> function_arglist_nonmusic
%type <scm> identifier_init
%type <scm> lilypond_header
%type <scm> lilypond_header_body
%type <scm> mode_changing_head
%type <scm> mode_changing_head_with_context
%type <scm> multiplied_duration
+%type <scm> music_function_identifier_musicless_prefix
+%type <scm> music_function_event
+%type <scm> music_function_chord_body
%type <scm> new_chord
%type <scm> new_lyrics
%type <scm> number_expression
%type <scm> object_id_setting
%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> property_operation
%type <scm> scalar
%type <scm> script_abbreviation
+%type <scm> simple_chord_elements
%type <scm> simple_markup
%type <scm> simple_string
%type <scm> steno_duration
| lilypond assignment {
}
| lilypond error {
- THIS->error_level_ = 1;
+ PARSER->error_level_ = 1;
}
| lilypond INVALID {
- THIS->error_level_ = 1;
+ PARSER->error_level_ = 1;
}
;
toplevel_expression:
lilypond_header {
- THIS->lexer_->set_identifier (ly_symbol2scm ("$globalheader"), $1);
- }
- | add_quote {
-
+ PARSER->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
}
| book_block {
Book *book = $1;
- SCM proc = THIS->lexer_->lookup_identifier ("toplevel-book-handler");
- scm_call_2 (proc, THIS->self_scm (), book->self_scm ());
+ SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-book-handler");
+ scm_call_2 (proc, PARSER->self_scm (), book->self_scm ());
book->unprotect ();
}
| score_block {
Score *score = $1;
- SCM proc = THIS->lexer_->lookup_identifier ("toplevel-score-handler");
- scm_call_2 (proc, THIS->self_scm (), score->self_scm ());
+ SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-score-handler");
+ scm_call_2 (proc, PARSER->self_scm (), score->self_scm ());
score->unprotect ();
}
- | toplevel_music {
- Music *music = $1;
- SCM proc = THIS->lexer_->lookup_identifier ("toplevel-music-handler");
- scm_call_2 (proc, THIS->self_scm (), music->self_scm ());
- music->unprotect ();
+ | 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 ());
}
| full_markup {
- SCM proc = THIS->lexer_->lookup_identifier ("toplevel-text-handler");
- scm_call_2 (proc, THIS->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;
else if ($1->c_variable ("is-layout") == SCM_BOOL_T)
id = ly_symbol2scm ("$defaultlayout");
- THIS->lexer_->set_identifier (id, od->self_scm ());
+ PARSER->lexer_->set_identifier (id, od->self_scm ());
od->unprotect();
}
;
-toplevel_music:
- Composite_music {
- }
- ;
-
embedded_scm:
- SCM_T
+ SCM_TOKEN
| SCM_IDENTIFIER
;
lilypond_header_body:
{
- $$ = ly_make_anonymous_module (be_safe_global);
- THIS->lexer_->add_scope ($$);
+ $$ = get_header(PARSER);
+ PARSER->lexer_->add_scope ($$);
}
| lilypond_header_body assignment {
lilypond_header:
HEADER '{' lilypond_header_body '}' {
- $$ = THIS->lexer_->remove_scope ();
+ $$ = PARSER->lexer_->remove_scope ();
}
;
assignment:
assignment_id '=' identifier_init {
- if (! is_regular_identifier ($1))
- {
- @1.warning (_ ("identifier should have alphabetic characters only"));
- }
-
- THIS->lexer_->set_identifier ($1, $3);
+ PARSER->lexer_->set_identifier ($1, $3);
/*
TODO: devise standard for protection in parser.
$$ = $1->self_scm ();
$1->unprotect ();
}
+ | book_block {
+ $$ = $1->self_scm ();
+ $1->unprotect ();
+ }
| output_def {
$$ = $1->self_scm ();
$1->unprotect ();
| context_def_spec_block {
$$ = $1;
}
- | Music {
- $$ = $1->self_scm ();
- $1->unprotect();
+ | 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 {
- $$ = $1->self_scm ();
- $1->unprotect();
+ $$ = $1;
}
| number_expression {
$$ = $1;
context_def_spec_body:
/**/ {
$$ = Context_def::make_scm ();
- unsmob_context_def ($$)->set_spot (@$);
+ unsmob_context_def ($$)->origin ()->set_spot (@$);
}
| CONTEXT_DEF_IDENTIFIER {
$$ = $1;
- unsmob_context_def ($$)->set_spot (@$);
+ unsmob_context_def ($$)->origin ()->set_spot (@$);
}
| context_def_spec_body GROBDESCRIPTIONS embedded_scm {
Context_def*td = unsmob_context_def ($$);
book_body:
{
$$ = new Book;
- $$->set_spot (@$);
- $$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
+ $$->origin ()->set_spot (@$);
+ $$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (PARSER->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
$$->paper_->unprotect ();
- $$->header_ = THIS->lexer_->lookup_identifier ("$globalheader");
+ $$->header_ = PARSER->lexer_->lookup_identifier ("$defaultheader");
+ }
+ | BOOK_IDENTIFIER {
+ $$ = unsmob_book ($1);
+ $$->protect ();
+ $$->origin ()->set_spot (@$);
}
| book_body paper_block {
$$->paper_ = $2;
;
score_body:
- Music {
- SCM m = $1->self_scm ();
- $1->unprotect();
+ music {
+ SCM m = $1;
SCM scorify = ly_lily_module_constant ("scorify-music");
- SCM score = scm_call_2 (scorify, m, THIS->self_scm ());
+ SCM score = scm_call_2 (scorify, m, PARSER->self_scm ());
// pass ownernship to C++ again.
$$ = unsmob_score (score);
$$->protect ();
- $$->set_spot (@$);
+ $$->origin ()->set_spot (@$);
}
| SCORE_IDENTIFIER {
$$ = unsmob_score ($1);
- $$->set_spot (@$);
+ $$->protect ();
+ $$->origin ()->set_spot (@$);
}
| score_body object_id_setting {
$$->user_key_ = ly_scm2string ($2);
| score_body output_def {
if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T)
{
- THIS->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
{
- $$->defs_.push ($2);
+ $$->add_output_def ($2);
}
$2->unprotect ();
}
$$ = $1;
if ($$->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T)
{
- THIS->parser_error (@1, _ ("need \\paper for paper block"));
- $$ = get_paper (THIS);
+ PARSER->parser_error (@1, _ ("need \\paper for paper block"));
+ $1->unprotect ();
+ $$ = get_paper (PARSER);
}
}
;
output_def_body '}' {
$$ = $1;
- THIS->lexer_->remove_scope ();
- THIS->lexer_->pop_state ();
+ PARSER->lexer_->remove_scope ();
+ PARSER->lexer_->pop_state ();
}
;
output_def_head:
PAPER {
- $$ = get_paper (THIS);
+ $$ = get_paper (PARSER);
$$->input_origin_ = @$;
- THIS->lexer_->add_scope ($$->scope_);
+ PARSER->lexer_->add_scope ($$->scope_);
}
| MIDI {
- Output_def *p = get_midi (THIS);
+ Output_def *p = get_midi (PARSER);
$$ = p;
- THIS->lexer_->add_scope (p->scope_);
+ PARSER->lexer_->add_scope (p->scope_);
}
| LAYOUT {
- Output_def *p = get_layout (THIS);
+ Output_def *p = get_layout (PARSER);
- THIS->lexer_->add_scope (p->scope_);
+ PARSER->lexer_->add_scope (p->scope_);
$$ = p;
}
;
+output_def_head_with_mode_switch:
+ output_def_head {
+ PARSER->lexer_->push_initial_state ();
+ $$ = $1;
+ }
+ ;
output_def_body:
- output_def_head '{' {
+ output_def_head_with_mode_switch '{' {
$$ = $1;
$$->input_origin_.set_spot (@$);
- THIS->lexer_->push_initial_state ();
}
- | output_def_head '{' OUTPUT_DEF_IDENTIFIER {
+ | output_def_head_with_mode_switch '{' OUTPUT_DEF_IDENTIFIER {
$1->unprotect ();
+
Output_def *o = unsmob_output_def ($3);
o->input_origin_.set_spot (@$);
$$ = o;
- THIS->lexer_->remove_scope ();
- THIS->lexer_->add_scope (o->scope_);
- THIS->lexer_->push_initial_state ();
+ $$->protect ();
+ 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 tempo_event {
- /*
- junk this ? there already is tempo stuff in
- music.
- */
- int m = scm_to_int ($2->get_property ("metronome-count"));
- Duration *d = unsmob_duration ($2->get_property ("tempo-unit"));
- set_tempo ($$, d->get_length (), m);
- $2->unprotect ();
- }
| output_def_body error {
}
tempo_event:
TEMPO steno_duration '=' bare_unsigned {
- $$ = MY_MAKE_MUSIC ("MetronomeChangeEvent");
- $$->set_property ("tempo-unit", $2);
- $$->set_property ("metronome-count", scm_from_int ( $4));
- }
+ $$ = MAKE_SYNTAX ("tempo", @$, $2, scm_int2num ($4));
+ }
;
/*
to have efficient append. */
-Music_list:
+music_list:
/* empty */ {
$$ = scm_cons (SCM_EOL, SCM_EOL);
}
- | Music_list Music {
+ | music_list music {
SCM s = $$;
- SCM c = scm_cons ($2->self_scm (), SCM_EOL);
- $2->unprotect (); /* UGH */
+ SCM c = scm_cons ($2, SCM_EOL);
if (scm_is_pair (scm_cdr (s)))
scm_set_cdr_x (scm_cdr (s), c); /* append */
scm_set_car_x (s, c); /* set first cons */
scm_set_cdr_x (s, c); /* remember last cell */
}
- | Music_list embedded_scm {
+ | music_list embedded_scm {
}
- | Music_list error {
- Music * m = MY_MAKE_MUSIC("Music");
+ | music_list error {
+ Music *m = MY_MAKE_MUSIC("Music", @$);
// ugh. code dup
m->set_property ("error-found", SCM_BOOL_T);
SCM s = $$;
}
;
-Music:
- Simple_music
- | Composite_music
+music:
+ simple_music
+ | composite_music
;
-Alternative_music:
+alternative_music:
/* empty */ {
$$ = SCM_EOL;
}
- | ALTERNATIVE '{' Music_list '}' {
- $$ = $3;
+ | ALTERNATIVE '{' music_list '}' {
+ $$ = scm_car ($3);
}
;
-Repeated_music:
- REPEAT simple_string bare_unsigned Music Alternative_music
+repeated_music:
+ REPEAT simple_string bare_unsigned music alternative_music
{
- Music *beg = $4;
- int times = $3;
- SCM alts = scm_is_pair ($5) ? scm_car ($5) : SCM_EOL;
- if (times < scm_ilength (alts)) {
- unsmob_music (scm_car (alts))
- ->origin ()->warning (
- _ ("more alternatives than repeats"));
- warning ("junking excess alternatives");
- alts = ly_truncate_list (times, alts);
- }
-
-
- SCM proc = ly_lily_module_constant ("make-repeated-music");
-
- SCM mus = scm_call_1 (proc, $2);
- Music *r = unsmob_music (mus);
- r->protect ();
- if (beg)
- {
- r-> set_property ("element", beg->self_scm ());
- beg->unprotect ();
- }
- r->set_property ("repeat-count", scm_from_int (max (times, 1)));
-
- r-> set_property ("elements",alts);
- if (ly_is_equal ($2, scm_makfrom0str ("tremolo"))) {
- /*
- TODO: move this code to Scheme.
- */
-
- /* we cannot get durations and other stuff
- correct down the line,
- so we have to add to the duration log here. */
- SCM func = ly_lily_module_constant ("shift-duration-log");
-
- int dots = ($3 % 3) ? 0 : 1;
- int shift = -intlog2 ((dots) ? ($3*2/3) : $3);
-
-
- if ($4->is_mus_type ("sequential-music"))
- {
- int list_len = scm_ilength ($4->get_property ("elements"));
- if (list_len != 2)
- $4->origin ()->warning (_f ("expect 2 elements for Chord tremolo, found %d", list_len));
- shift -= 1;
- r->compress (Moment (Rational (1, list_len)));
- }
- scm_call_3 (func, r->self_scm (), scm_from_int (shift), scm_from_int (dots));
-
- }
- r->set_spot (*$4->origin ());
-
- $$ = r;
+ $$ = MAKE_SYNTAX ("repeat", @$, $2, scm_int2num ($3), $4, $5);
}
;
-Sequential_music:
- SEQUENTIAL '{' Music_list '}' {
- $$ = MY_MAKE_MUSIC ("SequentialMusic");
- $$->set_property ("elements", scm_car ($3));
- $$->set_spot (@$);
+sequential_music:
+ SEQUENTIAL '{' music_list '}' {
+ $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($3));
}
- | '{' Music_list '}' {
- $$ = MY_MAKE_MUSIC ("SequentialMusic");
- $$->set_property ("elements", scm_car ($2));
- $$->set_spot (@$);
+ | '{' music_list '}' {
+ $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($2));
}
;
-Simultaneous_music:
- SIMULTANEOUS '{' Music_list '}'{
- $$ = MY_MAKE_MUSIC ("SimultaneousMusic");
- $$->set_property ("elements", scm_car ($3));
- $$->set_spot (@$);
-
+simultaneous_music:
+ SIMULTANEOUS '{' music_list '}'{
+ $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($3));
}
- | simul_open Music_list simul_close {
- $$ = MY_MAKE_MUSIC ("SimultaneousMusic");
- $$->set_property ("elements", scm_car ($2));
- $$->set_spot (@$);
+ | DOUBLE_ANGLE_OPEN music_list DOUBLE_ANGLE_CLOSE {
+ $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($2));
}
;
-Simple_music:
- event_chord { $$ = $1; }
- | MUSIC_IDENTIFIER {
- $$ = unsmob_music ($1);
- }
+simple_music:
+ event_chord
+ | MUSIC_IDENTIFIER
| music_property_def
| context_change
;
-
optional_context_mod:
/**/ { $$ = SCM_EOL; }
- | WITH { THIS->lexer_->push_initial_state (); }
+ | WITH { PARSER->lexer_->push_initial_state (); }
'{' context_mod_list '}'
{
- THIS->lexer_->pop_state ();
+ PARSER->lexer_->pop_state ();
$$ = $4;
}
;
}
;
+composite_music:
+ prefix_composite_music { $$ = $1; }
+ | grouped_music_list { $$ = $1; }
+ ;
-Composite_music:
- Prefix_composite_music { $$ = $1; }
- | Grouped_music_list { $$ = $1; }
+grouped_music_list:
+ simultaneous_music { $$ = $1; }
+ | sequential_music { $$ = $1; }
;
-Grouped_music_list:
- Simultaneous_music { $$ = $1; }
- | Sequential_music { $$ = $1; }
+function_scm_argument:
+ embedded_scm
+ | simple_string
;
-Generic_prefix_music_scm:
- MUSIC_FUNCTION {
- $$ = scm_list_2 ($1, make_input (@$));
- }
- | MUSIC_FUNCTION_SCM embedded_scm {
- $$ = scm_list_3 ($1, make_input (@$), $2);
- }
- | MUSIC_FUNCTION_MARKUP full_markup {
- $$ = scm_list_3 ($1, make_input (@$), $2);
- }
- | MUSIC_FUNCTION_MUSIC Music {
- $$ = scm_list_3 ($1, make_input (@$), $2->self_scm ());
- $2->unprotect ();
- }
- | MUSIC_FUNCTION_SCM_MUSIC embedded_scm Music {
- $$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ());
- $3->unprotect ();
- }
- | MUSIC_FUNCTION_SCM_SCM embedded_scm embedded_scm {
- $$ = scm_list_4 ($1, make_input (@$), $2, $3);
- }
- | MUSIC_FUNCTION_SCM_SCM_MUSIC embedded_scm embedded_scm Music {
- $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4->self_scm ());
+/* An argument list. If a function \foo expects scm scm music, then the lexer expands \foo into the token sequence:
+ MUSIC_FUNCTION EXPECT_MUSIC EXPECT_SCM EXPECT_SCM
+and this rule returns the reversed list of arguments. */
+
+function_arglist_music_last:
+ EXPECT_MUSIC function_arglist music {
+ $$ = scm_cons ($3, $2);
}
- | MUSIC_FUNCTION_MARKUP_MUSIC full_markup Music {
- $$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ());
- $3->unprotect ();
+ ;
+
+function_arglist_nonmusic_last:
+ EXPECT_MARKUP function_arglist full_markup {
+ $$ = scm_cons ($3, $2);
}
- | MUSIC_FUNCTION_MARKUP_MARKUP full_markup full_markup {
- $$ = scm_list_4 ($1, make_input (@$), $2, $3);
+ | EXPECT_SCM function_arglist function_scm_argument {
+ $$ = scm_cons ($3, $2);
}
- | MUSIC_FUNCTION_MUSIC_MUSIC Music Music {
- $$ = scm_list_4 ($1, make_input (@$), $2->self_scm (), $3->self_scm ());
- $2->unprotect ();
- $3->unprotect ();
+ ;
+
+function_arglist_nonmusic: EXPECT_NO_MORE_ARGS {
+ $$ = SCM_EOL;
}
- | MUSIC_FUNCTION_SCM_MUSIC_MUSIC embedded_scm Music Music {
- $$ = scm_list_5 ($1, make_input (@$), $2, $3->self_scm (), $4->self_scm ());
- $4->unprotect ();
- $3->unprotect ();
+ | EXPECT_MARKUP function_arglist_nonmusic full_markup {
+ $$ = scm_cons ($3, $2);
}
- | MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC full_markup Music Music {
- $$ = scm_list_5 ($1, make_input (@$), $2, $3->self_scm (), $4->self_scm ());
- $3->unprotect ();
- $4->unprotect ();
+ | EXPECT_SCM function_arglist_nonmusic function_scm_argument {
+ $$ = scm_cons ($3, $2);
}
;
-Generic_prefix_music:
- Generic_prefix_music_scm {
- SCM func = scm_car ($1);
- Input *loc = unsmob_input (scm_cadr ($1));
- SCM args = scm_cddr ($1);
- SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature"));
-
- SCM type_check_proc = ly_lily_module_constant ("type-check-list");
- bool ok = true;
-
- if (!to_boolean (scm_call_3 (type_check_proc, scm_cadr ($1), sig, args)))
- {
- THIS->error_level_ = 1;
- ok = false;
- }
-
- SCM m = SCM_EOL;
- if (ok)
- m = scm_apply_0 (func, scm_cons (THIS->self_scm(),
- scm_cdr ($1)));
+function_arglist: EXPECT_NO_MORE_ARGS {
+ /* This is for 0-ary functions, so they don't need to
+ read a lookahead token */
+ $$ = SCM_EOL;
+ }
+ | function_arglist_music_last
+ | function_arglist_nonmusic_last
+ ;
- if (unsmob_music (m))
- {
- $$ = unsmob_music (m);
- $$->protect ();
- }
- else
- {
- if (ok)
- loc->error (_ ("music head function must return Music object"));
- $$ = MY_MAKE_MUSIC ("Music");
- }
- $$->set_spot (*loc);
+generic_prefix_music_scm:
+ MUSIC_FUNCTION function_arglist {
+ $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL));
}
;
-Prefix_composite_music:
- Generic_prefix_music {
- $$ = $1;
+optional_id:
+ /**/ { $$ = SCM_EOL; }
+ | '=' simple_string {
+ $$ = $2;
}
- | CONTEXT simple_string '=' simple_string optional_context_mod Music {
- $$ = context_spec_music ($2, $4, $6, $5);
+ ;
+
+prefix_composite_music:
+ generic_prefix_music_scm {
+ $$ = run_music_function (PARSER, $1);
}
- | CONTEXT simple_string optional_context_mod Music {
- $$ = context_spec_music ($2, SCM_UNDEFINED, $4, $3);
+ | CONTEXT simple_string optional_id optional_context_mod music {
+ $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_F);
}
- | NEWCONTEXT simple_string optional_context_mod Music {
- $$ = context_spec_music ($2, get_next_unique_context_id (), $4,
- $3);
+ | NEWCONTEXT simple_string optional_id optional_context_mod music {
+ $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_T);
}
- | TIMES fraction Music
-
- {
- int n = scm_to_int (scm_car ($2)); int d = scm_to_int (scm_cdr ($2));
- Music *mp = $3;
-
- $$= MY_MAKE_MUSIC ("TimeScaledMusic");
- $$->set_spot (@$);
-
- $$->set_property ("element", mp->self_scm ());
- mp->unprotect();
- $$->set_property ("numerator", scm_from_int (n));
- $$->set_property ("denominator", scm_from_int (d));
- $$->compress (Moment (Rational (n,d)));
-
+ | TIMES fraction music {
+ $$ = MAKE_SYNTAX ("time-scaled-music", @$, $2, $3);
}
- | Repeated_music { $$ = $1; }
- | TRANSPOSE pitch_also_in_chords pitch_also_in_chords Music {
- $$ = MY_MAKE_MUSIC ("TransposedMusic");
- Music *p = $4;
+ | repeated_music { $$ = $1; }
+ | TRANSPOSE pitch_also_in_chords pitch_also_in_chords music {
Pitch from = *unsmob_pitch ($2);
Pitch to = *unsmob_pitch ($3);
-
- p->transpose (pitch_interval (from, to));
- $$->set_property ("element", p->self_scm ());
- p->unprotect();
+ SCM pitch = pitch_interval (from, to).smobbed_copy ();
+ $$ = MAKE_SYNTAX ("transpose-music", @$, pitch, $4);
}
- | mode_changing_head Grouped_music_list {
+ | mode_changing_head grouped_music_list {
if ($1 == ly_symbol2scm ("chords"))
{
- Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic");
- chm->set_property ("element", $2->self_scm ());
- $$ = chm;
- $2->unprotect();
+ $$ = MAKE_SYNTAX ("unrelativable-music", @$, $2);
}
else
{
$$ = $2;
}
- THIS->lexer_->pop_state ();
+ PARSER->lexer_->pop_state ();
}
- | mode_changing_head_with_context optional_context_mod Grouped_music_list {
- $$ = context_spec_music ($1, get_next_unique_context_id (),
- $3, $2);
+ | mode_changing_head_with_context optional_context_mod grouped_music_list {
+ $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, $3, $2, SCM_BOOL_T);
if ($1 == ly_symbol2scm ("ChordNames"))
{
- Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic");
- chm->set_property ("element", $$->self_scm ());
- $$->unprotect();
- $$ = chm;
+ $$ = MAKE_SYNTAX ("unrelativable-music", @$, $$);
}
- THIS->lexer_->pop_state ();
+ PARSER->lexer_->pop_state ();
}
| relative_music { $$ = $1; }
| re_rhythmed_music { $$ = $1; }
- | TAG embedded_scm Music {
- tag_music ($3, $2, @$);
- $$ = $3;
- }
;
mode_changing_head:
NOTEMODE {
- SCM nn = THIS->lexer_->lookup_identifier ("pitchnames");
- THIS->lexer_->push_note_state (alist_to_hashq (nn));
+ SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames");
+ PARSER->lexer_->push_note_state (alist_to_hashq (nn));
$$ = ly_symbol2scm ("notes");
}
| DRUMMODE
{
- SCM nn = THIS->lexer_->lookup_identifier ("drumPitchNames");
- THIS->lexer_->push_note_state (alist_to_hashq (nn));
+ SCM nn = PARSER->lexer_->lookup_identifier ("drumPitchNames");
+ PARSER->lexer_->push_note_state (alist_to_hashq (nn));
$$ = ly_symbol2scm ("drums");
}
| FIGUREMODE {
- THIS->lexer_->push_figuredbass_state ();
+ PARSER->lexer_->push_figuredbass_state ();
$$ = ly_symbol2scm ("figures");
}
| CHORDMODE {
- SCM nn = THIS->lexer_->lookup_identifier ("chordmodifiers");
- THIS->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
- nn = THIS->lexer_->lookup_identifier ("pitchnames");
- THIS->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 (alist_to_hashq (nn));
$$ = ly_symbol2scm ("chords");
}
| LYRICMODE
- { THIS->lexer_->push_lyric_state ();
+ { PARSER->lexer_->push_lyric_state ();
$$ = ly_symbol2scm ("lyrics");
}
;
mode_changing_head_with_context:
DRUMS {
- SCM nn = THIS->lexer_->lookup_identifier ("drumPitchNames");
- THIS->lexer_->push_note_state (alist_to_hashq (nn));
+ SCM nn = PARSER->lexer_->lookup_identifier ("drumPitchNames");
+ PARSER->lexer_->push_note_state (alist_to_hashq (nn));
$$ = ly_symbol2scm ("DrumStaff");
}
| FIGURES {
- THIS->lexer_->push_figuredbass_state ();
+ PARSER->lexer_->push_figuredbass_state ();
$$ = ly_symbol2scm ("FiguredBass");
}
| CHORDS {
- SCM nn = THIS->lexer_->lookup_identifier ("chordmodifiers");
- THIS->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
- nn = THIS->lexer_->lookup_identifier ("pitchnames");
- THIS->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 (alist_to_hashq (nn));
$$ = ly_symbol2scm ("ChordNames");
}
| LYRICS
- { THIS->lexer_->push_lyric_state ();
+ { PARSER->lexer_->push_lyric_state ();
$$ = ly_symbol2scm ("Lyrics");
}
;
relative_music:
- RELATIVE absolute_pitch Music {
- Music *m = $3;
+ RELATIVE absolute_pitch music {
Pitch start = *unsmob_pitch ($2);
- $$ = make_music_relative (start, m);
- m->unprotect();
+ $$ = make_music_relative (start, $3, @$);
}
- | RELATIVE Composite_music {
- Music *m = $2;
-
+ | RELATIVE composite_music {
Pitch middle_c (0, 0, 0);
- $$ = make_music_relative (middle_c, m);
- m->unprotect();
+ $$ = make_music_relative (middle_c, $2, @$);
}
;
new_lyrics:
- ADDLYRICS { THIS->lexer_->push_lyric_state (); }
+ ADDLYRICS { PARSER->lexer_->push_lyric_state (); }
/*cont */
- Grouped_music_list {
- /* Can also use Music at the expensive of two S/Rs similar to
+ grouped_music_list {
+ /* Can also use music at the expensive of two S/Rs similar to
\repeat \alternative */
- THIS->lexer_->pop_state ();
+ PARSER->lexer_->pop_state ();
- $$ = scm_cons ($3->self_scm (), SCM_EOL);
+ $$ = scm_cons ($3, SCM_EOL);
}
| new_lyrics ADDLYRICS {
- THIS->lexer_->push_lyric_state ();
- } Grouped_music_list {
- THIS->lexer_->pop_state ();
- $$ = scm_cons ($4->self_scm (), $1);
+ PARSER->lexer_->push_lyric_state ();
+ } grouped_music_list {
+ PARSER->lexer_->pop_state ();
+ $$ = scm_cons ($4, $1);
}
;
re_rhythmed_music:
- Grouped_music_list new_lyrics {
- Music * voice = $1;
- SCM name = get_first_context_id (scm_makfrom0str ("Voice"), voice);
- if (!scm_is_string (name))
- {
- name = get_next_unique_lyrics_context_id ();
- voice = context_spec_music (scm_makfrom0str ("Voice"),
- name,
- voice, SCM_EOL);
- }
-
- SCM context = scm_makfrom0str ("Lyrics");
- Music *all = MY_MAKE_MUSIC ("SimultaneousMusic");
-
- SCM lst = SCM_EOL;
- for (SCM s = $2; scm_is_pair (s); s = scm_cdr (s))
- {
- Music *music = unsmob_music (scm_car (s));
- Music *com = make_lyric_combine_music (name, music);
- Music *csm = context_spec_music (context,
- get_next_unique_context_id (), com, SCM_EOL);
- lst = scm_cons (csm->self_scm (), lst);
- }
- all->set_property ("elements", scm_cons (voice->self_scm (),
- lst));
- $$ = all;
- voice->unprotect ();
+ grouped_music_list new_lyrics {
+ $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL));
}
| LYRICSTO simple_string {
- THIS->lexer_->push_lyric_state ();
- } Music {
- THIS->lexer_->pop_state ();
- Music *music = $4;
- SCM name = $2;
- $$ = make_lyric_combine_music (name, music);
- music->unprotect();
+ PARSER->lexer_->push_lyric_state ();
+ } music {
+ PARSER->lexer_->pop_state ();
+ $$ = MAKE_SYNTAX ("lyric-combine", @$, $2, $4);
}
;
context_change:
CHANGE STRING '=' STRING {
- Music*t = MY_MAKE_MUSIC ("ContextChange");
- t-> set_property ("change-to-type", scm_string_to_symbol ($2));
- t-> set_property ("change-to-id", $4);
-
- $$ = t;
- $$->set_spot (@$);
+ $$ = MAKE_SYNTAX ("context-change", @$, scm_string_to_symbol ($2), $4);
}
;
}
| OVERRIDE simple_string embedded_scm '=' embedded_scm {
$$ = scm_list_4 (ly_symbol2scm ("push"),
- scm_string_to_symbol ($2), $3, $5);
+ scm_string_to_symbol ($2), $5, $3);
+ }
+ | OVERRIDE simple_string embedded_scm embedded_scm '=' embedded_scm {
+ $$ = scm_list_5 (ly_symbol2scm ("push"),
+ scm_string_to_symbol ($2), $6, $4, $3);
}
| REVERT simple_string embedded_scm {
$$ = scm_list_3 (ly_symbol2scm ("pop"),
}
;
-music_property_def:
+simple_music_property_def:
OVERRIDE context_prop_spec embedded_scm '=' scalar {
- $$ = property_op_to_music (scm_list_4 (
- ly_symbol2scm ("poppush"),
+ $$ = scm_list_5 (scm_car ($2),
+ ly_symbol2scm ("OverrideProperty"),
scm_cadr ($2),
- $3, $5));
- $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $5, $3);
+ }
+ | OVERRIDE context_prop_spec embedded_scm embedded_scm '=' scalar {
+ $$ = scm_list_n (scm_car ($2),
+ ly_symbol2scm ("OverrideProperty"),
+ scm_cadr ($2),
+ $6, $4, $3, SCM_UNDEFINED);
}
| REVERT context_prop_spec embedded_scm {
- $$ = property_op_to_music (scm_list_3 (
- ly_symbol2scm ("pop"),
+ $$ = scm_list_4 (scm_car ($2),
+ ly_symbol2scm ("RevertProperty"),
scm_cadr ($2),
- $3));
-
- $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $3);
}
| SET context_prop_spec '=' scalar {
- $$ = property_op_to_music (scm_list_3 (
- ly_symbol2scm ("assign"),
+ $$ = scm_list_4 (scm_car ($2),
+ ly_symbol2scm ("PropertySet"),
scm_cadr ($2),
- $4));
- $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $4);
}
| UNSET context_prop_spec {
- $$ = property_op_to_music (scm_list_2 (
- ly_symbol2scm ("unset"),
- scm_cadr ($2)));
- $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
- }
- | ONCE music_property_def {
- SCM e = $2->get_property ("element");
- unsmob_music (e)->set_property ("once", SCM_BOOL_T);
- $$ = $2;
-
+ $$ = scm_list_3 (scm_car ($2),
+ ly_symbol2scm ("PropertyUnset"),
+ scm_cadr ($2));
}
;
+music_property_def:
+ simple_music_property_def {
+ $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons (PARSER->self_scm (), scm_cons2 (make_input (@$), SCM_BOOL_F, $1)));
+ }
+ | ONCE simple_music_property_def {
+ $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons (PARSER->self_scm (), scm_cons2 (make_input (@$), SCM_BOOL_T, $2)));
+ }
+ ;
string:
STRING {
| LYRICS_STRING {
$$ = $1;
}
+ | STRING_IDENTIFIER {
+ $$ = $1;
+ }
;
scalar: string {
}
| embedded_scm {
$$ = $1;
- }
- | full_markup {
- $$ = $1;
- }
- | DIGIT {
- $$ = scm_from_int ($1);
- }
- ;
-
-/*
-
-pre_events doesn't contain anything. It is a trick:
-
-Adding pre_events to the simple_element
-makes the choice between
-
- string: STRING
-
-and
-
- simple_element: STRING
-
-a single shift/reduction conflict.
-
-nevertheless, this is not very clean, and we should find a different
-solution.
-
-*/
-pre_events: /* empty */
+ }
+ | full_markup {
+ $$ = $1;
+ }
+ | DIGIT {
+ $$ = scm_from_int ($1);
+ }
;
event_chord:
- pre_events simple_element post_events {
- SCM elts = $2-> get_property ("elements");
-
- elts = ly_append2 (elts, scm_reverse_x ($3, SCM_EOL));
+ /* TODO: Create a special case that avoids the creation of
+ EventChords around simple_elements that have no post_events?
+ */
+ simple_chord_elements post_events {
+ SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL));
- $2->set_property ("elements", elts);
+ Input i;
/* why is this giving wrong start location? -ns
- * $2->set_spot (@$); */
+ * i = @$; */
+ i.set_location (@1, @2);
+ $$ = MAKE_SYNTAX ("event-chord", i, elts);
+ }
+ | MULTI_MEASURE_REST optional_notemode_duration post_events {
Input i;
- i.set_location (@2, @3);
- $2->set_spot (i);
- $$ = $2;
+ i.set_location (@1, @3);
+ $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2, $3);
}
| command_element
| note_chord_element
note_chord_element:
chord_body optional_notemode_duration post_events
{
+ Music *m = unsmob_music ($1);
SCM dur = unsmob_duration ($2)->smobbed_copy ();
- SCM es = $1->get_property ("elements");
+ SCM es = m->get_property ("elements");
SCM postevs = scm_reverse_x ($3, SCM_EOL);
-
+
for (SCM s = es; scm_is_pair (s); s = scm_cdr (s))
unsmob_music (scm_car (s))->set_property ("duration", dur);
es = ly_append2 (es, postevs);
- $1-> set_property ("elements", es);
- $1->set_spot (@$);
- $$ = $1;
+ m-> set_property ("elements", es);
+ m->set_spot (@$);
+ $$ = m->self_scm ();
}
;
-chord_open: '<'
- ;
-
-chord_close: '>'
- ;
-
-simul_open: DOUBLE_ANGLE_OPEN
- ;
-
-simul_close: DOUBLE_ANGLE_CLOSE
- ;
-
chord_body:
- chord_open chord_body_elements chord_close
+ ANGLE_OPEN chord_body_elements ANGLE_CLOSE
{
- $$ = MY_MAKE_MUSIC ("EventChord");
- $$->set_spot (@$);
- $$->set_property ("elements",
- scm_reverse_x ($2, SCM_EOL));
+ $$ = MAKE_SYNTAX ("event-chord", @$, scm_reverse_x ($2, SCM_EOL));
}
;
chord_body_elements:
/* empty */ { $$ = SCM_EOL; }
| chord_body_elements chord_body_element {
- $$ = scm_cons ($2->self_scm (), $1);
- $2->unprotect ();
+ $$ = scm_cons ($2, $1);
}
;
SCM check = $4;
SCM post = $5;
- Music *n = MY_MAKE_MUSIC ("NoteEvent");
+ Music *n = MY_MAKE_MUSIC ("NoteEvent", @$);
n->set_property ("pitch", $1);
- n->set_spot (@$);
if (q % 2)
n->set_property ("cautionary", SCM_BOOL_T);
if (ex % 2 || q % 2)
n->set_property ("absolute-octave", scm_from_int (q-1));
}
-
- $$ = n;
+ $$ = n->unprotect ();
}
| DRUM_PITCH post_events {
- Music *n = MY_MAKE_MUSIC ("NoteEvent");
+ Music *n = MY_MAKE_MUSIC ("NoteEvent", @$);
n->set_property ("duration", $2);
n->set_property ("drum-type", $1);
- n->set_spot (@$);
if (scm_is_pair ($2)) {
SCM arts = scm_reverse_x ($2, SCM_EOL);
n->set_property ("articulations", arts);
}
- $$ = n;
+ $$ = n->unprotect ();
+ }
+ | music_function_chord_body {
+ $$ = run_music_function (PARSER, $1);
}
;
-add_quote:
- ADDQUOTE string Music {
- SCM adder = ly_lily_module_constant ("add-quotable");
-
- scm_call_2 (adder, $2, $3->self_scm ());
- $3->unprotect();
+music_function_identifier_musicless_prefix: MUSIC_FUNCTION {
+ SCM sig = scm_object_property (yylval.scm, ly_symbol2scm ("music-function-signature"));
+ if (scm_is_pair (sig) && to_boolean (scm_memq (ly_music_p_proc, scm_cdr (scm_reverse (sig)))))
+ {
+ PARSER->parser_error (@$, "Music function applied to event may not have a Music argument, except as the last argument.");
+ }
+ }
+ ;
+
+music_function_chord_body:
+ /* We could allow chord functions to have multiple music arguments,
+ but it's more consistent with music_function_event if we
+ prohibit it here too */
+ music_function_identifier_musicless_prefix EXPECT_MUSIC function_arglist_nonmusic chord_body_element {
+ $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($3, scm_list_1 ($4)));
+ }
+ | music_function_identifier_musicless_prefix function_arglist_nonmusic {
+ $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL));
+ }
+ ;
+
+music_function_event:
+ /* Post-events can only have the last argument as music, without this
+ restriction we get a shift/reduce conflict from e.g.
+ c8-\partcombine c8 -. */
+ music_function_identifier_musicless_prefix EXPECT_MUSIC function_arglist_nonmusic post_event {
+ $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($3, scm_list_1 ($4)));
+ }
+ | music_function_identifier_musicless_prefix function_arglist_nonmusic {
+ $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL));
}
;
command_element:
command_event {
- $$ = MY_MAKE_MUSIC ("EventChord");
- $$->set_property ("elements", scm_cons ($1->self_scm (), SCM_EOL));
- $1->unprotect();
-
- $$-> set_spot (@$);
- $1-> set_spot (@$);
+ $$ = $1;
}
| SKIP duration_length {
- Music *skip = MY_MAKE_MUSIC ("SkipMusic");
- skip->set_property ("duration", $2);
- skip->set_spot (@$);
- $$ = skip;
- }
- | OCTAVE pitch {
- Music *m = MY_MAKE_MUSIC ("RelativeOctaveCheck");
- $$ = m;
- $$->set_spot (@$);
- $$->set_property ("pitch", $2);
+ $$ = MAKE_SYNTAX ("skip-music", @$, $2);
}
| E_BRACKET_OPEN {
- Music *m = MY_MAKE_MUSIC ("LigatureEvent");
+ Music *m = MY_MAKE_MUSIC ("LigatureEvent", @$);
m->set_property ("span-direction", scm_from_int (START));
- m->set_spot (@$);
-
- $$ = MY_MAKE_MUSIC ("EventChord");
- $$->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL));
- m->unprotect();
- $$->set_spot (@$);
+ $$ = m->unprotect();
}
| E_BRACKET_CLOSE {
- Music *m = MY_MAKE_MUSIC ("LigatureEvent");
+ Music *m = MY_MAKE_MUSIC ("LigatureEvent", @$);
m->set_property ("span-direction", scm_from_int (STOP));
- m->set_spot (@$);
-
- $$ = MY_MAKE_MUSIC ("EventChord");
- $$->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL));
- $$->set_spot (@$);
- m->unprotect ();
+ $$ = m->unprotect ();
}
| E_BACKSLASH {
- $$ = MY_MAKE_MUSIC ("VoiceSeparator");
- $$->set_spot (@$);
+ $$ = MAKE_SYNTAX ("voice-separator", @$, SCM_UNDEFINED);
}
| '|' {
- SCM pipe = THIS->lexer_->lookup_identifier ("pipeSymbol");
+ SCM pipe = PARSER->lexer_->lookup_identifier ("pipeSymbol");
- if (Music * m = unsmob_music (pipe))
- $$ = m->clone ();
+ Music *m = unsmob_music (pipe);
+ if (m)
+ {
+ m = m->clone ();
+ m->set_spot (@$);
+ $$ = m->unprotect ();
+ }
else
- $$ = MY_MAKE_MUSIC ("BarCheck");
-
- $$->set_spot (@$);
- }
- | TRANSPOSITION pitch {
- Pitch middle_c;
- Pitch sounds_as_c = pitch_interval (*unsmob_pitch ($2), middle_c);
- $$ = set_property_music (ly_symbol2scm ("instrumentTransposition"),
- sounds_as_c.smobbed_copy());
- $$->set_spot (@$);
- $$ = context_spec_music (ly_symbol2scm ("Staff"), SCM_UNDEFINED,
- $$, SCM_EOL);
- }
- | BAR STRING {
- Music *t = set_property_music (ly_symbol2scm ("whichBar"), $2);
+ $$ = MAKE_SYNTAX ("bar-check", @$, SCM_UNDEFINED);
- Music *csm = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED,
- t, SCM_EOL);
- $$ = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED, csm, SCM_EOL);
- $$->set_spot (@$);
- t->set_spot (@$);
}
- | PARTIAL duration_length {
+ | PARTIAL duration_length {
Moment m = - unsmob_duration ($2)->get_length ();
- Music *p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ());
- p->set_spot (@$);
- p = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED,
- p, SCM_EOL);
- p = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED,
- p, SCM_EOL);
- $$ = p;
+ $$ = MAKE_SYNTAX ("property-operation", @$, SCM_BOOL_F, ly_symbol2scm ("Timing"), ly_symbol2scm ("PropertySet"), ly_symbol2scm ("measurePosition"), m.smobbed_copy ());
+ $$ = MAKE_SYNTAX ("context-specification", @$, ly_symbol2scm ("Score"), SCM_BOOL_F, $$, SCM_EOL, SCM_BOOL_F);
}
- | CLEF STRING {
- SCM proc = ly_lily_module_constant ("make-clef-set");
- SCM result = scm_call_1 (proc, $2);
- $$ = unsmob_music (result);
- $$->protect ();
- }
| TIME_T fraction {
SCM proc = ly_lily_module_constant ("make-time-signature-set");
- SCM result = scm_apply_2 (proc, scm_car ($2), scm_cdr ($2), SCM_EOL);
- $$ = unsmob_music (result);
- $$->protect ();
+ $$ = scm_apply_2 (proc, scm_car ($2), scm_cdr ($2), SCM_EOL);
}
| MARK scalar {
SCM proc = ly_lily_module_constant ("make-mark-set");
- SCM result = scm_call_1 (proc, $2);
- scm_gc_protect_object (result);
- $$ = unsmob_music (result);
- $$->protect ();
+ $$ = scm_call_1 (proc, $2);
}
;
command_event:
E_TILDE {
- $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent");
+ $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent", @$)->unprotect ();
}
| MARK DEFAULT {
- Music *m = MY_MAKE_MUSIC ("MarkEvent");
- $$ = m;
+ Music *m = MY_MAKE_MUSIC ("MarkEvent", @$);
+ $$ = m->unprotect ();
}
| tempo_event {
$$ = $1;
}
| KEY DEFAULT {
- Music *key = MY_MAKE_MUSIC ("KeyChangeEvent");
- $$ = key;
+ Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$);
+ $$ = key->unprotect ();
}
| KEY NOTENAME_PITCH SCM_IDENTIFIER {
- Music *key = MY_MAKE_MUSIC ("KeyChangeEvent");
+ Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$);
if (scm_ilength ($3) > 0)
{
key->set_property ("pitch-alist", $3);
key->set_property ("tonic", Pitch (0, 0, 0).smobbed_copy ());
key->transpose (* unsmob_pitch ($2));
} else {
- THIS->parser_error (@3, _ ("second argument must be pitch list"));
+ PARSER->parser_error (@3, _ ("second argument must be pitch list"));
}
- $$ = key;
+ $$ = key->unprotect ();
}
;
$$ = SCM_EOL;
}
| post_events post_event {
- $2->set_spot (@2);
- $$ = scm_cons ($2->self_scm (), $$);
- $2->unprotect ();
- }
- | post_events tagged_post_event {
- $2 -> set_spot (@2);
- $$ = scm_cons ($2->self_scm (), $$);
- $2->unprotect ();
- }
- ;
-
-
-tagged_post_event:
- '-' TAG embedded_scm post_event {
- tag_music ($4, $3, @$);
- $$ = $4;
+ unsmob_music ($2)->set_spot (@2);
+ $$ = scm_cons ($2, $$);
}
;
-
-
+
post_event:
direction_less_event {
$$ = $1;
}
+ | '-' music_function_event {
+ $$ = run_music_function (PARSER, $2);
+ }
| HYPHEN {
- if (!THIS->lexer_->is_lyric_state ())
- THIS->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
- $$ = MY_MAKE_MUSIC ("HyphenEvent");
+ 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 (!THIS->lexer_->is_lyric_state ())
- THIS->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
- $$ = MY_MAKE_MUSIC ("ExtenderEvent");
+ 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)
- $2->set_property ("direction", scm_from_int ($1));
+ {
+ Music *m = unsmob_music ($2);
+ m->set_property ("direction", scm_from_int ($1));
+ }
$$ = $2;
}
| script_dir direction_less_event {
if ($1)
- $2->set_property ("direction", scm_from_int ($1));
+ {
+ Music *m = unsmob_music ($2);
+ m->set_property ("direction", scm_from_int ($1));
+ }
$$ = $2;
}
| string_number_event
string_number_event:
E_UNSIGNED {
- Music *s = MY_MAKE_MUSIC ("StringNumberEvent");
+ Music *s = MY_MAKE_MUSIC ("StringNumberEvent", @$);
s->set_property ("string-number", scm_from_int ($1));
- s->set_spot (@$);
- $$ = s;
+ $$ = s->unprotect ();
}
;
direction_less_event:
direction_less_char {
- SCM predefd = THIS->lexer_->lookup_identifier_symbol ($1);
- Music * m = 0;
+ SCM predefd = PARSER->lexer_->lookup_identifier_symbol ($1);
+ Music *m = 0;
if (unsmob_music (predefd))
{
m = unsmob_music (predefd)->clone ();
+ m->set_spot (@$);
}
else
{
- m = MY_MAKE_MUSIC ("Music");
+ m = MY_MAKE_MUSIC ("Music", @$);
}
- m->set_spot (@$);
- $$ = m;
+ $$ = m->unprotect ();
}
| EVENT_IDENTIFIER {
- $$ = unsmob_music ($1);
+ $$ = $1;
}
| tremolo_type {
- Music *a = MY_MAKE_MUSIC ("TremoloEvent");
- a->set_spot (@$);
+ Music *a = MY_MAKE_MUSIC ("TremoloEvent", @$);
a->set_property ("tremolo-type", scm_from_int ($1));
- $$ = a;
+ $$ = a->unprotect ();
}
;
$$ = $1;
}
| script_abbreviation {
- SCM s = THIS->lexer_->lookup_identifier ("dash" + ly_scm2string ($1));
- Music *a = MY_MAKE_MUSIC ("ArticulationEvent");
+ 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 THIS->parser_error (@1, _ ("expecting string as script definition"));
- $$ = a;
+ else PARSER->parser_error (@1, _ ("expecting string as script definition"));
+ $$ = a->unprotect ();
}
;
gen_text_def:
full_markup {
- Music *t = MY_MAKE_MUSIC ("TextScriptEvent");
+ Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$);
t->set_property ("text", $1);
- t->set_spot (@$);
- $$ = t;
+ $$ = t->unprotect ();
}
| string {
- Music *t = MY_MAKE_MUSIC ("TextScriptEvent");
+ Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$);
t->set_property ("text",
make_simple_markup ($1));
- t->set_spot (@$);
- $$ = t;
-
+ $$ = t->unprotect ();
}
| DIGIT {
- Music *t = MY_MAKE_MUSIC ("FingerEvent");
+ Music *t = MY_MAKE_MUSIC ("FingeringEvent", @$);
t->set_property ("digit", scm_from_int ($1));
- t->set_spot (@$);
- $$ = t;
+ $$ = t->unprotect ();
}
;
| '|' {
$$ = scm_makfrom0str ("Bar");
}
- | '>' {
+ | ANGLE_CLOSE {
$$ = scm_makfrom0str ("Larger");
}
| '.' {
optional_notemode_duration:
{
- Duration dd = THIS->default_duration_;
+ Duration dd = PARSER->default_duration_;
$$ = dd.smobbed_copy ();
}
| multiplied_duration {
$$ = $1;
- THIS->default_duration_ = *unsmob_duration ($$);
+ PARSER->default_duration_ = *unsmob_duration ($$);
}
;
bare_unsigned dots {
int len = 0;
if (!is_duration ($1))
- THIS->parser_error (@1, _f ("not a duration: %d", $1));
+ PARSER->parser_error (@1, _f ("not a duration: %d", $1));
else
len = intlog2 ($1);
}
| ':' bare_unsigned {
if (!is_duration ($2))
- THIS->parser_error (@2, _f ("not a duration: %d", $2));
+ PARSER->parser_error (@2, _f ("not a duration: %d", $2));
$$ = $2;
}
;
bass_number:
DIGIT {
- $$ = scm_number_to_string (scm_from_int ($1), scm_from_int (10));
- $$ = scm_list_2 (ly_lily_module_constant ("number-markup"),
- $$);
+ $$ = scm_from_int ($1);
}
| UNSIGNED {
- $$ = scm_number_to_string (scm_from_int ($1), scm_from_int (10));
- $$ = scm_list_2 (ly_lily_module_constant ("number-markup"),
- $$);
+ $$ = scm_from_int ($1);
}
| STRING { $$ = $1; }
| full_markup { $$ = $1; }
;
-bass_mod:
+figured_bass_alteration:
'-' { $$ = -2; }
| '+' { $$ = 2; }
| '!' { $$ = 0; }
bass_figure:
FIGURE_SPACE {
- Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent");
- $$ = bfr->self_scm ();
- bfr->unprotect ();
+ Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent", @$);
+ $$ = bfr->unprotect ();
}
| bass_number {
- Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent");
+ Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent", @$);
$$ = bfr->self_scm ();
- bfr->set_property ("figure", $1);
+ if (scm_is_number ($1))
+ bfr->set_property ("figure", $1);
+ else if (Text_interface::is_markup ($1))
+ bfr->set_property ("text", $1);
+
bfr->unprotect ();
}
- | bass_figure bass_mod {
+ | bass_figure ']' {
+ $$ = $1;
+ unsmob_music ($1)->set_property ("bracket-stop", SCM_BOOL_T);
+ }
+ | bass_figure figured_bass_alteration {
Music *m = unsmob_music ($1);
if ($2) {
SCM salter = m->get_property ("alteration");
m->set_property ("alteration", scm_from_int (0));
}
}
+ | bass_figure figured_bass_modification {
+ Music *m = unsmob_music ($1);
+ if ($2 == ly_symbol2scm ("plus"))
+ {
+ m->set_property ("augmented", SCM_BOOL_T);
+ }
+ else if ($2 == ly_symbol2scm ("slash"))
+ {
+ m->set_property ("diminished", SCM_BOOL_T);
+ }
+ else if ($2 == ly_symbol2scm ("exclamation"))
+ {
+ m->set_property ("no-continuation", SCM_BOOL_T);
+ }
+ }
;
-br_bass_figure:
- '[' bass_figure {
- $$ = $2;
- unsmob_music ($$)->set_property ("bracket-start", SCM_BOOL_T);
+
+figured_bass_modification:
+ E_PLUS {
+ $$ = ly_symbol2scm ("plus");
}
- | bass_figure {
- $$ = $1;
+ | E_EXCLAMATION {
+ $$ = ly_symbol2scm ("exclamation");
}
- | br_bass_figure ']' {
+ | '/' {
+ $$ = ly_symbol2scm ("slash");
+ }
+ ;
+
+br_bass_figure:
+ bass_figure {
$$ = $1;
- unsmob_music ($1)->set_property ("bracket-stop", SCM_BOOL_T);
+ }
+ | '[' bass_figure {
+ $$ = $2;
+ unsmob_music ($$)->set_property ("bracket-start", SCM_BOOL_T);
}
;
figure_spec:
FIGURE_OPEN figure_list FIGURE_CLOSE {
- Music *m = MY_MAKE_MUSIC ("EventChord");
- $2 = scm_reverse_x ($2, SCM_EOL);
- m->set_property ("elements", $2);
- $$ = m->self_scm ();
+ $$ = scm_reverse_x ($2, SCM_EOL);
}
;
simple_element:
pitch exclamations questions octave_check optional_notemode_duration optional_rest {
- if (!THIS->lexer_->is_note_state ())
- THIS->parser_error (@1, _ ("have to be in Note mode for notes"));
+ 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");
+ n = MY_MAKE_MUSIC ("RestEvent", @$);
else
- n = MY_MAKE_MUSIC ("NoteEvent");
+ n = MY_MAKE_MUSIC ("NoteEvent", @$);
n->set_property ("pitch", $1);
n->set_property ("duration", $5);
if ($2 % 2 || $3 % 2)
n->set_property ("force-accidental", SCM_BOOL_T);
- Music *v = MY_MAKE_MUSIC ("EventChord");
- v->set_property ("elements", scm_list_1 (n->self_scm ()));
- n->unprotect ();
-
- v->set_spot (@$);
- n->set_spot (@$);
- $$ = v;
+ $$ = n->unprotect ();
}
| DRUM_PITCH optional_notemode_duration {
- Music *n = MY_MAKE_MUSIC ("NoteEvent");
+ Music *n = MY_MAKE_MUSIC ("NoteEvent", @$);
n->set_property ("duration", $2);
n->set_property ("drum-type", $1);
- Music *v = MY_MAKE_MUSIC ("EventChord");
- v->set_property ("elements", scm_list_1 (n->self_scm ()));
- n->unprotect ();
- v->set_spot (@$);
- n->set_spot (@$);
- $$ = v;
-
+ $$ = n->unprotect ();
}
- | figure_spec optional_notemode_duration {
- Music *m = unsmob_music ($1);
- m->set_spot (@$);
- for (SCM s = m->get_property ("elements"); scm_is_pair (s); s = scm_cdr (s))
- {
- unsmob_music (scm_car (s))->set_property ("duration", $2);
- }
- $$ = m;
- }
| RESTNAME optional_notemode_duration {
Music *ev = 0;
if (ly_scm2string ($1) == "s") {
/* Space */
- ev = MY_MAKE_MUSIC ("SkipEvent");
+ ev = MY_MAKE_MUSIC ("SkipEvent", @$);
}
else {
- ev = MY_MAKE_MUSIC ("RestEvent");
+ ev = MY_MAKE_MUSIC ("RestEvent", @$);
}
ev->set_property ("duration", $2);
- ev->set_spot (@$);
- Music *velt = MY_MAKE_MUSIC ("EventChord");
- velt->set_property ("elements", scm_list_1 (ev->self_scm ()));
- velt->set_spot (@$);
-
- ev->unprotect();
-
- $$ = velt;
- }
- | MULTI_MEASURE_REST optional_notemode_duration {
- SCM proc = ly_lily_module_constant ("make-multi-measure-rest");
- SCM mus = scm_call_2 (proc, $2, make_input (@$));
- $$ = unsmob_music (mus);
- $$->protect ();
+ $$ = ev->unprotect ();
}
-
| lyric_element optional_notemode_duration {
- if (!THIS->lexer_->is_lyric_state ())
- THIS->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"));
- Music *levent = MY_MAKE_MUSIC ("LyricEvent");
+ Music *levent = MY_MAKE_MUSIC ("LyricEvent", @$);
levent->set_property ("text", $1);
levent->set_property ("duration",$2);
- levent->set_spot (@$);
- Music *velt = MY_MAKE_MUSIC ("EventChord");
- velt->set_property ("elements", scm_list_1 (levent->self_scm ()));
-
- $$= velt;
+ $$= levent->unprotect ();
}
+ ;
+
+simple_chord_elements:
+ simple_element {
+ $$ = scm_list_1 ($1);
+ }
| new_chord {
- if (!THIS->lexer_->is_chord_state ())
- THIS->parser_error (@1, _ ("have to be in Chord mode for chords"));
- $$ = unsmob_music ($1);
+ if (!PARSER->lexer_->is_chord_state ())
+ PARSER->parser_error (@1, _ ("have to be in Chord mode for chords"));
+ $$ = $1;
}
+ | figure_spec optional_notemode_duration {
+ for (SCM s = $1; scm_is_pair (s); s = scm_cdr (s))
+ {
+ unsmob_music (scm_car (s))->set_property ("duration", $2);
+ }
+ $$ = $1;
+ }
;
lyric_element:
new_chord:
steno_tonic_pitch optional_notemode_duration {
- $$ = make_chord ($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 ($1, $2, scm_cons ($3, its));
+ $$ = make_chord_elements ($1, $2, scm_cons ($3, its));
}
;
$$ = $1;
}
| LYRIC_MARKUP
- { THIS->lexer_->push_markup_state (); }
+ { PARSER->lexer_->push_markup_state (); }
markup_top {
$$ = $3;
- THIS->lexer_->pop_state ();
+ PARSER->lexer_->pop_state ();
}
;
$$ = $1;
}
| MARKUP
- { THIS->lexer_->push_markup_state (); }
+ { PARSER->lexer_->push_markup_state (); }
markup_top {
$$ = $3;
- THIS->lexer_->pop_state ();
+ PARSER->lexer_->pop_state ();
}
;
$$ = $1;
}
| SCORE {
- SCM nn = THIS->lexer_->lookup_identifier ("pitchnames");
- THIS->lexer_->push_note_state (alist_to_hashq (nn));
+ SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames");
+ PARSER->lexer_->push_note_state (alist_to_hashq (nn));
} '{' score_body '}' {
Score * sc = $4;
$$ = scm_list_2 (ly_lily_module_constant ("score-markup"), sc->self_scm ());
sc->unprotect ();
- THIS->lexer_->pop_state ();
+ PARSER->lexer_->pop_state ();
}
| MARKUP_HEAD_SCM0 embedded_scm {
$$ = scm_list_2 ($1, $2);
%%
void
-Lily_parser::set_yydebug (bool )
+Lily_parser::set_yydebug (bool x)
{
-#if 0
- yydebug = 1;
-#endif
+ yydebug = x;
}
void
if (scm_is_string (sid)) {
*destination = sid;
return STRING_IDENTIFIER;
+ } else if (unsmob_book (sid)) {
+ Book *book = unsmob_book (sid)->clone ();
+ *destination = book->self_scm ();
+ book->unprotect ();
+
+ return BOOK_IDENTIFIER;
} else if (scm_is_number (sid)) {
*destination = sid;
return NUMBER_IDENTIFIER;
} else if (unsmob_context_def (sid)) {
- *destination = unsmob_context_def (sid)->clone_scm ();
+ Context_def *def= unsmob_context_def (sid)->clone ();
+
+ *destination = def->self_scm ();
+ def->unprotect ();
+
return CONTEXT_DEF_IDENTIFIER;
} else if (unsmob_score (sid)) {
Score *score = new Score (*unsmob_score (sid));
*destination = score->self_scm ();
+
+ score->unprotect ();
return SCORE_IDENTIFIER;
} else if (Music *mus = unsmob_music (sid)) {
mus = mus->clone ();
bool is_event = scm_memq (ly_symbol2scm ("event"), mus->get_property ("types"))
!= SCM_BOOL_F;
+ mus->unprotect ();
return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER;
} else if (unsmob_duration (sid)) {
*destination = unsmob_duration (sid)->smobbed_copy ();
} else if (unsmob_output_def (sid)) {
Output_def *p = unsmob_output_def (sid);
p = p->clone ();
-
+
*destination = p->self_scm ();
+ p->unprotect ();
return OUTPUT_DEF_IDENTIFIER;
- } else if (Text_interface::markup_p (sid)) {
+ } else if (Text_interface::is_markup (sid)) {
*destination = sid;
if (is_lyric_state ())
return LYRIC_MARKUP_IDENTIFIER;
return -1;
}
-Music *
-property_op_to_music (SCM op)
+SCM
+get_next_unique_context_id ()
{
- Music *m = 0;
- SCM tag = scm_car (op);
- SCM symbol = scm_cadr (op);
- SCM args = scm_cddr (op);
- SCM grob_val = SCM_UNDEFINED;
- SCM grob_sym = SCM_UNDEFINED;
- SCM val = SCM_UNDEFINED;
-
- if (tag == ly_symbol2scm ("assign"))
- {
- m = MY_MAKE_MUSIC ("PropertySet");
- val = scm_car (args);
- }
- else if (tag == ly_symbol2scm ("unset"))
- m = MY_MAKE_MUSIC ("PropertyUnset");
- else if (tag == ly_symbol2scm ("poppush")
- || tag == ly_symbol2scm ("push"))
- {
- m = MY_MAKE_MUSIC ("OverrideProperty");
- grob_sym = scm_car (args);
- grob_val = scm_cadr (args);
- }
- else if (tag == ly_symbol2scm ("pop")) {
- m = MY_MAKE_MUSIC ("RevertProperty");
- grob_sym = scm_car (args);
- }
+ return scm_makfrom0str ("$uniqueContextId");
+}
+
+
+SCM
+get_next_unique_lyrics_context_id ()
+{
+ static int new_context_count;
+ char s[128];
+ snprintf (s, sizeof (s)-1, "uniqueContext%d", new_context_count++);
+ return scm_makfrom0str (s);
+}
+
- m->set_property ("symbol", symbol);
+SCM
+run_music_function (Lily_parser *parser, SCM expr)
+{
+ SCM func = scm_car (expr);
+ Input *loc = unsmob_input (scm_cadr (expr));
+ SCM args = scm_cddr (expr);
+ SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature"));
- if (val != SCM_UNDEFINED)
- m->set_property ("value", val);
- if (grob_val != SCM_UNDEFINED)
- m->set_property ("grob-value", grob_val);
+ SCM type_check_proc = ly_lily_module_constant ("type-check-list");
- if (grob_sym != SCM_UNDEFINED)
- {
- bool itc = do_internal_type_checking_global;
- /* UGH.
- */
- bool autobeam = ly_is_equal (symbol, ly_symbol2scm ("autoBeamSettings"));
- if (autobeam)
- do_internal_type_checking_global = false;
- m->set_property ("grob-property", grob_sym);
- if (autobeam)
- do_internal_type_checking_global = itc;
- }
+ if (!to_boolean (scm_call_3 (type_check_proc, scm_cadr (expr), sig, args)))
+ {
+ parser->error_level_ = 1;
+ return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("void-music"), scm_list_2 (parser->self_scm (), make_input (*loc)));
+ }
+
+ SCM syntax_args = scm_list_4 (parser->self_scm (), make_input (*loc), func, args);
+ return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("music-function"), syntax_args);
+}
+
+bool
+is_regular_identifier (SCM id)
+{
+ string str = ly_scm2string (id);
+ char const *s = str.c_str ();
+
+ bool v = true;
+#if 0
+ isalpha (*s);
+ s++;
+#endif
+ while (*s && v)
+ {
+ v = v && isalnum (*s);
+ s++;
+ }
+ return v;
+}
+
+Music *
+make_music_with_input (SCM name, Input where)
+{
+ Music *m = make_music_by_name (name);
+ m->set_spot (where);
+ return m;
+}
- if (tag == ly_symbol2scm ("poppush"))
- m->set_property ("pop-first", SCM_BOOL_T);
+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 a;
+}
- return m;
+bool
+is_duration (int t)
+{
+ return t && t == 1 << intlog2 (t);
}
-Music*
-context_spec_music (SCM type, SCM id, Music *m, SCM ops)
+void
+set_music_properties (Music *p, SCM a)
{
- Music *csm = MY_MAKE_MUSIC ("ContextSpeccedMusic");
+ for (SCM k = a; scm_is_pair (k); k = scm_cdr (k))
+ p->set_property (scm_caar (k), scm_cdar (k));
+}
- csm->set_property ("element", m->self_scm ());
- m->unprotect ();
- csm->set_property ("context-type",
- scm_is_symbol (type) ? type : scm_string_to_symbol (type));
- csm->set_property ("property-operations", ops);
+SCM
+make_chord_step (int step, int alter)
+{
+ if (step == 7)
+ alter += FLAT;
- if (scm_is_string (id))
- csm->set_property ("context-id", id);
- return csm;
+ while (step < 0)
+ step += 7;
+ Pitch m ((step -1) / 7, (step - 1) % 7, alter);
+ return m.smobbed_copy ();
}
+
SCM
-get_next_unique_context_id ()
+make_chord_elements (SCM pitch, SCM dur, SCM modification_list)
{
- return scm_makfrom0str ("$uniqueContextId");
+ SCM chord_ctor = ly_lily_module_constant ("construct-chord-elements");
+ return scm_call_3 (chord_ctor, pitch, dur, modification_list);
}
+/* Todo: actually also use apply iso. call too ... */
+bool
+ly_input_procedure_p (SCM x)
+{
+ return ly_is_procedure (x)
+ || (scm_is_pair (x) && ly_is_procedure (scm_car (x)));
+}
+
SCM
-get_next_unique_lyrics_context_id ()
+make_music_relative (Pitch start, SCM music, Input loc)
{
- static int new_context_count;
- char s[128];
- snprintf (s, 1024, "uniqueContext%d", new_context_count++);
- return scm_makfrom0str (s);
+ Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic", loc);
+ relative->set_property ("element", music);
+
+ Music *m = unsmob_music (music);
+ Pitch last = m->to_relative_octave (start);
+ if (lily_1_8_relative)
+ m->set_property ("last-pitch", last.smobbed_copy ());
+ return relative->unprotect ();
+}
+
+int
+yylex (YYSTYPE *s, YYLTYPE *loc, void *v)
+{
+ Lily_parser *pars = (Lily_parser*) v;
+ Lily_lexer *lex = pars->lexer_;
+
+ lex->lexval = (void*) s;
+ lex->lexloc = loc;
+ lex->prepare_for_next_token ();
+ return lex->yylex ();
}
projects / lilypond.git / blobdiff