#include "scalar.hh"
#include "translation-property.hh"
#include "script-def.hh"
-#include "symtable.hh"
#include "lookup.hh"
#include "misc.hh"
#include "my-lily-lexer.hh"
// mmm
Mudela_version oldest_version ("1.0.14");
-Mudela_version version ("1.0.14");
+Mudela_version version ("1.0.15");
// needed for bison.simple's malloc() and free()
Array<Musical_pitch> *pitch_arr;
Array<String> * strvec;
Array<int> *intvec;
- Atom * symbol;
- Box *box;
Notename_table *chordmodifiertab;
Duration *duration;
General_script_def * script;
Scalar *scalar;
Simultaneous_music *chord;
String *string;
- Symtable * symtable;
- Symtables* symtables;
Tempo_req *tempo;
Text_def * textdef;
Translator* trans;
%token SHAPE
%token SKIP
%token SPANDYNAMIC
-%token SYMBOLTABLES
-%token TABLE
%token TEMPO
%token TIME_T
%token TIMES
%type <outputdef> output_def
%type <scope> mudela_header mudela_header_body
-%type <box> box
%type <i> open_request_parens close_request_parens
%type <i> sub_quotes sup_quotes
%type <music> simple_element request_chord command_element Simple_music Composite_music
%type <id> identifier_init simple_identifier_init block_identifier
%type <duration> steno_duration notemode_duration
%type <duration> entered_notemode_duration explicit_duration
-%type <interval> dinterval
%type <intvec> intastint_list int_list
-%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_arr> chord_additions chord_subtractions chord_notes
%type <pitch> chord_addsub chord_note chord_inversion notemode_chord_inversion
%type <midi> midi_block midi_body
%type <duration> duration_length
%type <script> script_definition script_body mudela_script gen_script_def
%type <textdef> text_def finger
%type <string> script_abbreviation
-%type <symbol> symboldef
-%type <symtable> symtable symtable_body
%type <trans> translator_spec translator_spec_body
%type <tempo> tempo_request
%type <notenametab> notenames_body notenames_block chordmodifiers_block
-/* 5 extra for notemode_chord */
-%expect 15
+%expect 7
%left '-' '+'
$$ = new Midi_def_identifier ($1, MIDI_IDENTIFIER);
}
- | symtables {
- $$ = new Symtables_identifier ($1, IDENTIFIER);
- }
| translator_spec {
$$ = new Translator_identifier ($1, TRANS_IDENTIFIER);
}
THIS->parser_error (_("Wrong type for property value"));
delete $4;
- $$->set_property (*$2, str);
+ /* ugh*/
+ Translator_group * tr = dynamic_cast<Translator_group*>($$);
+ tr->set_property (*$2, str);
}
| translator_spec_body NAME STRING ';' {
$$->type_str_ = *$3;
*/
score_block:
SCORE { THIS->remember_spot ();
- THIS->error_level_i_ =0;
}
/*cont*/ '{' score_body '}' {
$$ = $4;
if (!$$->def_p_arr_.size ())
$$->add_output (THIS->default_paper_p ());
- /* handle error levels. */
- $$->errorlevel_i_ = THIS->error_level_i_;
- THIS->error_level_i_ = 0;
}
;
THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
$$ = p;
}
- | paper_def_body int '=' symtables { // ugh, what a syntax
- Lookup * l = new Lookup (*$4);
+ | paper_def_body int '=' FONT STRING { // ugh, what a syntax
+ Lookup * l = new Lookup;
+ l->font_name_ = *$5;
+ delete $5;
$$->set_lookup ($2, l);
}
| paper_def_body assignment ';' {
;
tempo_request:
- TEMPO entered_notemode_duration '=' unsigned {
+ TEMPO steno_duration '=' unsigned {
$$ = new Tempo_req;
$$->dur_ = *$2;
delete $2;
$$ = $1->access_content_Request (true);
}
| '~' {
- $$ = new Command_tie_req;
+ $$ = new Tie_req;
}
| '[' {
Beam_req*b= new Beam_req;
THIS->parser_error (_ ("have to be in Chord mode for chords"));
$$ = $1;
}
- | '@' notemode_chord {
+ | '@' notemode_chord '@' {
if (!THIS->lexer_p_->note_state_b ())
THIS->parser_error (_ ("have to be in Note mode for @chords"));
$$ = $2;
{
$$ = new Array<Musical_pitch>;
}
- | '-' {
+ | '-' chord_notes {
+ $$ = $2;
+ }
+ ;
+
+chord_notes:
+ {
$$ = new Array<Musical_pitch>;
- }
- | chord_additions chord_addsub {
+ }
+ | chord_notes chord_addsub {
$$ = $1;
$$->push (*$2);
}
;
chord_note:
- UNSIGNED {
+ unsigned {
$$ = new Musical_pitch;
$$->notename_i_ = ($1 - 1) % 7;
$$->octave_i_ = $1 > 7 ? 1 : 0;
$$->accidental_i_ = 0;
}
- | UNSIGNED '+' {
+ | unsigned '+' {
$$ = new Musical_pitch;
$$->notename_i_ = ($1 - 1) % 7;
$$->octave_i_ = $1 > 7 ? 1 : 0;
$$->accidental_i_ = 1;
}
- | UNSIGNED '-' {
+ | unsigned '-' {
$$ = new Musical_pitch;
$$->notename_i_ = ($1 - 1) % 7;
$$->octave_i_ = $1 > 7 ? 1 : 0;
}
;
-chord_subtractions:
+chord_subtractions:
{
$$ = new Array<Musical_pitch>;
- }
- | '^' {
- $$ = new Array<Musical_pitch>;
- }
- | chord_subtractions chord_addsub {
- $$ = $1;
- $$->push (*$2);
+ }
+ | '^' chord_notes {
+ $$ = $2;
}
;
-/*
- symbol tables
-*/
-symtables:
- SYMBOLTABLES '{' symtables_body '}' { $$ = $3; }
- ;
-
-symtables_body:
- {
- $$ = new Symtables;
- }
- | IDENTIFIER {
- $$ = $1->access_content_Symtables (true);
- }
- | symtables_body FONT STRING {
- $$->font_ = *$3;
- $$->font_path_ = global_path.find (*$3);
- if (!$$->font_path_.length_i ())
- THIS->here_input ().error (_f("can't open file: `%s'", $3->ch_C()));
-
- delete $3;
- }
- | symtables_body STRING '=' symtable {
- $$->add (*$2, $4);
- delete $2;
- }
- ;
-
-symtable:
- TABLE '{' symtable_body '}' { $$ = $3; }
- ;
-
-symtable_body:
- { $$ = new Symtable; }
- | symtable_body STRING symboldef {
- $$->elem (*$2) = *$3;
- delete $2;
- delete $3;
- }
- ;
-
-symboldef:
- STRING unsigned box {
- // ignore #args
- $$ = new Atom (*$1, *$3);
- delete $1;
- delete $3;
- }
- | STRING unsigned {
- Box b (Interval (0,0), Interval (0,0));
- // ignore #args
- $$ = new Atom (*$1, b);
- delete $1;
- }
- ;
-box:
- dinterval dinterval {
- $$ = new Box (*$1, *$2);
- delete $1;
- delete $2;
- }
- ;
-dinterval: real real {
- $$ = new Interval ($1, $2);
- }
- ;
%%
projects / lilypond.git / blobdiff