#include "script-def.hh"
#include "symtable.hh"
#include "lookup.hh"
-#include "ps-lookup.hh"
-#include "tex-lookup.hh"
#include "misc.hh"
#include "my-lily-lexer.hh"
#include "paper-def.hh"
#include "relative-music.hh"
#include "transposed-music.hh"
#include "compressed-music.hh"
+#include "repeated-music.hh"
// mmm
Mudela_version oldest_version ("1.0.7");
-Mudela_version version ("1.0.8");
+Mudela_version version ("1.0.12");
// needed for bison.simple's malloc() and free()
#define yyerror THIS->parser_error
#define ARRAY_SIZE(a,s) if (a.size () != s) THIS->parser_error (_f("expecting %d arguments", s))
-
%}
Array<Musical_pitch> *pitch_arr;
Array<String> * strvec;
Array<int> *intvec;
+ Atom * symbol;
Box *box;
- Simultaneous_music *chord;
+ Notename_table *chordmodifiertab;
Duration *duration;
+ General_script_def * script;
Identifier *id;
- Translator* trans;
Music *music;
Music_list *music_list;
Score *score;
Paper_def *paper;
Real real;
Request * request;
- General_script_def * script;
Scalar *scalar;
+ Simultaneous_music *chord;
String *string;
- Atom * symbol;
Symtable * symtable;
Symtables* symtables;
- Text_def * textdef;
Tempo_req *tempo;
+ Text_def * textdef;
+ Translator* trans;
char c;
const char *consstr;
int i;
%token ABSDYNAMIC
%token ACCEPTS
+%token ALTERNATIVE
%token BAR
%token BEAMPLET
%token CADENZA
+%token CHORDMODIFIERS
+%token CHORDS
%token CLEF
%token CM_T
%token CONSISTS
%token DURATION
%token END
+%token EXTENDER
%token FONT
%token GROUPING
%token HEADER
%token NOTENAMES
%token NOTES
%token OCTAVE
-%token OUTPUT
%token PAPER
%token PARTIAL
%token PENALTY
%token PT_T
%token RELATIVE
%token REMOVE
-%token SCHEME /* token vs typedef; can't be named SCM */
+%token REPEAT
+%token SCM_T
+%token SCMFILE
%token SCORE
%token SCRIPT
%token SHAPE
%type <i> dots
%token <i> DIGIT
%token <pitch> NOTENAME_PITCH
+%token <pitch> TONICNAME_PITCH
+%token <pitch> CHORDMODIFIER_PITCH
%token <id> DURATION_IDENTIFIER
%token <id> IDENTIFIER
%token <id> NOTENAME_TABLE_IDENTIFIER
%type <i> open_plet_parens close_plet_parens
%type <i> sub_quotes sup_quotes
%type <music> simple_element request_chord command_element Simple_music Composite_music
+%type <music> Alternative_music Repeated_music
%type <i> abbrev_type
%type <i> int unsigned
%type <i> script_dir
+%type <i> optional_modality
%type <id> identifier_init simple_identifier_init block_identifier
%type <duration> steno_duration notemode_duration
%type <duration> entered_notemode_duration explicit_duration
%type <symtables> symtables symtables_body
%type <pitch> explicit_musical_pitch steno_musical_pitch musical_pitch absolute_musical_pitch
+%type <pitch> steno_tonic_pitch
%type <notereq> steno_notepitch
%type <pitch_arr> pitch_list
+%type <music> chord notemode_chord
+%type <pitch_arr> chord_additions chord_subtractions
+%type <pitch> chord_addsub chord_note
%type <midi> midi_block midi_body
%type <duration> duration_length
%type <request> post_request structured_post_request
%type <pair> plet_fraction
%type <request> command_req verbose_command_req
-%type <request> script_req dynamic_req
+%type <request> script_req dynamic_req extender_req
%type <string> string
%type <score> score_block score_body
%type <intarr> shape_array
%type <symtable> symtable symtable_body
%type <trans> translator_spec translator_spec_body
%type <tempo> tempo_request
-%type <notenametab> notenames_body notenames_block
-%expect 3
+%type <notenametab> notenames_body notenames_block chordmodifiers_block
+
+/* 5 extra for notemode_chord */
+%expect 15
%left '-' '+'
notenames_block {
THIS->lexer_p_->set_notename_table ($1);
}
+ | chordmodifiers_block {
+ THIS->lexer_p_->set_chordmodifier_table ($1);
+ }
| mudela_header {
delete header_global_p;
header_global_p = $1;
;
embedded_scm:
- SCHEME STRING ';' {
- gh_eval_str ($2->ch_C ());
+ SCMFILE STRING ';' {
+ read_lily_scm_file (*$2);
+ delete $2;
+ }
+ | SCM_T STRING ';' {
+ gh_eval_str ($2->ch_l ());
delete $2;
};
;
+chordmodifiers_block:
+ CHORDMODIFIERS '{' notenames_body '}' { $$ = $3; }
+ ;
+
+
notenames_block:
NOTENAMES '{' notenames_body '}' { $$ = $3; }
;
$$ = new Notename_table;
}
| NOTENAME_TABLE_IDENTIFIER {
- $$ = $1-> access_Notename_table(true);
+ $$ = $1-> access_content_Notename_table(true);
}
| notenames_body STRING '=' explicit_musical_pitch {
(*$$)[*$2] = *$4;
$$ = new Score_identifier ($1, SCORE_IDENTIFIER);
}
+ | chordmodifiers_block {
+ $$ = new Notename_table_identifier ($1, NOTENAME_TABLE_IDENTIFIER);
+ }
| notenames_block {
$$ = new Notename_table_identifier ($1, NOTENAME_TABLE_IDENTIFIER);
}
translator_spec_body:
TRANS_IDENTIFIER {
- $$ = $1->access_Translator (true);
+ $$ = $1->access_content_Translator (true);
$$-> set_spot (THIS->here_input ());
}
| TYPE STRING ';' {
Translator* t = get_translator_l (*$2);
- Translator_group * tg = t->access_Translator_group ();
+ Translator_group * tg = dynamic_cast<Translator_group*> (t);
if (!tg)
THIS->parser_error (_("Need a translator group for a context"));
}
| 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_identifier *s = dynamic_cast<String_identifier*> (id);
+ Real_identifier *r= dynamic_cast<Real_identifier*>(id);
+ int_identifier *i = dynamic_cast<int_identifier*> (id);
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) str = *s->access_content_String (false);
+ if (i) str = to_str (*i->access_content_int (false));
+ if (r) str = to_str (*r->access_content_Real (false));
if (!s && !i && !r)
THIS->parser_error (_("Wrong type for property value"));
delete $3;
}
| translator_spec_body CONSISTS STRING ';' {
- $$->access_Translator_group ()-> set_element (*$3, true);
+ dynamic_cast<Translator_group*> ($$)-> set_element (*$3, true);
delete $3;
}
| translator_spec_body ACCEPTS STRING ';' {
- $$->access_Translator_group ()-> set_acceptor (*$3, true);
+ dynamic_cast<Translator_group*> ($$)-> set_acceptor (*$3, true);
delete $3;
}
| translator_spec_body REMOVE STRING ';' {
- $$->access_Translator_group ()-> set_element (*$3, false);
+ dynamic_cast<Translator_group*> ($$)-> set_element (*$3, false);
delete $3;
}
;
$$ = new Score;
}
| SCORE_IDENTIFIER {
- $$ = $1->access_Score (true);
+ $$ = $1->access_content_Score (true);
}
| score_body mudela_header {
$$->header_p_ = $2;
| ';'
;
+optional_dot:
+ /* empty */
+ | '.'
+ ;
+
paper_def_body:
/* empty */ {
Paper_def *p = THIS->default_paper_p ();
$$ = p;
}
| PAPER_IDENTIFIER optional_semicolon {
- Paper_def *p = $1->access_Paper_def (true);
+ Paper_def *p = $1->access_content_Paper_def (true);
THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
$$ = p;
}
| paper_def_body int '=' symtables { // ugh, what a syntax
- Lookup * l = global_lookup_l->lookup_p (*$4);
+ Lookup * l = new Lookup (*$4);
$$->set_lookup ($2, l);
}
| paper_def_body assignment ';' {
}
| dimension
| REAL_IDENTIFIER {
- $$= *$1->access_Real (false);
+ $$= *$1->access_content_Real (false);
}
| '-' real_expression %prec UNARY_MINUS {
$$ = -$2;
$$ = THIS->default_midi_p ();
}
| MIDI_IDENTIFIER {
- $$ = $1-> access_Midi_def (true);
+ $$ = $1-> access_content_Midi_def (true);
}
| midi_body translator_spec {
$$-> assign_translator ($2);
| Composite_music
;
+Alternative_music: {
+ Music_list* m = new Music_list;
+ $$ = new Sequential_music (m);
+ }
+ | ALTERNATIVE Simultaneous_music {
+ $$ = $2;
+ }
+ | ALTERNATIVE Sequential_music {
+ $$ = $2;
+ }
+ ;
+
+Repeated_music: REPEAT unsigned Music Alternative_music {
+ Music_sequence* m = dynamic_cast <Music_sequence*> ($4);
+ assert (m);
+ $$ = new Repeated_music ($3, $2 >? 1, m);
+ }
+ ;
+
Sequential_music: '{' Music_list '}' {
$$ = new Sequential_music ($2);
}
Simple_music:
request_chord { $$ = $1; }
- | MUSIC_IDENTIFIER { $$ = $1->access_Music (true); }
+ | MUSIC_IDENTIFIER { $$ = $1->access_content_Music (true); }
| property_def
| translator_change
;
delete $2;
delete $4;
}
- | TIMES int '/' int Music {
- $$ = new Compressed_music ($2, $4, $5);
+ | TIMES {
+ THIS->remember_spot ();
+ }
+ /* CONTINUED */
+ int '/' int Music
+ {
+ $$ = new Compressed_music ($3, $5, $6);
+ $$->set_spot (THIS->pop_spot ());
}
+ | Repeated_music { $$ = $1; }
| Simultaneous_music { $$ = $1; }
| Sequential_music { $$ = $1; }
| TRANSPOSE musical_pitch Music {
$$ = new Transposed_music ($3, *$2);
delete $2;
}
+ | TRANSPOSE steno_tonic_pitch Music {
+ $$ = new Transposed_music ($3, *$2);
+ delete $2;
+ }
| NOTES
{ THIS->lexer_p_->push_note_state (); }
Music
{ $$ = $3;
THIS->lexer_p_->pop_state ();
}
-
+ | CHORDS
+ { THIS->lexer_p_->push_chord_state (); }
+ Music
+ {
+ $$ = $3;
+ THIS->lexer_p_->pop_state ();
+ }
| LYRICS
{ THIS->lexer_p_->push_lyric_state (); }
Music
{
$$ = $3;
THIS->lexer_p_->pop_state ();
- }
+ }
| relative_music { $$ = $1; }
;
$$ = new Barcheck_req;
}
| COMMAND_IDENTIFIER {
- $$ = $1->access_Request (true);
+ $$ = $1->access_content_Request (true);
}
/*
| '[' {
$$ = new Clef_change_req (*$2);
delete $2;
}
- | KEY NOTENAME_PITCH {
+ | KEY NOTENAME_PITCH optional_modality {
Key_change_req *key_p= new Key_change_req;
key_p->pitch_arr_.push(*$2);
key_p->ordinary_key_b_ = true;
+ key_p->modality_i_ = $3;
$$ = key_p;
delete $2;
}
post_request:
POST_REQUEST_IDENTIFIER {
- $$ = (Request*)$1->access_Request (true);
+ $$ = (Request*)$1->access_content_Request (true);
}
| dynamic_req {
$$ = $1;
a->type_i_ = $1;
$$ = a;
}
+ | extender_req {
+ $$ = $1;
+ }
+ ;
+
+optional_modality:
+ /* empty */ {
+ $$ = 0;
+ }
+ | int {
+ $$ = $1;
+ }
;
sup_quotes:
}
;
+steno_tonic_pitch:
+ TONICNAME_PITCH {
+ $$ = $1;
+ }
+ | TONICNAME_PITCH sup_quotes {
+ $$ = $1;
+ $$->octave_i_ += $2;
+ }
+ | TONICNAME_PITCH sub_quotes {
+ $$ = $1;
+ $$->octave_i_ += - $2;
+ }
+ ;
+
explicit_musical_pitch:
MUSICAL_PITCH '{' int_list '}' {/* ugh */
Array<int> &a = *$3;
| steno_notepitch '!' {
$$->forceacc_b_ = ! $$->forceacc_b_;
}
+ | steno_notepitch '?' {
+ $$->forceacc_b_ = ! $$->forceacc_b_;
+ $$->cautionary_b_ = ! $$->cautionary_b_;
+ }
;
}
;
+extender_req:
+ EXTENDER {
+ if (!THIS->lexer_p_->lyric_state_b ())
+ THIS->parser_error (_ ("have to be in Lyric mode for lyrics"));
+ Extender_req * e_p = new Extender_req;
+ e_p->spantype = Span_req::START;
+ $$ = e_p;
+ THIS->extender_req = e_p;
+ };
+
dynamic_req:
ABSDYNAMIC '{' unsigned '}' {
Absolute_dynamic_req *ad_p = new Absolute_dynamic_req;
;
mudela_script:
- SCRIPT_IDENTIFIER { $$ = $1->access_General_script_def (true); }
+ SCRIPT_IDENTIFIER { $$ = $1->access_content_General_script_def (true); }
| script_definition { $$ = $1; }
| script_abbreviation {
- $$ = THIS->lexer_p_->lookup_identifier (*$1)->access_General_script_def (true);
+ $$ = THIS->lexer_p_->lookup_identifier (*$1)->access_content_General_script_def (true);
delete $1;
}
;
pre_requests:
{
+ if (THIS->extender_req)
+ {
+ Extender_req * e_p = new Extender_req;
+ e_p->spantype = Span_req::STOP;
+ THIS->pre_reqs.push (e_p);
+ THIS->extender_req = 0;
+ }
+
}
| pre_requests open_request_parens {
+
Array<Request*>& r = *THIS->get_parens_request ($2);
for (int i = 0; i < r.size (); i++ )
r[i]->set_spot (THIS->here_input ());
}
}
| DURATION_IDENTIFIER {
- $$ = $1->access_Duration (true);
+ $$ = $1->access_content_Duration (true);
}
| steno_duration '.' {
$$->dots_i_ ++;
$$ = THIS->get_word_element (*$1, $2);
delete $1;
}
+ | '@' chord {
+ if (!THIS->lexer_p_->chord_state_b ())
+ THIS->parser_error (_ ("have to be in Chord mode for chords"));
+ $$ = $2;
+ }
;
+chord:
+ notemode_duration steno_musical_pitch chord_additions chord_subtractions {
+ $$ = THIS->get_chord (*$2, $3, $4, *$1);
+ };
+
+chord_additions:
+ {
+ $$ = new Array<Musical_pitch>;
+ }
+ | chord_additions chord_note {
+ $1->push (*$2);
+ $$ = $1;
+ }
+ | chord_additions CHORDMODIFIER_PITCH {
+ /*
+ urg, this is kind of ugly.
+ all but "sus" chord modifiers can be
+ handled as chord_additions...
+ */
+ $1->push (*$2);
+ $$ = $1;
+ }
+ ;
+
+chord_note:
+ UNSIGNED {
+ $$ = new Musical_pitch;
+ $$->notename_i_ = ($1 - 1) % 7;
+ $$->octave_i_ = $1 > 7 ? 1 : 0;
+ $$->accidental_i_ = 0;
+ }
+ | UNSIGNED '+' {
+ $$ = new Musical_pitch;
+ $$->notename_i_ = ($1 - 1) % 7;
+ $$->octave_i_ = $1 > 7 ? 1 : 0;
+ $$->accidental_i_ = 1;
+ }
+ | UNSIGNED '-' {
+ $$ = new Musical_pitch;
+ $$->notename_i_ = ($1 - 1) % 7;
+ $$->octave_i_ = $1 > 7 ? 1 : 0;
+ $$->accidental_i_ = -1;
+ }
+ ;
+
+chord_subtractions:
+ {
+ $$ = new Array<Musical_pitch>;
+ }
+ | '^' {
+ $$ = new Array<Musical_pitch>;
+ }
+ | chord_subtractions chord_addsub {
+ $$ = $1;
+ $$->push (*$2);
+ }
+ ;
+
/*
UTILITIES
*/
$$ = -$2;
}
| INT_IDENTIFIER {
- $$ = *$1->access_int (false);
+ $$ = *$1->access_content_int (false);
}
;
$$ = $1;
}
| STRING_IDENTIFIER {
- $$ = $1->access_String (true);
+ $$ = $1->access_content_String (true);
}
| string '+' string {
*$$ += *$3;
$$ = new Symtables;
}
| IDENTIFIER {
- $$ = $1->access_Symtables (true);
+ $$ = $1->access_content_Symtables (true);
}
| symtables_body FONT STRING {
$$->font_ = *$3;
symtable_body:
{ $$ = new Symtable; }
| symtable_body STRING symboldef {
- $$->add (*$2, *$3);
+ $$->elem (*$2) = *$3;
delete $2;
delete $3;
}
symboldef:
STRING unsigned box {
- $$ = global_lookup_l->atom_p (*$1, $2, *$3);
+ // ignore #args
+ $$ = new Atom (*$1, *$3);
delete $1;
delete $3;
}
| STRING unsigned {
Box b (Interval (0,0), Interval (0,0));
- $$ = global_lookup_l->atom_p (*$1, $2, b);
+ // ignore #args
+ $$ = new Atom (*$1, b);
delete $1;
}
;
projects / lilypond.git / blobdiff