%{ // -*-Fundamental-*-
/*
- parser.yy -- YACC -> C++ parser for mudela
+ parser.yy -- Bison/C++ parser for mudela
source file of the GNU LilyPond music typesetter
- (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+ (c) 1997 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
// mmm
-Mudela_version oldest_version ("1.0.0");
-Mudela_version version ("1.0.0");
+Mudela_version oldest_version ("1.0.1");
+Mudela_version version ("1.0.2");
// needed for bison.simple's malloc() and free()
Array<String> * strvec;
Array<int> *intvec;
Box *box;
- Chord * chord;
+ Simultaneous_music *chord;
Duration *duration;
Identifier *id;
Translator* trans;
Music *music;
- Music_list *musiclist;
+ Music_list *music_list;
Score *score;
Header *header;
Interval *interval;
/* tokens which are not keywords */
-%token ACCIDENTALS
%token ALIAS
%token BAR
%token BEAMPLET
%token IN_T
%token LYRIC
%token KEY
+%token KEYSIGNATURE
%token MARK
%token MUSIC
%token MUSICAL_PITCH
%token <id> IDENTIFIER
%token <id> MUSIC_IDENTIFIER
-%token <id> VOICE_IDENTIFIER
%token <id> POST_REQUEST_IDENTIFIER
%token <id> SCRIPT_IDENTIFIER
%token <id> COMMAND_IDENTIFIER
%type <duration> duration_length
%type <scalar> scalar
-%type <music> Music transposed_music relative_music
+%type <music> Music transposed_music relative_music Sequential_music Simultaneous_music
%type <music> property_def translator_change
-%type <musiclist> Voice Voice_body
-%type <chord> Chord Chord_body
+%type <music_list> Music_list
%type <paper> paper_block paper_body
%type <real> dim real
%type <real> real_mult_expression real_primary
%type <symtable> symtable symtable_body
%type <trans> translator_spec translator_spec_body
%type <tempo> tempo_request
-%type <string> concat_strings
%expect 1
{
$$ = new Header;
}
- | mudela_header_body STRING '=' concat_strings ';' {
+ | mudela_header_body STRING '=' string ';' {
(*$$)[*$2] = *$4;
delete $2;
delete $4;
;
-concat_strings:
- {
- $$ = new String;
- }
- | concat_strings STRING {
- *$$ += *$2;
- }
-
-
/*
DECLARATIONS
*/
$$ = t;
delete $2;
}
- | translator_spec_body STRING '=' scalar ';' {
- $$-> set_property (*$2, *$4);
- delete $2;
+ | translator_spec_body STRING '=' simple_identifier_init ';' {
+ Identifier* id = $4;
+ String_identifier *s = id->access_String_identifier ();
+ Real_identifier *r= id->access_Real_identifier ();
+ int_identifier *i = id->access_int_identifier ();
+
+ String str;
+ if (s) str = *s->access_String (false);
+ if (i) str = to_str (*i->access_int (false));
+ if (r) str = to_str (*r->access_Real (false));
+ if (!s && !i && !r)
+ THIS->parser_error (_("Wrong type for property value"));
+
delete $4;
+ $$->set_property (*$2, str);
}
| translator_spec_body CONSISTS STRING ';' {
$$->group_l ()->consists_str_arr_.push (*$3);
| intastint_list int '*' int {
$$->push ($2); $$->push ($4);
}
- ;
+ | intastint_list int {
+ $$->push ($2); $$->push (1);
+ }
+ ;
/*
}
;
-Voice:
- '{' Voice_body '}' {
- $$ = $2;
+Music_list: /* empty */ {
+ $$ = new Music_list;
}
- ;
-
-Voice_body:
- /**/ {
- $$ = new Voice;
- $$->set_spot (THIS->here_input ());
+ | Music_list Music {
+ $$->add_music ($2);
}
- | Voice_body Music {
- $$->add ($2);
+ | Music_list error {
}
- | Voice_body error {
- $$ = new Music_list;
+ ;
+
+
+Sequential_music: '{' Music_list '}' {
+ $$ = new Sequential_music ($2);
}
;
+Simultaneous_music: '<' Music_list '>' {
+ $$ = new Simultaneous_music ($2);
+ }
+ ;
Music:
request_chord { $$ = $1; }
| TYPE STRING Music {
delete $2;
delete $4;
}
- | Voice { $$ = $1; }
- | Chord { $$ = $1; }
+ | Simultaneous_music { $$ = $1; }
+ | Sequential_music { $$ = $1; }
| transposed_music { $$ = $1; }
| MUSIC_IDENTIFIER { $$ = $1->access_Music (); }
| MELODIC
;
-Chord:
- '<' Chord_body '>' { $$ = $2; }
- ;
-
-Chord_body:
- /**/ {
- $$ = new Chord;
- $$-> multi_level_i_ = 0;
- $$->set_spot (THIS->here_input ());
- }
- | Chord_body Music {
- $$->add ($2);
- }
- | Chord_body error {
- $$ = new Chord;
- }
- ;
-
transposed_music:
TRANSPOSE musical_pitch Music {
$$ = $3;
;
-/*
- VOICE ELEMENTS
-*/
request_chord:
pre_requests simple_element post_requests {
- THIS->add_requests ((Chord*)$2);//ugh
+ THIS->add_requests ((Simultaneous_music*)$2);//ugh
$$ = $2;
}
| command_element
$$ = new Request_chord;
$$-> set_spot (THIS->here_input ());
$1-> set_spot (THIS->here_input ());
- ((Chord*)$$) ->add ($1);//ugh
+ ((Simultaneous_music*)$$) ->add_music ($1);//ugh
}
;
$$ = key_p;
delete $2;
}
- | ACCIDENTALS pitch_list {
+ | KEYSIGNATURE pitch_list {
Key_change_req *key_p= new Key_change_req;
key_p->pitch_arr_ = *$2;
key_p->ordinary_key_b_ = false;
$$ = $1;
}
| abbrev_type {
-#if 1 // re-instating
Abbreviation_req* a = new Abbreviation_req;
a->type_i_ = $1;
$$ = a;
-#else // and disabling just created ugly sticky abbrev_req
- THIS->default_abbrev_i_ = $1;
-#endif
}
;
steno_musical_pitch:
NOTENAME_PITCH {
$$ = $1;
- // $$->octave_i_ += THIS->default_octave_i_;
}
| NOTENAME_PITCH sup_quotes {
$$ = $1;
- // $$->octave_i_ += THIS->default_octave_i_ + $2;
$$->octave_i_ += $2;
}
| NOTENAME_PITCH sub_quotes {
$$ = $1;
$$->octave_i_ += - $2;
- // $$->octave_i_ += THIS->default_octave_i_ - $2;
}
;
;
text_def:
- STRING {
+ string {
Text_def *t = new Text_def;
$$ = t;
t->text_str_ = *$1;
absolute_musical_pitch:
steno_musical_pitch {
$$ = $1;
- // $$->octave_i_ -= THIS->default_octave_i_;
}
;
m->duration_ = *$2;
delete $2;
- Chord*velt_p = new Request_chord;
+ Simultaneous_music*velt_p = new Request_chord;
velt_p->set_spot (THIS->here_input ());
- velt_p->add (m);
+ velt_p->add_music (m);
$$ = velt_p;
}
projects / lilypond.git / blobdiff