-%{ // -*-Fundamental-*-
-
+/* -*- mode: c++; c-file-style: "linux" -*- */
/*
- parser.yy -- Bison/C++ parser for LilyPond
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
-
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
-*/
-/*
-FIXME:
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- * The rules for who is protecting what are very shady. Uniformise
- this.
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- * There are too many lexical modes?
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "config.hh"
+/* 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.
+ */
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
+%{
+#define yyerror Lily_parser::parser_error
-#include "book.hh"
-#include "context-def.hh"
-#include "dimensions.hh"
-#include "event.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 "scm-option.hh"
-#include "score.hh"
-#include "text-interface.hh"
-#include "warn.hh"
+/* We use custom location type: Input objects */
+#define YYLTYPE Input
+#define YYLLOC_DEFAULT(Current,Rhs,N) \
+ ((Current).set_location ((Rhs)[1], (Rhs)[N]))
-#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
+%parse-param {Lily_parser *parser}
+%lex-param {Lily_parser *parser}
+%error-verbose
+%debug
-#define YYERROR_VERBOSE 1
+/* We use SCMs to do strings, because it saves us the trouble of
+deleting them. Let's hope that a stack overflow doesn't trigger a move
+of the parse stack onto the heap. */
-#define YYPARSE_PARAM my_lily_parser
-#define YYLEX_PARAM my_lily_parser
-#define THIS\
- ((Lily_parser *) my_lily_parser)
+%left PREC_BOT
+%nonassoc REPEAT
+%nonassoc ALTERNATIVE
-#define yyerror THIS->parser_error
+/* The above precedences tackle the shift/reduce problem
-/* We use custom location type: Input objects */
-#define YYLTYPE Input
-#define YYLLOC_DEFAULT(Current,Rhs,N) \
- ((Current).set_location ((Rhs)[1], (Rhs)[N]))
+1. \repeat
+ \repeat .. \alternative
+ \repeat { \repeat .. \alternative }
-/* Add symbols to the TAGS field of a music object. */
+or
-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_c_list_p (tag))
- tags = ly_append2 (tag, tags);
- else
- ip.warning (_ ("tag must be symbol or list of symbols"));
-
- m->set_property ("tags", tags);
-}
+ \repeat { \repeat } \alternative
+*/
-bool
-is_regular_identifier (SCM id)
-{
- String str = ly_scm2string (id);
- char const *s = str.to_str0 ();
+%nonassoc COMPOSITE
+%left ADDLYRICS
- bool v = true;
-#if 0
- isalpha (*s);
- s++;
-#endif
- while (*s && v)
- {
- v = v && isalnum (*s);
- s++;
- }
- return v;
-}
+ /* ADDLYRICS needs to have lower precedence than argument scanning,
+ * or we won't be able to tell music apart from closed_music without
+ * lookahead in the context of function calls.
+ */
+%nonassoc DEFAULT
-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;
-}
+ /* \default is only applied after exhausting function arguments */
-SCM
-make_simple_markup (SCM a)
-{
- SCM simple = ly_lily_module_constant ("simple-markup");
- return scm_list_2 (simple, a);
-}
+%nonassoc FUNCTION_ARGLIST
-bool
-is_duration (int t)
-{
- return t && t == 1 << intlog2 (t);
-}
+ /* expressions with units are permitted into argument lists */
-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));
-}
+%right PITCH_IDENTIFIER NOTENAME_PITCH TONICNAME_PITCH
+ UNSIGNED REAL DURATION_IDENTIFIER ':'
-SCM
-make_chord_step (int step, int alter)
-{
- if (step == 7)
- alter += FLAT;
+ /* The above are the symbols that can start optional function arguments
+ that are recognized in the grammar rather than by predicate
+ */
- while (step < 0)
- step += 7;
- Pitch m ((step -1) / 7, (step - 1) % 7, alter);
- return m.smobbed_copy ();
-}
+%nonassoc NUMBER_IDENTIFIER '/'
+ /* Number-unit expressions, where permitted, are concatenated into
+ * function arguments, just like fractions and tremoli. Tremoli must
+ * not have higher precedence than UNSIGNED, or Lilypond will not
+ * join ':' with a following optional number.
+ */
-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);
- scm_gc_protect_object (ch);
- return ch;
-}
+%left PREC_TOP
-/* Todo: actually also use apply iso. call too ... */
-bool
-ly_input_procedure_p (SCM x)
-{
- return ly_c_procedure_p (x)
- || (scm_is_pair (x) && ly_c_procedure_p (scm_car (x)));
-}
-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;
-}
-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;
-}
-Music*
-make_lyric_combine_music (SCM name, Music *music)
+%pure_parser
+%locations
+
+
+
+%{ // -*-Fundamental-*-
+
+/*
+FIXME:
+
+ * The rules for who is protecting what are very shady. Uniformise
+ this.
+
+ * There are too many lexical modes?
+*/
+
+#include "config.hh"
+
+#include <cctype>
+#include <cstdlib>
+#include <cstdio>
+using namespace std;
+
+#include "book.hh"
+#include "context-def.hh"
+#include "context-mod.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 "output-def.hh"
+#include "paper-book.hh"
+#include "scm-hash.hh"
+#include "score.hh"
+#include "text-interface.hh"
+#include "warn.hh"
+
+void
+Lily_parser::parser_error (Input const *i, Lily_parser *parser, string s)
{
- Music *combine = MY_MAKE_MUSIC ("LyricCombineMusic");
- combine->set_property ("element", music->self_scm ());
- combine->set_property ("associated-context", name);
- return combine;
+ 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); \
+ } else { \
+ parser->parser_error \
+ (Location, _("Too much lookahead")); \
+ } \
+while (0)
+
+
+#define MYREPARSE(Location, Pred, Token, Value) \
+do \
+ if (yychar == YYEMPTY) \
+ { \
+ parser->lexer_->push_extra_token (Token, Value); \
+ parser->lexer_->push_extra_token (REPARSE, \
+ Pred); \
+ } else { \
+ parser->parser_error \
+ (Location, _("Too much lookahead")); \
+ } \
+while (0)
-/* 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. */
+%}
-%left ADDLYRICS
%union {
Book *book;
Output_def *outputdef;
SCM scm;
- String *string;
- Music *music;
+ std::string *string;
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))
+#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)))))
- \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 check_scheme_arg (Lily_parser *parser, Input loc,
+ SCM arg, SCM args, SCM pred);
+SCM loc_on_music (Input loc, SCM arg);
+SCM make_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list);
+SCM make_chord_step (int step, Rational alter);
+SCM make_simple_markup (SCM a);
+bool is_duration (int t);
+bool is_regular_identifier (SCM id);
+int yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser);
+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.
FIXME: Bison needs to translate some of these, eg, STRING.
-*/
-
+*/
+
/* Keyword tokens with plain escaped name. */
+%token END_OF_FILE 0 "end of input"
%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 BOOKPART "\\bookpart"
%token CHANGE "\\change"
%token CHORDMODE "\\chordmode"
%token CHORDS "\\chords"
-%token CLEF "\\clef"
%token CONSISTS "\\consists"
%token CONTEXT "\\context"
%token DEFAULT "\\default"
%token DRUMS "\\drums"
%token FIGUREMODE "\\figuremode"
%token FIGURES "\\figures"
-%token GROBDESCRIPTIONS "\\grobdescriptions"
%token HEADER "\\header"
-%token INVALID "\\invalid"
-%token KEY "\\key"
+%token INVALID "\\version-error"
%token LAYOUT "\\layout"
%token LYRICMODE "\\lyricmode"
%token LYRICS "\\lyrics"
%token LYRICSTO "\\lyricsto"
-%token MARK "\\mark"
%token MARKUP "\\markup"
+%token MARKUPLIST "\\markuplist"
%token MIDI "\\midi"
%token NAME "\\name"
%token NOTEMODE "\\notemode"
-%token OBJECTID "\\objectid"
-%token OCTAVE "\\octave"
-%token ONCE "\\once"
%token OVERRIDE "\\override"
%token PAPER "\\paper"
-%token PARTIAL "\\partial"
-%token RELATIVE "\\relative"
%token REMOVE "\\remove"
%token REPEAT "\\repeat"
%token REST "\\rest"
%token SEQUENTIAL "\\sequential"
%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"
/* Keyword token exceptions. */
-%token TIME_T "\\time"
%token NEWCONTEXT "\\new"
%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 HYPHEN "--"
%token CHORDMODIFIERS
-%token COMMANDSPANREQUEST
%token LYRIC_MARKUP
%token MULTI_MEASURE_REST
-%token SCM_T
-%token <i> DIGIT
%token <i> E_UNSIGNED
-%token <i> UNSIGNED
-
-%token <id> IDENTIFIER
-
+%token <scm> 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?"
+/* After the last argument. */
+%token <i> 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_MARKUP_IDENTIFIER
-%token <scm> MARKUP_HEAD_EMPTY
-%token <scm> MARKUP_HEAD_LIST0
-%token <scm> MARKUP_HEAD_MARKUP0
-%token <scm> MARKUP_HEAD_MARKUP0_MARKUP1
-%token <scm> MARKUP_HEAD_SCM0
-%token <scm> MARKUP_HEAD_SCM0_MARKUP1
-%token <scm> MARKUP_HEAD_SCM0_SCM1
-%token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2
-%token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
+%token <scm> MARKUP_FUNCTION
+%token <scm> MARKUP_LIST_FUNCTION
%token <scm> MARKUP_IDENTIFIER
+%token <scm> MARKUPLIST_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> OUTPUT_DEF_IDENTIFIER
%token <scm> REAL
%token <scm> RESTNAME
+%token <scm> SCM_FUNCTION
%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_block
%type <book> book_body
+%type <book> bookpart_block
+%type <book> bookpart_body
%type <i> bare_unsigned
-%type <i> bass_mod
+%type <scm> 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_req
-%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> braced_music_list
+%type <scm> closed_music
+%type <scm> music
+%type <scm> music_bare
+%type <scm> music_arg
+%type <scm> music_assign
+%type <scm> music_embedded
+%type <scm> music_or_context_def
+%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 <outputdef> paper_block
-%type <scm> Alternative_music
-%type <scm> Generic_prefix_music_scm
-%type <scm> Music_list
-%type <scm> absolute_pitch
+%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> 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> context_def_spec_block
%type <scm> context_def_spec_body
%type <scm> context_mod
+%type <scm> context_mod_arg
+%type <scm> context_mod_embedded
%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> 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_nonbackup_common
+%type <scm> function_arglist_closed_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_common_minus
+%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_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> maybe_notemode_duration
%type <scm> mode_changing_head
%type <scm> mode_changing_head_with_context
%type <scm> multiplied_duration
+%type <scm> music_function_call_closed
+%type <scm> music_function_chord_body
%type <scm> new_chord
%type <scm> new_lyrics
%type <scm> number_expression
%type <scm> number_factor
%type <scm> number_term
-%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> 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> step_numbers
%type <scm> string
+%type <scm> tempo_range
%type <score> score_block
%type <score> score_body
%%
-lilypond: /* empty */
+start_symbol:
+ lilypond
+ | EMBEDDED_LILY {
+ 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);
+ }
+ ;
+
+lilypond: /* empty */ { }
| lilypond toplevel_expression {
}
| lilypond assignment {
}
| lilypond error {
- THIS->error_level_ = 1;
+ parser->error_level_ = 1;
}
| lilypond INVALID {
- THIS->error_level_ = 1;
+ parser->error_level_ = 1;
}
;
-object_id_setting:
- OBJECTID STRING { $$ = $2; }
- ;
-
toplevel_expression:
- lilypond_header {
- THIS->lexer_->set_identifier (ly_symbol2scm ("$globalheader"), $1);
- }
- | add_quote {
-
+ {
+ parser->lexer_->add_scope (get_header (parser));
+ } lilypond_header {
+ parser->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $2);
}
| 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_gc_unprotect_object (book->self_scm ());
+ SCM proc = parser->lexer_->lookup_identifier ("toplevel-book-handler");
+ scm_call_2 (proc, parser->self_scm (), book->self_scm ());
+ book->unprotect ();
+ }
+ | 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 ();
}
| 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_gc_unprotect_object (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 ());
- scm_gc_unprotect_object (music->self_scm ());
+ | 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 (), scm_list_1 ($1));
+ }
+ | full_markup_list {
+ 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 ());
- scm_gc_unprotect_object (od->self_scm ());
+ parser->lexer_->set_identifier (id, od->self_scm ());
+ od->unprotect();
+ }
+ ;
+
+embedded_scm_bare:
+ SCM_TOKEN
+ {
+ $$ = parser->lexer_->eval_scm_token ($1);
}
+ | SCM_IDENTIFIER
;
-toplevel_music:
- Composite_music {
+embedded_scm_bare_arg:
+ embedded_scm_bare
+ | STRING
+ | STRING_IDENTIFIER
+ | full_markup
+ | 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 */
+
embedded_scm:
- SCM_T
- | SCM_IDENTIFIER
+ embedded_scm_bare
+ | scm_function_call
;
+embedded_scm_arg:
+ embedded_scm_bare_arg
+ | scm_function_call
+ | music_arg
+ ;
-lilypond_header_body:
+scm_function_call:
+ SCM_FUNCTION function_arglist {
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $1, $2);
+ }
+ ;
+
+embedded_lilypond:
+ /* empty */
{
- $$ = ly_make_anonymous_module (be_safe_global);
- THIS->lexer_->add_scope ($$);
+ $$ = MAKE_SYNTAX ("void-music", @$);
+ }
+ | identifier_init
+ | 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;
+ }
+ | INVALID embedded_lilypond {
+ parser->error_level_ = 1;
}
+ ;
+
+
+lilypond_header_body:
+ /* empty */
| 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);
+ }
+ | 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.
identifier_init:
score_block {
$$ = $1->self_scm ();
- scm_gc_unprotect_object ($$);
+ $1->unprotect ();
+ }
+ | book_block {
+ $$ = $1->self_scm ();
+ $1->unprotect ();
+ }
+ | bookpart_block {
+ $$ = $1->self_scm ();
+ $1->unprotect ();
}
| output_def {
$$ = $1->self_scm ();
- scm_gc_unprotect_object ($$);
+ $1->unprotect ();
}
| context_def_spec_block {
$$ = $1;
}
- | Music {
- $$ = $1->self_scm ();
- scm_gc_unprotect_object ($$);
+ | music_assign {
+ $$ = $1;
}
- | post_event {
- $$ = $1->self_scm ();
- scm_gc_unprotect_object ($$);
+ | post_event_nofinger {
+ $$ = $1;
}
| number_expression {
$$ = $1;
}
+ | FRACTION {
+ $$ = $1;
+ }
| string {
$$ = $1;
}
| full_markup {
$$ = $1;
}
- | DIGIT {
- $$ = scm_int2num ($1);
+ | full_markup_list {
+ $$ = $1;
}
+ | context_modification {
+ $$ = $1;
+ }
;
context_def_spec_block:
}
;
-context_def_spec_body:
- /**/ {
- $$ = Context_def::make_scm ();
- unsmob_context_def ($$)->set_spot (@$);
- }
- | CONTEXT_DEF_IDENTIFIER {
- $$ = $1;
- unsmob_context_def ($$)->set_spot (@$);
+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 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_def::make_scm ();
+ unsmob_context_def ($$)->origin ()->set_spot (@$);
+ }
+ | CONTEXT_DEF_IDENTIFIER {
+ $$ = $1;
+ unsmob_context_def ($$)->origin ()->set_spot (@$);
}
| context_def_spec_body context_mod {
- unsmob_context_def ($$)->add_context_mod ($2);
+ unsmob_context_def ($$)->add_context_mod ($2);
+ }
+ | context_def_spec_body context_modification {
+ 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));
+ }
+ }
+ | 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);
}
;
book_body:
{
$$ = new Book;
- $$->set_spot (@$);
- $$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
- scm_gc_unprotect_object ($$->paper_->self_scm ());
- $$->header_ = THIS->lexer_->lookup_identifier ("$globalheader");
+ 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_ = get_header (parser);
+ parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $$->self_scm ());
+ }
+ | BOOK_IDENTIFIER {
+ $$ = unsmob_book ($1);
+ $$->protect ();
+ $$->origin ()->set_spot (@$);
+ parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $1);
}
| book_body paper_block {
$$->paper_ = $2;
- scm_gc_unprotect_object ($2->self_scm ());
+ $2->unprotect ();
+ set_paper (parser, $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 ();
}
| book_body score_block {
- SCM s = $2->self_scm ();
- $$->add_score (s);
- scm_gc_unprotect_object (s);
+ Score *score = $2;
+ SCM proc = parser->lexer_->lookup_identifier ("book-score-handler");
+ scm_call_2 (proc, $$->self_scm (), score->self_scm ());
+ score->unprotect ();
+ }
+ | 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 ());
}
| book_body full_markup {
- $$->add_score ($2);
+ SCM proc = parser->lexer_->lookup_identifier ("book-text-handler");
+ scm_call_2 (proc, $$->self_scm (), scm_list_1 ($2));
}
- | book_body lilypond_header {
- $$->header_ = $2;
+ | book_body full_markup_list {
+ SCM proc = parser->lexer_->lookup_identifier ("book-text-handler");
+ scm_call_2 (proc, $$->self_scm (), $2);
}
+ | book_body
+ {
+ parser->lexer_->add_scope ($1->header_);
+ } lilypond_header
+ | book_body embedded_scm { }
| book_body error {
$$->paper_ = 0;
$$->scores_ = SCM_EOL;
+ $$->bookparts_ = SCM_EOL;
+ }
+ ;
+
+bookpart_block:
+ BOOKPART '{' bookpart_body '}' {
+ $$ = $3;
+ 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_IDENTIFIER {
+ $$ = unsmob_book ($1);
+ $$->protect ();
+ $$->origin ()->set_spot (@$);
+ parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $1);
+ }
+ | bookpart_body paper_block {
+ $$->paper_ = $2;
+ $2->unprotect ();
+ }
+ | 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 ();
+ }
+ | 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 ());
}
- | book_body object_id_setting {
- $$->user_key_ = ly_scm2string ($2);
+ | bookpart_body full_markup {
+ SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler");
+ scm_call_2 (proc, $$->self_scm (), 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
+ {
+ if (!ly_is_module ($1->header_))
+ $1->header_ = ly_make_module (false);
+ parser->lexer_->add_scope ($1->header_);
+ } lilypond_header
+ | bookpart_body embedded_scm { }
+ | bookpart_body error {
+ $$->paper_ = 0;
+ $$->scores_ = SCM_EOL;
}
;
;
score_body:
- /**/ {
- $$ = new Score;
- $$->set_spot (@$);
+ music {
+ SCM m = $1;
+ SCM scorify = ly_lily_module_constant ("scorify-music");
+ SCM score = scm_call_2 (scorify, m, parser->self_scm ());
+
+ // pass ownernship to C++ again.
+ $$ = unsmob_score (score);
+ $$->protect ();
+ $$->origin ()->set_spot (@$);
}
| SCORE_IDENTIFIER {
$$ = unsmob_score ($1);
- $$->set_spot (@$);
- }
- | score_body object_id_setting {
- $$->user_key_ = ly_scm2string ($2);
- }
- | score_body Music {
- SCM m = $2->self_scm ();
- scm_gc_unprotect_object (m);
- $$->set_music (m, THIS->self_scm ());
- }
- | score_body lilypond_header {
- $$->header_ = $2;
+ $$->protect ();
+ $$->origin ()->set_spot (@$);
}
+ | score_body
+ {
+ if (!ly_is_module ($1->get_header ()))
+ $1->set_header (ly_make_module (false));
+ parser->lexer_->add_scope ($1->get_header ());
+ } lilypond_header
| 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);
}
- scm_gc_unprotect_object ($2->self_scm ());
+ $2->unprotect ();
}
| score_body error {
$$->error_found_ = true;
$$ = $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;
+ }
+ ;
+
+// 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 '{' {
+ output_def_head_with_mode_switch '{' {
$$ = $1;
$$->input_origin_.set_spot (@$);
- THIS->lexer_->push_initial_state ();
}
- | output_def_head '{' OUTPUT_DEF_IDENTIFIER {
- scm_gc_unprotect_object ($1->self_scm ());
+ | 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);
- scm_gc_unprotect_object ($2->self_scm ());
+ | 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 ($$, $3);
+ else {
+
+ SCM proc = parser->lexer_->lookup_identifier
+ ("output-def-music-handler");
+ scm_call_3 (proc, parser->self_scm (),
+ $1->self_scm (), $3);
+ }
}
| 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_int2num ( $4));
+ TEMPO steno_duration '=' tempo_range {
+ $$ = MAKE_SYNTAX ("tempo", @$, SCM_EOL, $2, $4);
+ }
+ | TEMPO scalar_closed steno_duration '=' tempo_range {
+ $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, $5);
+ }
+ | TEMPO scalar {
+ $$ = MAKE_SYNTAX ("tempo", @$, $2);
}
;
/*
-The representation of a list is the
+The representation of a list is reversed to have efficient append. */
- (LIST . LAST-CONS)
-
- to have efficient append. */
-
-Music_list:
+music_list:
/* empty */ {
- $$ = scm_cons (SCM_EOL, SCM_EOL);
+ $$ = SCM_EOL;
}
- | Music_list Music {
- SCM s = $$;
- SCM c = scm_cons ($2->self_scm (), SCM_EOL);
- scm_gc_unprotect_object ($2->self_scm ()); /* UGH */
+ | music_list music_embedded {
+ if (unsmob_music ($2))
+ $$ = scm_cons ($2, $1);
+ }
+ | music_list error {
+ Music *m = MY_MAKE_MUSIC("Music", @$);
+ // ugh. code dup
+ m->set_property ("error-found", SCM_BOOL_T);
+ $$ = scm_cons (m->self_scm (), $1);
+ m->unprotect (); /* UGH */
+ }
+ ;
+
+braced_music_list:
+ '{' music_list '}'
+ {
+ $$ = scm_reverse_x ($2, SCM_EOL);
+ }
+ ;
+
+music: music_arg
+ | lyric_element_music
+ ;
- if (scm_is_pair (scm_cdr (s)))
- scm_set_cdr_x (scm_cdr (s), c); /* append */
+music_embedded:
+ music
+ | embedded_scm
+ {
+ if (unsmob_music ($1)
+ || scm_is_eq ($1, SCM_UNSPECIFIED))
+ $$ = $1;
else
- scm_set_car_x (s, c); /* set first cons */
- scm_set_cdr_x (s, c); /* remember last cell */
+ {
+ @$.warning (_ ("Ignoring non-music expression"));
+ $$ = SCM_UNSPECIFIED;
+ }
}
- | Music_list embedded_scm {
+ ;
+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 ();
+ }
}
- | Music_list error {
- Music * m = MY_MAKE_MUSIC("Music");
- // ugh. code dup
- m->set_property ("error-found", SCM_BOOL_T);
- SCM s = $$;
- SCM c = scm_cons (m->self_scm (), SCM_EOL);
- scm_gc_unprotect_object (m->self_scm ()); /* UGH */
+ | composite_music %prec COMPOSITE
+ ;
- if (scm_is_pair (scm_cdr (s)))
- scm_set_cdr_x (scm_cdr (s), c); /* append */
- else
- scm_set_car_x (s, c); /* set first cons */
- scm_set_cdr_x (s, c); /* remember last cell */
+music_assign:
+ simple_music
+ | composite_music %prec COMPOSITE
+ | lyric_element_music
+ ;
+
+repeated_music:
+ REPEAT simple_string unsigned_number music
+ {
+ $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, SCM_EOL);
+ }
+ | REPEAT simple_string unsigned_number music ALTERNATIVE braced_music_list
+ {
+ $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $6);
}
;
-Music:
- Simple_music
- | Composite_music
+sequential_music:
+ SEQUENTIAL braced_music_list {
+ $$ = MAKE_SYNTAX ("sequential-music", @$, $2);
+ }
+ | braced_music_list {
+ $$ = MAKE_SYNTAX ("sequential-music", @$, $1);
+ }
;
-Alternative_music:
- /* empty */ {
- $$ = SCM_EOL;
+simultaneous_music:
+ SIMULTANEOUS braced_music_list {
+ $$ = MAKE_SYNTAX ("simultaneous-music", @$, $2);
}
- | ALTERNATIVE '{' Music_list '}' {
- $$ = $3;
+ | DOUBLE_ANGLE_OPEN music_list DOUBLE_ANGLE_CLOSE {
+ $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_reverse_x ($2, SCM_EOL));
}
;
+simple_music:
+ event_chord
+ | music_property_def
+ | context_change
+ ;
-Repeated_music:
- REPEAT simple_string bare_unsigned Music Alternative_music
+context_modification:
+ WITH { parser->lexer_->push_initial_state (); } '{' context_mod_list '}'
+ {
+ parser->lexer_->pop_state ();
+ $$ = $4;
+ }
+ | WITH CONTEXT_MOD_IDENTIFIER
+ {
+ $$ = $2;
+ }
+ | CONTEXT_MOD_IDENTIFIER
+ {
+ $$ = $1;
+ }
+ | WITH embedded_scm_closed
{
- 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);
+ if (unsmob_context_mod ($2))
+ $$ = $2;
+ else {
+ parser->parser_error (@2, _ ("not a context mod"));
+ $$ = Context_mod ().smobbed_copy ();
}
+ }
+ ;
+optional_context_mod:
+ /**/ {
+ $$ = SCM_EOL;
+ }
+ | context_modification
+ {
+ $$ = $1;
+ }
+ ;
- SCM proc = ly_lily_module_constant ("make-repeated-music");
-
- SCM mus = scm_call_1 (proc, $2);
- scm_gc_protect_object (mus); // UGH.
- Music *r = unsmob_music (mus);
- if (beg)
- {
- r-> set_property ("element", beg->self_scm ());
- scm_gc_unprotect_object (beg->self_scm ());
- }
- r->set_property ("repeat-count", scm_int2num (times >? 1));
+context_mod_list:
+ /**/ {
+ $$ = Context_mod ().smobbed_copy ();
+ }
+ | context_mod_list context_mod {
+ unsmob_context_mod ($1)->add_context_mod ($2);
+ }
+ | context_mod_list CONTEXT_MOD_IDENTIFIER {
+ Context_mod *md = unsmob_context_mod ($2);
+ 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 ());
+ }
+ ;
- r-> set_property ("elements",alts);
- if (ly_c_equal_p ($2, scm_makfrom0str ("tremolo"))) {
- /*
- TODO: move this code to Scheme.
- */
+composite_music:
+ complex_music
+ | music_bare
+ ;
- /* 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");
+/* Music that can be parsed without lookahead */
+closed_music:
+ music_bare
+ | complex_music_prefix closed_music
+ {
+ $$ = FINISH_MAKE_SYNTAX ($1, @$, $2);
+ }
+ | music_function_call_closed
+ ;
- int dots = ($3 % 3) ? 0 : 1;
- int shift = -intlog2 ((dots) ? ($3*2/3) : $3);
+music_bare:
+ mode_changed_music
+ | MUSIC_IDENTIFIER
+ | grouped_music_list
+ ;
-
- 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_int2num (shift), scm_int2num (dots));
+grouped_music_list:
+ simultaneous_music { $$ = $1; }
+ | sequential_music { $$ = $1; }
+ ;
- }
- r->set_spot (*$4->origin ());
+/* An argument list. If a function \foo expects scm scm pitch, then the lexer expands \foo into the token sequence:
+ MUSIC_FUNCTION EXPECT_PITCH EXPECT_SCM EXPECT_SCM EXPECT_NO_MORE_ARGS
+and this rule returns the reversed list of arguments. */
- $$ = r;
- }
+function_arglist_skip:
+ function_arglist_common
+ | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_skip
+ {
+ $$ = scm_cons ($1, $3);
+ } %prec FUNCTION_ARGLIST
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_skip
+ {
+ $$ = scm_cons ($1, $3);
+ } %prec FUNCTION_ARGLIST
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip
+ {
+ $$ = scm_cons ($1, $3);
+ } %prec FUNCTION_ARGLIST
;
-Sequential_music:
- SEQUENTIAL '{' Music_list '}' {
- $$ = MY_MAKE_MUSIC ("SequentialMusic");
- $$->set_property ("elements", scm_car ($3));
- $$->set_spot (@$);
+
+function_arglist_nonbackup_common:
+ EXPECT_OPTIONAL EXPECT_PITCH function_arglist pitch_also_in_chords {
+ $$ = scm_cons ($4, $3);
}
- | '{' Music_list '}' {
- $$ = MY_MAKE_MUSIC ("SequentialMusic");
- $$->set_property ("elements", scm_car ($2));
- $$->set_spot (@$);
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed duration_length {
+ $$ = scm_cons ($4, $3);
}
- ;
-
-Simultaneous_music:
- SIMULTANEOUS '{' Music_list '}'{
- $$ = MY_MAKE_MUSIC ("SimultaneousMusic");
- $$->set_property ("elements", scm_car ($3));
- $$->set_spot (@$);
-
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed FRACTION
+ {
+ $$ = check_scheme_arg (parser, @4, $4, $3, $2);
}
- | simul_open Music_list simul_close {
- $$ = MY_MAKE_MUSIC ("SimultaneousMusic");
- $$->set_property ("elements", scm_car ($2));
- $$->set_spot (@$);
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed post_event_nofinger
+ {
+ $$ = check_scheme_arg (parser, @4, $4, $3, $2);
}
- ;
-
-Simple_music:
- event_chord { $$ = $1; }
- | MUSIC_IDENTIFIER {
- $$ = unsmob_music ($1);
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed '-' UNSIGNED
+ {
+ SCM n = scm_difference ($5, SCM_UNDEFINED);
+ if (scm_is_true (scm_call_1 ($2, n)))
+ $$ = scm_cons (n, $3);
+ else {
+ Music *t = MY_MAKE_MUSIC ("FingeringEvent", @5);
+ t->set_property ("digit", $5);
+ $$ = t->unprotect ();
+ if (scm_is_true (scm_call_1 ($2, $$)))
+ $$ = scm_cons ($$, $3);
+ else
+ $$ = check_scheme_arg (parser, @4, n, $3, $2);
+ }
+
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed '-' REAL
+ {
+ $$ = check_scheme_arg (parser, @4,
+ scm_difference ($5, SCM_UNDEFINED),
+ $3, $2);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed '-' NUMBER_IDENTIFIER
+ {
+ $$ = check_scheme_arg (parser, @4,
+ scm_difference ($5, SCM_UNDEFINED),
+ $3, $2);
}
- | music_property_def
- | context_change
;
-
-optional_context_mod:
- /**/ { $$ = SCM_EOL; }
- | WITH { THIS->lexer_->push_initial_state (); }
- '{' context_mod_list '}'
+function_arglist_closed_nonbackup:
+ function_arglist_nonbackup_common
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg_closed
{
- THIS->lexer_->pop_state ();
- $$ = $4;
+ $$ = 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);
}
;
-context_mod_list:
- /* */ { $$ = SCM_EOL; }
- | context_mod_list context_mod {
- $$ = scm_cons ($2, $1);
+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);
}
;
-
-Composite_music:
- Prefix_composite_music { $$ = $1; }
- | Grouped_music_list { $$ = $1; }
+function_arglist_keep:
+ function_arglist_common
+ | function_arglist_backup
;
-Grouped_music_list:
- Simultaneous_music { $$ = $1; }
- | Sequential_music { $$ = $1; }
+function_arglist_closed_keep:
+ function_arglist_closed_common
+ | function_arglist_backup
;
-Generic_prefix_music_scm:
- MUSIC_FUNCTION {
- $$ = scm_list_2 ($1, make_input (@$));
+function_arglist_backup:
+ EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep embedded_scm_arg_closed
+ {
+ if (scm_is_true (scm_call_1 ($2, $4)))
+ {
+ $$ = scm_cons ($4, $3);
+ } else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (SCM_IDENTIFIER, $4, @4);
+ }
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep post_event_nofinger
+ {
+ if (scm_is_true (scm_call_1 ($2, $4)))
+ {
+ $$ = scm_cons ($4, $3);
+ } else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (EVENT_IDENTIFIER, $4, @4);
+ }
}
- | MUSIC_FUNCTION_SCM embedded_scm {
- $$ = scm_list_3 ($1, make_input (@$), $2);
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep lyric_element
+ {
+ // There is no point interpreting a lyrics string as
+ // an event, since we don't allow music possibly
+ // followed by durations or postevent into closed
+ // music, and we only accept closed music in optional
+ // arguments at the moment. If this changes, more
+ // complex schemes might become interesting here as
+ // well: see how we do this at the mandatory argument
+ // point.
+ if (scm_is_true (scm_call_1 ($2, $4)))
+ $$ = scm_cons ($4, $3);
+ else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (LYRICS_STRING, $4, @4);
+ }
}
- | MUSIC_FUNCTION_MARKUP full_markup {
- $$ = scm_list_3 ($1, make_input (@$), $2);
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep UNSIGNED
+ {
+ if (scm_is_true (scm_call_1 ($2, $4)))
+ {
+ $$ = $3;
+ MYREPARSE (@4, $2, UNSIGNED, $4);
+ } else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (UNSIGNED, $4, @4);
+ }
}
- | MUSIC_FUNCTION_MUSIC Music {
- $$ = scm_list_3 ($1, make_input (@$), $2->self_scm ());
- scm_gc_unprotect_object ($2->self_scm ());
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep REAL
+ {
+ if (scm_is_true (scm_call_1 ($2, $4)))
+ {
+ $$ = $3;
+ MYREPARSE (@4, $2, REAL, $4);
+ } else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (REAL, $4, @4);
+ }
}
- | MUSIC_FUNCTION_SCM_MUSIC embedded_scm Music {
- $$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ());
- scm_gc_unprotect_object ($3->self_scm ());
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep NUMBER_IDENTIFIER
+ {
+ if (scm_is_true (scm_call_1 ($2, $4)))
+ {
+ $$ = scm_cons ($4, $3);
+ } else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (NUMBER_IDENTIFIER, $4, @4);
+ }
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep FRACTION
+ {
+ if (scm_is_true (scm_call_1 ($2, $4)))
+ {
+ $$ = scm_cons ($4, $3);
+ } else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ 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 ('-');
+ }
+ }
+
}
- | MUSIC_FUNCTION_SCM_SCM embedded_scm embedded_scm {
- $$ = scm_list_4 ($1, make_input (@$), $2, $3);
+ | 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);
+ }
}
- | MUSIC_FUNCTION_SCM_SCM_MUSIC embedded_scm embedded_scm Music {
- $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4->self_scm ());
+ | 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);
+ }
}
- | MUSIC_FUNCTION_MARKUP_MUSIC full_markup Music {
- $$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ());
- scm_gc_unprotect_object ($3->self_scm ());
+ | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_keep pitch_also_in_chords
+ {
+ $$ = scm_cons ($4, $3);
}
- | MUSIC_FUNCTION_MARKUP_MARKUP full_markup full_markup {
- $$ = scm_list_4 ($1, make_input (@$), $2, $3);
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_keep duration_length
+ {
+ $$ = scm_cons ($4, $3);
}
- | MUSIC_FUNCTION_MUSIC_MUSIC Music Music {
- $$ = scm_list_4 ($1, make_input (@$), $2->self_scm (), $3->self_scm ());
- scm_gc_unprotect_object ($2->self_scm ());
- scm_gc_unprotect_object ($3->self_scm ());
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup BACKUP
+ {
+ $$ = scm_cons ($1, $3);
+ MYBACKUP(0, SCM_UNDEFINED, @3);
}
- | MUSIC_FUNCTION_SCM_MUSIC_MUSIC embedded_scm Music Music {
- $$ = scm_list_5 ($1, make_input (@$), $2, $3->self_scm (), $4->self_scm ());
- scm_gc_unprotect_object ($4->self_scm ());
- scm_gc_unprotect_object ($3->self_scm ());
+ | function_arglist_backup REPARSE embedded_scm_arg_closed
+ {
+ $$ = check_scheme_arg (parser, @3,
+ $3, $1, $2);
}
- | MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC full_markup Music Music {
- $$ = scm_list_5 ($1, make_input (@$), $2, $3->self_scm (), $4->self_scm ());
- scm_gc_unprotect_object ($3->self_scm ());
- scm_gc_unprotect_object ($4->self_scm ());
+ | function_arglist_backup REPARSE bare_number
+ {
+ $$ = check_scheme_arg (parser, @3,
+ $3, $1, $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"));
+function_arglist:
+ function_arglist_common
+ | function_arglist_nonbackup
+ ;
- SCM type_check_proc = ly_lily_module_constant ("type-check-list");
- bool ok = true;
+function_arglist_common:
+ function_arglist_bare
+ | EXPECT_SCM function_arglist_optional embedded_scm_arg
+ {
+ $$ = check_scheme_arg (parser, @3,
+ $3, $2, $1);
+ }
+ | EXPECT_SCM function_arglist_closed_optional bare_number
+ {
+ $$ = check_scheme_arg (parser, @3,
+ $3, $2, $1);
+ }
+ | EXPECT_SCM function_arglist_closed_optional FRACTION
+ {
+ $$ = check_scheme_arg (parser, @3,
+ $3, $2, $1);
+ }
+ | EXPECT_SCM function_arglist_closed_optional post_event_nofinger
+ {
+ $$ = check_scheme_arg (parser, @3,
+ $3, $2, $1);
+ }
+ | function_arglist_common_minus
+ | function_arglist_common_lyric
+ ;
- if (!to_boolean (scm_call_3 (type_check_proc, scm_cadr ($1), sig, args)))
+function_arglist_common_lyric:
+ EXPECT_SCM function_arglist_optional lyric_element
+ {
+ // We check how the predicate thinks about a lyrics
+ // event or about a markup. If it accepts neither, we
+ // backup the original token. Otherwise we commit to
+ // taking the token. Depending on what the predicate
+ // is willing to accept, we interpret as a string, as
+ // a lyric event, or ambiguously (meaning that if
+ // something looking like a duration or post event
+ // follows, we take the event, otherwise the string).
+ SCM lyric_event = MAKE_SYNTAX ("lyric-event", @3, $3,
+ parser->default_duration_.smobbed_copy ());
+ if (scm_is_true (scm_call_1 ($1, $3)))
+ if (scm_is_true (scm_call_1 ($1, lyric_event)))
+ {
+ $$ = $2;
+ MYREPARSE (@3, $1, LYRICS_STRING, $3);
+ } else {
+ $$ = scm_cons ($3, $2);
+ }
+ else if (scm_is_true (scm_call_1 ($1, lyric_event)))
{
- THIS->error_level_ = 1;
- ok = false;
+ $$ = $2;
+ MYREPARSE (@3, $1, LYRIC_ELEMENT, $3);
+ } else {
+ // This is going to flag a syntax error, we
+ // know the predicate to be false.
+ check_scheme_arg (parser, @3,
+ $3, $2, $1);
}
+ }
+ | function_arglist_common_lyric REPARSE lyric_element_arg
+ {
+ // This should never be false
+ $$ = check_scheme_arg (parser, @3,
+ $3, $1, $2);
+ }
+ ;
- SCM m = SCM_EOL;
- if (ok)
- m = scm_apply_0 (func, scm_cons (THIS->self_scm(),
- scm_cdr ($1)));
-
- if (unsmob_music (m))
- {
- $$ = unsmob_music (m);
- scm_gc_protect_object (m);
- }
- else
- {
- if (ok)
- loc->error (_ ("music head function must return Music object"));
- $$ = MY_MAKE_MUSIC ("Music");
- }
- $$->set_spot (*loc);
+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_closed_nonbackup
+ ;
-Prefix_composite_music:
- Generic_prefix_music {
- $$ = $1;
+function_arglist_closed_common:
+ function_arglist_bare
+ | EXPECT_SCM function_arglist_optional embedded_scm_arg_closed
+ {
+ $$ = check_scheme_arg (parser, @3,
+ $3, $2, $1);
}
- | CONTEXT simple_string '=' simple_string optional_context_mod Music {
- $$ = context_spec_music ($2, $4, $6, $5);
-
+ | EXPECT_SCM function_arglist_closed_optional bare_number
+ {
+ $$ = check_scheme_arg (parser, @3,
+ $3, $2, $1);
+ }
+ | EXPECT_SCM function_arglist_closed_optional '-' UNSIGNED
+ {
+ SCM n = scm_difference ($4, SCM_UNDEFINED);
+ if (scm_is_true (scm_call_1 ($1, n))) {
+ $$ = scm_cons (n, $2);
+ } else {
+ Music *t = MY_MAKE_MUSIC ("FingeringEvent", @4);
+ t->set_property ("digit", $4);
+ $$ = t->unprotect ();
+ if (scm_is_true (scm_call_1 ($1, $$)))
+ $$ = scm_cons ($$, $2);
+ else
+ $$ = check_scheme_arg (parser, @3, n, $2, $1);
+ }
+
}
- | CONTEXT simple_string optional_context_mod Music {
- $$ = context_spec_music ($2, SCM_UNDEFINED, $4, $3);
+ | EXPECT_SCM function_arglist_closed_optional '-' REAL
+ {
+ $$ = check_scheme_arg (parser, @3,
+ scm_difference ($4, SCM_UNDEFINED),
+ $2, $1);
}
- | NEWCONTEXT simple_string optional_context_mod Music {
- $$ = context_spec_music ($2, get_next_unique_context_id (), $4,
- $3);
+ | EXPECT_SCM function_arglist_closed_optional '-' NUMBER_IDENTIFIER
+ {
+ $$ = check_scheme_arg (parser, @3,
+ scm_difference ($4, SCM_UNDEFINED),
+ $2, $1);
+ }
+ | EXPECT_SCM function_arglist_closed_optional post_event_nofinger
+ {
+ $$ = check_scheme_arg (parser, @3,
+ $3, $2, $1);
+ }
+ | EXPECT_SCM function_arglist_closed_optional FRACTION
+ {
+ $$ = check_scheme_arg (parser, @3,
+ $3, $2, $1);
+ }
+ | EXPECT_SCM function_arglist_optional lyric_element
+ {
+ $$ = check_scheme_arg (parser, @3,
+ $3, $2, $1);
}
+ ;
- | TIMES fraction Music
+function_arglist_optional:
+ function_arglist_keep %prec FUNCTION_ARGLIST
+ | function_arglist_backup BACKUP
+ | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_optional
+ {
+ $$ = scm_cons ($1, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_optional
+ {
+ $$ = scm_cons ($1, $3);
+ }
+ ;
+function_arglist_closed_optional:
+ function_arglist_closed_keep %prec FUNCTION_ARGLIST
+ | function_arglist_backup BACKUP
+ | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_closed_optional
{
- int n = scm_to_int (scm_car ($2)); int d = scm_to_int (scm_cdr ($2));
- Music *mp = $3;
+ $$ = scm_cons ($1, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_optional
+ {
+ $$ = scm_cons ($1, $3);
+ }
+ ;
+
+embedded_scm_closed:
+ embedded_scm_bare
+ | scm_function_call_closed
+ ;
+
+embedded_scm_arg_closed:
+ embedded_scm_bare_arg
+ | scm_function_call_closed
+ | closed_music
+ ;
+
+scm_function_call_closed:
+ SCM_FUNCTION function_arglist_closed {
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $1, $2);
+ } %prec FUNCTION_ARGLIST
+ ;
+
+function_arglist_bare:
+ EXPECT_NO_MORE_ARGS {
+ $$ = SCM_EOL;
+ }
+ | EXPECT_PITCH function_arglist_optional pitch_also_in_chords {
+ $$ = scm_cons ($3, $2);
+ }
+ | EXPECT_DURATION function_arglist_closed_optional duration_length {
+ $$ = scm_cons ($3, $2);
+ }
+ | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_skip DEFAULT {
+ $$ = scm_cons ($1, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_skip DEFAULT {
+ $$ = scm_cons ($1, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip DEFAULT {
+ $$ = scm_cons ($1, $3);
+ }
+ ;
- $$= MY_MAKE_MUSIC ("TimeScaledMusic");
- $$->set_spot (@$);
+music_function_call:
+ MUSIC_FUNCTION function_arglist {
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $1, $2);
+ }
+ ;
- $$->set_property ("element", mp->self_scm ());
- scm_gc_unprotect_object (mp->self_scm ());
- $$->set_property ("numerator", scm_int2num (n));
- $$->set_property ("denominator", scm_int2num (d));
- $$->compress (Moment (Rational (n,d)));
+optional_id:
+ /**/ { $$ = SCM_EOL; }
+ | '=' simple_string {
+ $$ = $2;
}
- | Repeated_music { $$ = $1; }
- | TRANSPOSE pitch_also_in_chords pitch_also_in_chords Music {
- $$ = MY_MAKE_MUSIC ("TransposedMusic");
- Music *p = $4;
- Pitch from = *unsmob_pitch ($2);
- Pitch to = *unsmob_pitch ($3);
+ ;
- p->transpose (pitch_interval (from, to));
- $$->set_property ("element", p->self_scm ());
- scm_gc_unprotect_object (p->self_scm ());
+complex_music:
+ music_function_call
+ | repeated_music { $$ = $1; }
+ | re_rhythmed_music { $$ = $1; }
+ | complex_music_prefix music
+ {
+ $$ = FINISH_MAKE_SYNTAX ($1, @$, $2);
}
- | mode_changing_head Grouped_music_list {
+ ;
+
+complex_music_prefix:
+ CONTEXT simple_string optional_id optional_context_mod {
+ Context_mod *ctxmod = unsmob_context_mod ($4);
+ SCM mods = SCM_EOL;
+ if (ctxmod)
+ mods = ctxmod->get_mods ();
+ $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_F);
+ }
+ | NEWCONTEXT simple_string optional_id optional_context_mod {
+ Context_mod *ctxmod = unsmob_context_mod ($4);
+ SCM mods = SCM_EOL;
+ if (ctxmod)
+ mods = ctxmod->get_mods ();
+ $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_T);
+ }
+ ;
+
+mode_changed_music:
+ 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;
- scm_gc_unprotect_object ($2->self_scm ());
+ $$ = MAKE_SYNTAX ("unrelativable-music", @$, $2);
}
else
{
$$ = $2;
}
- THIS->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);
+ parser->lexer_->pop_state ();
+ }
+ | mode_changing_head_with_context optional_context_mod grouped_music_list {
+ Context_mod *ctxmod = unsmob_context_mod ($2);
+ SCM mods = SCM_EOL;
+ if (ctxmod)
+ mods = ctxmod->get_mods ();
+ $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, mods, SCM_BOOL_T, $3);
if ($1 == ly_symbol2scm ("ChordNames"))
{
- Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic");
- chm->set_property ("element", $$->self_scm ());
- scm_gc_unprotect_object ($$->self_scm ());
- $$ = chm;
+ $$ = MAKE_SYNTAX ("unrelativable-music", @$, $$);
}
- THIS->lexer_->pop_state ();
- }
- | relative_music { $$ = $1; }
- | re_rhythmed_music { $$ = $1; }
- | TAG embedded_scm Music {
- tag_music ($3, $2, @$);
- $$ = $3;
+ parser->lexer_->pop_state ();
}
;
-mode_changing_head:
+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 (nn);
$$ = ly_symbol2scm ("notes");
}
- | DRUMMODE
+ | 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 (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 (nn);
$$ = ly_symbol2scm ("chords");
}
| LYRICMODE
- { THIS->lexer_->push_lyric_state ();
+ { parser->lexer_->push_lyric_state ();
$$ = ly_symbol2scm ("lyrics");
}
;
-mode_changing_head_with_context:
+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 (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 (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;
- Pitch start = *unsmob_pitch ($2);
- $$ = make_music_relative (start, m);
- scm_gc_unprotect_object (m->self_scm ());
- }
- | RELATIVE Composite_music {
- Music *m = $2;
-
- Pitch middle_c (0, 0, 0);
- $$ = make_music_relative (middle_c, m);
- scm_gc_unprotect_object (m->self_scm ());
- }
- ;
-
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
+ composite_music {
+ /* 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 ();
+ } composite_music {
+ 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;
- scm_gc_unprotect_object (voice->self_scm ());
- }
+ composite_music new_lyrics {
+ $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL));
+ } %prec COMPOSITE
| 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);
- scm_gc_unprotect_object (music->self_scm ());
+ 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);
+ $$ = MAKE_SYNTAX ("context-change", @$, scm_string_to_symbol ($2), $4);
+ }
+ ;
- $$ = t;
- $$->set_spot (@$);
+
+property_path_revved:
+ embedded_scm_closed {
+ $$ = scm_cons ($1, SCM_EOL);
+ }
+ | property_path_revved embedded_scm_closed {
+ $$ = scm_cons ($2, $1);
+ }
+ ;
+
+property_path:
+ property_path_revved {
+ $$ = scm_reverse_x ($1, SCM_EOL);
}
;
$$ = scm_list_2 (ly_symbol2scm ("unset"),
scm_string_to_symbol ($2));
}
- | OVERRIDE simple_string embedded_scm '=' embedded_scm {
- $$ = scm_list_4 (ly_symbol2scm ("push"),
- scm_string_to_symbol ($2), $3, $5);
+ | OVERRIDE simple_string property_path '=' scalar {
+ $$ = scm_append (scm_list_2 (scm_list_3 (ly_symbol2scm ("push"),
+ scm_string_to_symbol ($2), $5),
+ $3));
}
| REVERT simple_string embedded_scm {
$$ = scm_list_3 (ly_symbol2scm ("pop"),
| context_def_mod STRING {
$$ = 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);
+ }
+ }
;
context_prop_spec:
}
;
-music_property_def:
- OVERRIDE context_prop_spec embedded_scm '=' scalar {
- $$ = property_op_to_music (scm_list_4 (
- ly_symbol2scm ("poppush"),
- scm_cadr ($2),
- $3, $5));
- $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+simple_music_property_def:
+ OVERRIDE context_prop_spec property_path '=' scalar {
+ $$ = scm_append (scm_list_2 (scm_list_n (scm_car ($2),
+ ly_symbol2scm ("OverrideProperty"),
+ scm_cadr ($2),
+ $5, SCM_UNDEFINED),
+ $3));
}
| 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_cons2 (parser->self_scm (), make_input (@$), $1));
+ }
+ ;
string:
STRING {
| LYRICS_STRING {
$$ = $1;
}
- ;
-
-scalar: string {
- $$ = $1;
- }
- | LYRICS_STRING {
- $$ = $1;
- }
- | bare_number {
- $$ = $1;
-/* if (scm_integer_p ($1) == SCM_BOOL_T)
- {
- int k = scm_to_int (scm_inexact_to_exact ($1));
- $$ = k;
- } else
- {
- THIS->parser_error (@1, _ ("need integer number arg"));
- $$ = 0;
- }*/
- }
- | embedded_scm {
- $$ = $1;
- }
- | full_markup {
+ | STRING_IDENTIFIER {
$$ = $1;
}
- | DIGIT {
- $$ = scm_int2num ($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.
+scalar:
+ embedded_scm_arg
+ | bare_number
+ | FRACTION
+ | lyric_element
+ ;
-*/
-pre_events: /* empty */
+scalar_closed:
+ embedded_scm_arg_closed
+ | bare_number
+ | FRACTION
+ | lyric_element
;
-event_chord:
- pre_events simple_element post_events {
- SCM elts = $2-> get_property ("elements");
- elts = ly_append2 (elts, scm_reverse_x ($3, SCM_EOL));
+event_chord:
+ 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));
- $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);
+ }
+ | CHORD_REPETITION optional_notemode_duration post_events {
Input i;
- i.set_location (@2, @3);
- $2->set_spot (i);
- $$ = $2;
+ i.set_location (@1, @3);
+ $$ = MAKE_SYNTAX ("repetition-chord", i,
+ $2, scm_reverse_x ($3, SCM_EOL));
+ }
+ | MULTI_MEASURE_REST optional_notemode_duration post_events {
+ Input i;
+ i.set_location (@1, @3);
+ $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2,
+ scm_reverse_x ($3, SCM_EOL));
}
| 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);
- scm_gc_unprotect_object ($2->self_scm ());
+ if (!SCM_UNBNDP ($2))
+ $$ = 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)
if (scm_is_number (check))
{
int q = scm_to_int (check);
- n->set_property ("absolute-octave", scm_int2num (q-1));
+ n->set_property ("absolute-octave", scm_from_int (q-1));
}
-
- $$ = n;
+ $$ = n->unprotect ();
}
| DRUM_PITCH post_events {
- Music *n = MY_MAKE_MUSIC ("NoteEvent");
- n->set_property ("duration", $2);
+ Music *n = MY_MAKE_MUSIC ("NoteEvent", @$);
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
+ {
+ Music *m = unsmob_music ($1);
+
+ 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;
+ }
}
;
-add_quote:
- ADDQUOTE string Music {
- SCM adder = ly_lily_module_constant ("add-quotable");
-
- scm_call_2 (adder, $2, $3->self_scm ());
- scm_gc_unprotect_object ($3->self_scm ());
+music_function_chord_body:
+ music_function_call
+ | MUSIC_IDENTIFIER
+ ;
+
+// Event functions may only take closed arglists, otherwise it would
+// not be clear whether a following postevent should be associated
+// with the last argument of the event function or with the expression
+// for which the function call acts itself as event.
+
+music_function_call_closed:
+ MUSIC_FUNCTION function_arglist_closed {
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $1, $2);
+ }
+ ;
+
+event_function_event:
+ EVENT_FUNCTION function_arglist_closed {
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $1, $2);
}
;
command_element:
- command_req {
- $$ = MY_MAKE_MUSIC ("EventChord");
- $$->set_property ("elements", scm_cons ($1->self_scm (), SCM_EOL));
- scm_gc_unprotect_object ($1->self_scm ());
-
- $$-> set_spot (@$);
- $1-> set_spot (@$);
- }
- | 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);
+ command_event {
+ $$ = $1;
}
| E_BRACKET_OPEN {
- Music *m = MY_MAKE_MUSIC ("LigatureEvent");
- m->set_property ("span-direction", scm_int2num (START));
- m->set_spot (@$);
-
- $$ = MY_MAKE_MUSIC ("EventChord");
- $$->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL));
- scm_gc_unprotect_object (m->self_scm ());
- $$->set_spot (@$);
+ Music *m = MY_MAKE_MUSIC ("LigatureEvent", @$);
+ m->set_property ("span-direction", scm_from_int (START));
+ $$ = m->unprotect();
}
| E_BRACKET_CLOSE {
- Music *m = MY_MAKE_MUSIC ("LigatureEvent");
- m->set_property ("span-direction", scm_int2num (STOP));
- m->set_spot (@$);
-
- $$ = MY_MAKE_MUSIC ("EventChord");
- $$->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL));
- $$->set_spot (@$);
- scm_gc_unprotect_object (m->self_scm ());
+ Music *m = MY_MAKE_MUSIC ("LigatureEvent", @$);
+ m->set_property ("span-direction", scm_from_int (STOP));
+ $$ = m->unprotect ();
}
| E_BACKSLASH {
- $$ = MY_MAKE_MUSIC ("VoiceSeparator");
- $$->set_spot (@$);
+ $$ = MAKE_SYNTAX ("voice-separator", @$);
}
| '|' {
- 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);
-
- 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 {
- 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;
- }
- | CLEF STRING {
- SCM proc = ly_lily_module_constant ("make-clef-set");
-
- SCM result = scm_call_1 (proc, $2);
- scm_gc_protect_object (result);
- $$ = unsmob_music (result);
- }
- | TIME_T fraction {
- SCM proc = ly_lily_module_constant ("make-time-signature-set");
+ $$ = MAKE_SYNTAX ("bar-check", @$);
- SCM result = scm_apply_2 (proc, scm_car ($2), scm_cdr ($2), SCM_EOL);
- scm_gc_protect_object (result);
- $$ = unsmob_music (result);
- }
- | 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);
}
;
-command_req:
+command_event:
E_TILDE {
- $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent");
- }
- | MARK DEFAULT {
- Music *m = MY_MAKE_MUSIC ("MarkEvent");
- $$ = m;
+ $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent", @$)->unprotect ();
}
| tempo_event {
$$ = $1;
}
- | KEY DEFAULT {
- Music *key = MY_MAKE_MUSIC ("KeyChangeEvent");
- $$ = key;
- }
- | KEY NOTENAME_PITCH SCM_IDENTIFIER {
-
- 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"));
- }
-
- $$ = key;
- }
;
$$ = SCM_EOL;
}
| post_events post_event {
- $2->set_spot (@2);
- $$ = scm_cons ($2->self_scm (), $$);
- scm_gc_unprotect_object ($2->self_scm ());
- }
- | post_events tagged_post_event {
- $2 -> set_spot (@2);
- $$ = scm_cons ($2->self_scm (), $$);
- scm_gc_unprotect_object ($2->self_scm ());
- }
- ;
-
-
-tagged_post_event:
- '-' TAG embedded_scm post_event {
- tag_music ($4, $3, @$);
- $$ = $4;
+ unsmob_music ($2)->set_spot (@2);
+ $$ = scm_cons ($2, $$);
}
;
-
-post_event:
+post_event_nofinger:
direction_less_event {
$$ = $1;
}
+ | script_dir music_function_call_closed {
+ $$ = $2;
+ if ($1)
+ {
+ unsmob_music ($$)->set_property ("direction", scm_from_int ($1));
+ }
+ }
| 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_int2num ($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_int2num ($1));
+ {
+ Music *m = unsmob_music ($2);
+ m->set_property ("direction", scm_from_int ($1));
+ }
+ $$ = $2;
+ }
+ | '^' 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
+ | '-' fingering {
$$ = $2;
}
- | string_number_event
;
string_number_event:
E_UNSIGNED {
- Music *s = MY_MAKE_MUSIC ("StringNumberEvent");
- s->set_property ("string-number", scm_int2num ($1));
- s->set_spot (@$);
- $$ = s;
+ Music *s = MY_MAKE_MUSIC ("StringNumberEvent", @$);
+ s->set_property ("string-number", scm_from_int ($1));
+ $$ = s->unprotect ();
}
;
$$ = ly_symbol2scm ("bracketOpenSymbol");
}
| ']' {
- $$ = ly_symbol2scm ("bracketCloseSymbol");
+ $$ = ly_symbol2scm ("bracketCloseSymbol");
}
| '~' {
$$ = ly_symbol2scm ("tildeSymbol");
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 ();
}
+ | string_number_event
| EVENT_IDENTIFIER {
- $$ = unsmob_music ($1);
+ $$ = $1;
}
| tremolo_type {
- Music *a = MY_MAKE_MUSIC ("TremoloEvent");
- a->set_spot (@$);
- a->set_property ("tremolo-type", scm_int2num ($1));
- $$ = a;
+ Music *a = MY_MAKE_MUSIC ("TremoloEvent", @$);
+ a->set_property ("tremolo-type", scm_from_int ($1));
+ $$ = a->unprotect ();
}
- ;
-
+ | event_function_event
+ ;
+
direction_reqd_event:
gen_text_def {
$$ = $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 ();
}
;
octave_check:
/**/ { $$ = SCM_EOL; }
- | '=' { $$ = scm_int2num (0); }
- | '=' sub_quotes { $$ = scm_int2num ($2); }
- | '=' sup_quotes { $$ = scm_int2num ($2); }
+ | '=' { $$ = scm_from_int (0); }
+ | '=' sub_quotes { $$ = scm_from_int (-$2); }
+ | '=' sup_quotes { $$ = scm_from_int ($2); }
;
sup_quotes:
$$ = p.smobbed_copy ();
}
| TONICNAME_PITCH sub_quotes {
- Pitch p =* unsmob_pitch ($1);
+ Pitch p = *unsmob_pitch ($1);
p = p.transposed (Pitch (-$2,0,0));
$$ = p.smobbed_copy ();
steno_pitch {
$$ = $1;
}
+ | PITCH_IDENTIFIER
;
pitch_also_in_chords:
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");
+ | simple_string {
+ 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");
- t->set_property ("digit", scm_int2num ($1));
- t->set_spot (@$);
- $$ = t;
+ ;
+
+fingering:
+ UNSIGNED {
+ Music *t = MY_MAKE_MUSIC ("FingeringEvent", @$);
+ t->set_property ("digit", $1);
+ $$ = t->unprotect ();
}
;
script_abbreviation:
'^' {
- $$ = scm_makfrom0str ("Hat");
+ $$ = scm_from_locale_string ("Hat");
}
| '+' {
- $$ = scm_makfrom0str ("Plus");
+ $$ = scm_from_locale_string ("Plus");
}
| '-' {
- $$ = scm_makfrom0str ("Dash");
+ $$ = scm_from_locale_string ("Dash");
}
| '|' {
- $$ = scm_makfrom0str ("Bar");
+ $$ = scm_from_locale_string ("Bar");
}
- | '>' {
- $$ = scm_makfrom0str ("Larger");
+ | ANGLE_CLOSE {
+ $$ = scm_from_locale_string ("Larger");
}
| '.' {
- $$ = scm_makfrom0str ("Dot");
+ $$ = scm_from_locale_string ("Dot");
}
| '_' {
- $$ = scm_makfrom0str ("Underscore");
+ $$ = scm_from_locale_string ("Underscore");
}
;
| '-' { $$ = CENTER; }
;
-
-absolute_pitch:
- steno_pitch {
- $$ = $1;
- }
- ;
-
duration_length:
multiplied_duration {
$$ = $1;
}
;
-optional_notemode_duration:
+maybe_notemode_duration:
{
- Duration dd = THIS->default_duration_;
- $$ = dd.smobbed_copy ();
-
- THIS->beam_check ($$);
+ $$ = SCM_UNDEFINED;
}
| multiplied_duration {
$$ = $1;
- THIS->default_duration_ = *unsmob_duration ($$);
+ parser->default_duration_ = *unsmob_duration ($$);
+ }
+;
+
- THIS->beam_check ($$);
+optional_notemode_duration:
+ maybe_notemode_duration
+ {
+ if (SCM_UNBNDP ($$))
+ $$ = parser->default_duration_.smobbed_copy ();
}
;
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);
| DURATION_IDENTIFIER dots {
Duration *d = unsmob_duration ($1);
Duration k (d->duration_log (), d->dot_count () + $2);
+ k = k.compressed (d->factor ());
*d = k;
$$ = $1;
}
}
;
-fraction:
- FRACTION { $$ = $1; }
- | UNSIGNED '/' UNSIGNED {
- $$ = scm_cons (scm_int2num ($1), scm_int2num ($3));
- }
- ;
-
dots:
/* empty */ {
$$ = 0;
}
| ':' 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_int2num ($1), scm_int2num (10));
- $$ = scm_list_2 (ly_lily_module_constant ("number-markup"),
- $$);
- }
- | UNSIGNED {
- $$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10));
- $$ = scm_list_2 (ly_lily_module_constant ("number-markup"),
- $$);
- }
+ UNSIGNED { $$ = $1; }
| STRING { $$ = $1; }
| full_markup { $$ = $1; }
;
-bass_mod:
- '-' { $$ = -2; }
- | '+' { $$ = 2; }
- | '!' { $$ = 0; }
+figured_bass_alteration:
+ '-' { $$ = ly_rational2scm (FLAT_ALTERATION); }
+ | '+' { $$ = ly_rational2scm (SHARP_ALTERATION); }
+ | '!' { $$ = scm_from_int (0); }
;
bass_figure:
FIGURE_SPACE {
- Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent");
- $$ = bfr->self_scm ();
- scm_gc_unprotect_object ($$);
+ 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);
- scm_gc_unprotect_object ($$);
+ 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) {
+ if (scm_to_double ($2)) {
SCM salter = m->get_property ("alteration");
- int alter = scm_is_number (salter) ? scm_to_int (salter) : 0;
+ SCM alter = scm_is_number (salter) ? salter : scm_from_int (0);
m->set_property ("alteration",
- scm_int2num (alter + $2));
+ scm_sum (alter, $2));
} else {
- m->set_property ("alteration", scm_int2num (0));
+ 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);
+ }
+ else if ($2 == ly_symbol2scm ("backslash"))
+ {
+ m->set_property ("augmented-slash", 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");
+ }
+ | '/' {
+ $$ = ly_symbol2scm ("slash");
+ }
+ | E_BACKSLASH {
+ $$ = ly_symbol2scm ("backslash");
}
- | br_bass_figure ']' {
+ ;
+
+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"));
-
- 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 ($2 || $3 || scm_is_number ($4) || !SCM_UNBNDP ($5) || $6)
{
- int q = scm_to_int ($4);
- n->set_property ("absolute-octave", scm_int2num (q-1));
+ Music *n = 0;
+ if ($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 ($3 % 2)
+ n->set_property ("cautionary", SCM_BOOL_T);
+ if ($2 % 2 || $3 % 2)
+ 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);
-
- Music *v = MY_MAKE_MUSIC ("EventChord");
- v->set_property ("elements", scm_list_1 (n->self_scm ()));
- scm_gc_unprotect_object (n->self_scm ());
-
- v->set_spot (@$);
- n->set_spot (@$);
- $$ = v;
}
| 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 ()));
- scm_gc_unprotect_object (n->self_scm ());
- 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 (@$);
-
- scm_gc_unprotect_object (ev->self_scm ());
-
- $$ = 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 (@$));
- scm_gc_protect_object (mus);
- $$ = unsmob_music (mus);
+ $$ = 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"));
-
- Music *lreq = MY_MAKE_MUSIC ("LyricEvent");
- lreq->set_property ("text", $1);
- lreq->set_property ("duration",$2);
- lreq->set_spot (@$);
- Music *velt = MY_MAKE_MUSIC ("EventChord");
- velt->set_property ("elements", scm_list_1 (lreq->self_scm ()));
+ ;
- $$= velt;
+simple_chord_elements:
+ new_chord {
+ if (!parser->lexer_->is_chord_state ())
+ parser->parser_error (@1, _ ("have to be in Chord mode for chords"));
+ $$ = $1;
}
- | new_chord {
- if (!THIS->lexer_->is_chord_state ())
- THIS->parser_error (@1, _ ("have to be in Chord mode for chords"));
- $$ = unsmob_music ($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;
}
;
$$ = $1;
}
| LYRICS_STRING {
- $$ = make_simple_markup ($1);
+ $$ = $1;
+ }
+ ;
+
+lyric_element_arg:
+ lyric_element
+ | lyric_element multiplied_duration post_events {
+ $$ = 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 {
+ $$ = 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 {
+ $$ = 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 {
+ $$ = 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 ($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));
}
;
chord_items:
/**/ {
- $$ = SCM_EOL;
+ $$ = SCM_EOL;
}
| chord_items chord_item {
$$ = scm_cons ($2, $$);
$$ = make_chord_step ($1, 0);
}
| bare_unsigned '+' {
- $$ = make_chord_step ($1, SHARP);
+ $$ = make_chord_step ($1, SHARP_ALTERATION);
}
| bare_unsigned CHORD_MINUS {
- $$ = make_chord_step ($1, FLAT);
+ $$ = make_chord_step ($1, FLAT_ALTERATION);
+ }
+ ;
+
+tempo_range:
+ bare_unsigned {
+ $$ = scm_from_int ($1);
+ }
+ | bare_unsigned '~' bare_unsigned {
+ $$ = scm_cons (scm_from_int ($1), scm_from_int ($3));
}
- ;
+ ;
/*
UTILITIES
bare_number:
- UNSIGNED {
- $$ = scm_int2num ($1);
- }
- | REAL {
- $$ = $1;
- }
- | NUMBER_IDENTIFIER {
- $$ = $1;
+ bare_number_closed
+ | UNSIGNED NUMBER_IDENTIFIER {
+ $$ = scm_product ($1, $2);
}
| REAL NUMBER_IDENTIFIER {
- $$ = scm_make_real (scm_to_double ($1) *scm_to_double ($2));
- }
- | UNSIGNED NUMBER_IDENTIFIER {
- $$ = scm_make_real ($1 *scm_to_double ($2));
+ $$ = scm_product ($1, $2);
}
;
+bare_number_closed:
+ UNSIGNED
+ | REAL
+ | NUMBER_IDENTIFIER
+ ;
bare_unsigned:
UNSIGNED {
- $$ = $1;
- }
- | DIGIT {
- $$ = $1;
+ $$ = scm_to_int ($1);
}
;
+unsigned_number:
+ UNSIGNED
+ | NUMBER_IDENTIFIER
+ ;
+
exclamations:
{ $$ = 0; }
| exclamations '!' { $$ ++; }
$$ = $1;
}
| LYRIC_MARKUP
- { THIS->lexer_->push_markup_state (); }
+ { parser->lexer_->push_markup_state (); }
markup_top {
$$ = $3;
- THIS->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
+ }
+ ;
+
+full_markup_list:
+ MARKUPLIST_IDENTIFIER {
+ $$ = $1;
+ }
+ | MARKUPLIST
+ { parser->lexer_->push_markup_state (); }
+ markup_list {
+ $$ = $3;
+ 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 ();
}
;
markup_top:
- markup_list {
- $$ = scm_list_2 (ly_lily_module_constant ("line-markup"), $1);
+ markup_list {
+ $$ = scm_list_2 (ly_lily_module_constant ("line-markup"), $1);
}
| markup_head_1_list simple_markup {
$$ = scm_car (scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, scm_list_1 ($2)));
}
;
+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:
- markup_composed_list {
+ MARKUPLIST_IDENTIFIER {
+ $$ = $1;
+ }
+ | markup_composed_list {
$$ = $1;
}
| markup_braced_list {
$$ = $1;
}
+ | markup_command_list {
+ $$ = scm_list_1 ($1);
+ }
+ | markup_scm MARKUPLIST_IDENTIFIER
+ {
+ $$ = $2;
+ }
;
markup_composed_list:
markup_head_1_list markup_braced_list {
$$ = scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, $2);
-
+
}
;
$$ = scm_cons ($2, $1);
}
| markup_braced_list_body markup_list {
- $$ = scm_append_x (scm_list_2 (scm_reverse_x ($2, SCM_EOL), $1));
+ $$ = scm_reverse_x ($2, $1);
}
;
-markup_head_1_item:
- MARKUP_HEAD_MARKUP0 {
- $$ = scm_list_1 ($1);
+markup_command_list:
+ MARKUP_LIST_FUNCTION markup_command_list_arguments {
+ $$ = scm_cons ($1, scm_reverse_x($2, SCM_EOL));
}
- | MARKUP_HEAD_SCM0_MARKUP1 embedded_scm {
- $$ = scm_list_2 ($1, $2);
+ ;
+
+markup_command_basic_arguments:
+ EXPECT_MARKUP_LIST markup_command_list_arguments markup_list {
+ $$ = scm_cons ($3, $2);
+ }
+ | EXPECT_SCM markup_command_list_arguments embedded_scm_closed {
+ $$ = check_scheme_arg (parser, @3, $3, $2, $1);
+ }
+ | EXPECT_NO_MORE_ARGS {
+ $$ = SCM_EOL;
}
- | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm {
- $$ = scm_list_3 ($1, $2, $3);
+ ;
+
+markup_command_list_arguments:
+ markup_command_basic_arguments { $$ = $1; }
+ | EXPECT_MARKUP markup_command_list_arguments markup {
+ $$ = scm_cons ($3, $2);
+ }
+ ;
+
+markup_head_1_item:
+ MARKUP_FUNCTION EXPECT_MARKUP markup_command_list_arguments {
+ $$ = scm_cons ($1, scm_reverse_x ($3, SCM_EOL));
}
;
$$ = $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 (nn);
} '{' score_body '}' {
Score * sc = $4;
$$ = scm_list_2 (ly_lily_module_constant ("score-markup"), sc->self_scm ());
- scm_gc_unprotect_object (sc->self_scm ());
- THIS->lexer_->pop_state ();
- }
- | MARKUP_HEAD_SCM0 embedded_scm {
- $$ = scm_list_2 ($1, $2);
+ sc->unprotect ();
+ parser->lexer_->pop_state ();
}
- | MARKUP_HEAD_SCM0_SCM1_SCM2 embedded_scm embedded_scm embedded_scm {
- $$ = scm_list_4 ($1, $2, $3, $4);
+ | MARKUP_FUNCTION markup_command_basic_arguments {
+ $$ = scm_cons ($1, scm_reverse_x ($2, SCM_EOL));
}
- | MARKUP_HEAD_SCM0_SCM1 embedded_scm embedded_scm {
- $$ = scm_list_3 ($1, $2, $3);
- }
- | MARKUP_HEAD_EMPTY {
- $$ = scm_list_1 ($1);
- }
- | MARKUP_HEAD_LIST0 markup_list {
- $$ = scm_list_2 ($1,$2);
- }
- | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup {
- $$ = scm_list_3 ($1, $2, $3);
+ | markup_scm MARKUP_IDENTIFIER
+ {
+ $$ = $2;
}
;
-
+
markup:
markup_head_1_list simple_markup {
SCM mapper = ly_lily_module_constant ("map-markup-command-list");
%%
void
-Lily_parser::set_yydebug (bool )
+Lily_parser::set_yydebug (bool x)
{
-#if 0
- yydebug = 1;
-#endif
+ yydebug = x;
}
void
Lily_parser::do_yyparse ()
{
- yyparse ((void*)this);
+ yyparse (this);
}
-/* FIXME: Should make this optional? It will also complain at
-
- [s4]
-
-which is entirely legitimate.
-
-Or we can scrap it. Barchecks should detect wrong durations, and
-skipTypesetting speeds it up a lot. */
-
-void
-Lily_parser::beam_check (SCM dur)
-{
- Duration *d = unsmob_duration (dur);
- if (unsmob_music (last_beam_start_) && d->duration_log () <= 2)
- {
- Music *m = unsmob_music (last_beam_start_);
- m->origin ()->warning (_f ("suspect duration in beam: %s",
- d->to_string ()));
- }
- last_beam_start_ = SCM_EOL;
-}
-
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 ();
- return CONTEXT_DEF_IDENTIFIER;
+ } else if (unsmob_context_def (sid)) {
+ Context_def *def= unsmob_context_def (sid)->clone ();
+
+ *destination = def->self_scm ();
+ def->unprotect ();
+
+ return CONTEXT_DEF_IDENTIFIER;
+ } else if (unsmob_context_mod (sid)) {
+ *destination = unsmob_context_mod (sid)->smobbed_copy ();
+
+ return CONTEXT_MOD_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 ();
*destination = mus->self_scm ();
unsmob_music (*destination)->
set_property ("origin", make_input (last_input_));
- return dynamic_cast<Event*> (mus)
- ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER;
+
+ bool is_event = mus->is_mus_type ("post-event");
+ mus->unprotect ();
+ return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER;
+ } else if (unsmob_pitch (sid)) {
+ *destination = unsmob_pitch (sid)->smobbed_copy ();
+ return PITCH_IDENTIFIER;
} else if (unsmob_duration (sid)) {
*destination = unsmob_duration (sid)->smobbed_copy ();
return DURATION_IDENTIFIER;
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 MARKUP_IDENTIFIER;
+ } else if (Text_interface::is_markup_list (sid)) {
+ *destination = sid;
+ return MARKUPLIST_IDENTIFIER;
}
- return -1;
+ 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_from_locale_string ("$uniqueContextId");
+}
- m->set_property ("symbol", symbol);
- if (val != SCM_UNDEFINED)
- m->set_property ("value", val);
- if (grob_val != SCM_UNDEFINED)
- m->set_property ("grob-value", grob_val);
+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_from_locale_string (s);
+}
- if (grob_sym != SCM_UNDEFINED)
- {
- bool itc = do_internal_type_checking_global;
- /* UGH.
- */
- bool autobeam = ly_c_equal_p (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;
- }
+SCM check_scheme_arg (Lily_parser *parser, Input loc,
+ SCM arg, SCM args, SCM pred)
+{
+ args = scm_cons (arg, args);
+ if (scm_is_true (scm_call_1 (pred, arg)))
+ 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), SCM_BOOL_F);
+ return args;
+}
- if (tag == ly_symbol2scm ("poppush"))
- m->set_property ("pop-first", SCM_BOOL_T);
+SCM loc_on_music (Input loc, SCM arg)
+{
+ if (Music *m = unsmob_music (arg))
+ {
+ m = m->clone ();
+ m->set_spot (loc);
+ return m->unprotect ();
+ }
+ return arg;
+}
+bool
+is_regular_identifier (SCM id)
+{
+ string str = ly_scm2string (id);
+ char const *s = str.c_str ();
- return m;
+ bool v = true;
+#if 0
+ isalpha (*s);
+ s++;
+#endif
+ while (*s && v)
+ {
+ v = v && isalnum (*s);
+ s++;
+ }
+ return v;
}
-Music*
-context_spec_music (SCM type, SCM id, Music *m, SCM ops)
+Music *
+make_music_with_input (SCM name, Input where)
{
- Music *csm = MY_MAKE_MUSIC ("ContextSpeccedMusic");
+ Music *m = make_music_by_name (name);
+ m->set_spot (where);
+ return m;
+}
- csm->set_property ("element", m->self_scm ());
- scm_gc_unprotect_object (m->self_scm ());
+SCM
+make_simple_markup (SCM a)
+{
+ return a;
+}
- csm->set_property ("context-type",
- scm_is_symbol (type) ? type : scm_string_to_symbol (type));
- csm->set_property ("property-operations", ops);
+bool
+is_duration (int t)
+{
+ return t && t == 1 << intlog2 (t);
+}
- if (scm_is_string (id))
- csm->set_property ("context-id", id);
- return csm;
+void
+set_music_properties (Music *p, SCM a)
+{
+ for (SCM k = a; scm_is_pair (k); k = scm_cdr (k))
+ p->set_property (scm_caar (k), scm_cdar (k));
}
+
SCM
-get_next_unique_context_id ()
+make_chord_step (int step, Rational alter)
{
- return scm_makfrom0str ("$uniqueContextId");
+ if (step == 7)
+ alter += FLAT_ALTERATION;
+
+ while (step < 0)
+ step += 7;
+ Pitch m ((step -1) / 7, (step - 1) % 7, alter);
+ return m.smobbed_copy ();
}
SCM
-get_next_unique_lyrics_context_id ()
+make_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list)
{
- static int new_context_count;
- char s[128];
- snprintf (s, 1024, "uniqueContext%d", new_context_count++);
- return scm_makfrom0str (s);
+ SCM chord_ctor = ly_lily_module_constant ("construct-chord-elements");
+ 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, Lily_parser *parser)
+{
+ Lily_lexer *lex = parser->lexer_;
+
+ lex->lexval_ = s;
+ lex->lexloc_ = loc;
+ lex->prepare_for_next_token ();
+ return lex->yylex ();
}
projects / lilypond.git / blobdiff