*/
#include <iostream.h>
+#include "lily-guile.hh"
#include "notename-table.hh"
#include "scalar.hh"
#include "translation-property.hh"
#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 "keyword.hh"
#include "debug.hh"
#include "parseconstruct.hh"
-#include "dimension.hh"
+#include "dimensions.hh"
#include "identifier.hh"
#include "command-request.hh"
#include "musical-request.hh"
#include "translator-group.hh"
#include "score.hh"
#include "music-list.hh"
-#include "header.hh"
#include "duration-convert.hh"
#include "change-translator.hh"
#include "file-results.hh"
#include "scope.hh"
#include "relative-music.hh"
#include "transposed-music.hh"
+#include "compressed-music.hh"
// mmm
-Mudela_version oldest_version ("1.0.6");
-Mudela_version version ("1.0.6");
+Mudela_version oldest_version ("1.0.7");
+Mudela_version version ("1.0.8");
// needed for bison.simple's malloc() and free()
4
};
+struct Assignment {
+ String *name_p_;
+ Identifier *id_p_;
+ ~Assignment () {
+ delete name_p_;
+ delete id_p_;
+ }
+ Assignment () {
+ name_p_ = 0;
+ id_p_ =0;
+ }
+ Assignment (Assignment const&s)
+ {
+ name_p_ = new String (*s.name_p_);
+ id_p_ = s.id_p_->clone ();
+ }
+};
+
Paper_def* current_paper = 0;
#ifndef NDEBUG
#define yyerror THIS->parser_error
#define ARRAY_SIZE(a,s) if (a.size () != s) THIS->parser_error (_f("expecting %d arguments", s))
-
%}
Music *music;
Music_list *music_list;
Score *score;
- Header *header;
+ Scope *scope;
Interval *interval;
Musical_req* musreq;
Music_output_def * outputdef;
%token IN_T
%token KEY
%token KEYSIGNATURE
-%token LYRIC
+%token LYRICS
%token MAEBTELP
%token MARK
%token MEASURES
%token MM_T
%token MUSIC
%token MUSICAL_PITCH
+%token NAME
%token NOTENAMES
%token NOTES
%token OCTAVE
%token PT_T
%token RELATIVE
%token REMOVE
+%token SCHEME /* token vs typedef; can't be named SCM */
%token SCORE
%token SCRIPT
%token SHAPE
%token TELP
%token TEMPO
%token TIME_T
+%token TIMES
%token TRANSLATOR
%token TRANSPOSE
%token TYPE
%type <outputdef> output_def
-%type <header> mudela_header mudela_header_body
+%type <scope> mudela_header mudela_header_body
%type <box> box
%type <i> open_request_parens close_request_parens
%type <i> open_abbrev_parens
%type <i> open_plet_parens close_plet_parens
%type <i> sub_quotes sup_quotes
-%type <music> simple_element request_chord command_element
+%type <music> simple_element request_chord command_element Simple_music Composite_music
%type <i> abbrev_type
%type <i> int unsigned
%type <i> script_dir
-%type <id> identifier_init simple_identifier_init
+%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 <music> property_def translator_change
%type <music_list> Music_list
%type <paper> paper_block paper_def_body
-%type <real> dim real
-%type <real> real_mult_expression real_primary
-%type <real> unit
+%type <real> real_expression real dimension
%type <request> abbrev_command_req
%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 <string> string
-%type <string> string_primary
%type <score> score_block score_body
%type <intarr> shape_array
%type <script> script_definition script_body mudela_script gen_script_def
%type <trans> translator_spec translator_spec_body
%type <tempo> tempo_request
%type <notenametab> notenames_body notenames_block
-%expect 1
+%expect 3
+%left '-' '+'
+%left '*' '/'
+%left UNARY_MINUS
+
%%
mudela: /* empty */
| mudela toplevel_expression {}
- | mudela add_declaration { }
+ | mudela assignment { }
| mudela error
| mudela check_version { }
;
Midi_def_identifier ($1, MIDI_IDENTIFIER);
THIS->lexer_p_->set_identifier ("$defaultmidi", id)
}
+ | embedded_scm {
+ }
;
+embedded_scm:
+ SCHEME STRING ';' {
+ #ifdef HAVE_LIBGUILE
+ gh_eval_str ($2->ch_l ());
+ #endif
+ delete $2;
+ };
+
check_version:
VERSION STRING ';' {
Mudela_version ver (*$2);
$$ = 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;
;
mudela_header_body:
- {
- $$ = new Header;
+ {
+ $$ = new Scope;
+ THIS->lexer_p_-> scope_l_arr_.push ($$);
}
- | mudela_header_body STRING '=' string ';' {
- (*$$)[*$2] = *$4;
- delete $2;
- delete $4;
+ | mudela_header_body assignment ';' {
+
}
;
mudela_header:
HEADER '{' mudela_header_body '}' {
$$ = $3;
+ THIS->lexer_p_-> scope_l_arr_.pop ();
}
;
/*
DECLARATIONS
*/
-add_declaration:
+assignment:
STRING {
THIS->remember_spot ();
}
- /* cont */ '=' identifier_init optional_semicolon {
+ /* cont */ '=' identifier_init {
THIS->lexer_p_->set_identifier (*$1, $4);
$4->init_b_ = THIS->init_parse_b_;
$4->set_spot (THIS->pop_spot ());
}
;
+
+
simple_identifier_init: identifier_init
;
+
identifier_init:
+ block_identifier
+ ;
+
+block_identifier:
score_block {
$$ = new Score_identifier ($1, SCORE_IDENTIFIER);
$$ = new Midi_def_identifier ($1, MIDI_IDENTIFIER);
}
- | script_definition {
- $$ = new General_script_def_identifier ($1, SCRIPT_IDENTIFIER);
-
+ | symtables {
+ $$ = new Symtables_identifier ($1, IDENTIFIER);
+ }
+ | translator_spec {
+ $$ = new Translator_identifier ($1, TRANS_IDENTIFIER);
}
| Music {
$$ = new Music_identifier ($1, MUSIC_IDENTIFIER);
-
- }
- | symtables {
- $$ = new Symtables_identifier ($1, IDENTIFIER);
}
+
| post_request {
$$ = new Request_identifier ($1, POST_REQUEST_IDENTIFIER);
}
| int {
$$ = new int_identifier (new int ($1), INT_IDENTIFIER);
}
- | translator_spec {
- $$ = new Translator_identifier ($1, TRANS_IDENTIFIER);
+ | script_definition {
+ $$ = new General_script_def_identifier ($1, SCRIPT_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 $4;
$$->set_property (*$2, str);
}
- | translator_spec_body STRING ';' {
- $$->type_str_ = *$2;
- delete $2;
+ | translator_spec_body NAME STRING ';' {
+ $$->type_str_ = *$3;
+ 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;
$$ = 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 = ps_output_global_b ? new Ps_lookup (*$4)
- : new Tex_lookup (*$4);
+ Lookup * l = new Lookup (*$4);
$$->set_lookup ($2, l);
}
- | paper_def_body STRING '=' simple_identifier_init ';' {
- THIS->lexer_p_->set_identifier (*$2, $4);
- delete $2;
+ | paper_def_body assignment ';' {
+
}
| paper_def_body translator_spec {
- $$-> assign_translator ($2);
+ $$->assign_translator ($2);
}
| paper_def_body SHAPE '=' shape_array ';' {
$$->shape_int_a_ = *$4;
}
;
-real_primary:
- REAL {
- $$ = $1;
+
+real:
+ real_expression { $$ = $1; }
+ ;
+
+
+dimension:
+ REAL CM_T {
+ $$ = $1 CM;
}
- | REAL_IDENTIFIER {
- $$= *$1->access_Real (false);
+ | REAL PT_T {
+ $$ = $1 PT;
}
- | dim
- | '(' real ')' {
- $$ = $2;
+ | REAL IN_T {
+ $$ = $1 INCH;
+ }
+ | REAL MM_T {
+ $$ = $1 MM;
}
;
-real:
- real_mult_expression
- | real '+' real_mult_expression {
- $$ = $1 + $3;
+real_expression:
+ REAL {
+ $$ = $1;
}
- | real '-' real_mult_expression {
- $$ = $1 - $3;
+ | dimension
+ | REAL_IDENTIFIER {
+ $$= *$1->access_content_Real (false);
}
- ;
-
-real_mult_expression:
- real_primary
- | real_mult_expression '*' real_primary {
+ | '-' real_expression %prec UNARY_MINUS {
+ $$ = -$2;
+ }
+ | real_expression '*' real_expression {
$$ = $1 * $3;
}
- | real_mult_expression '/' real_primary {
+ | real_expression '/' real_expression {
$$ = $1 / $3;
}
+ | real_expression '+' real_expression {
+ $$ = $1 + $3;
+ }
+ | real_expression '-' real_expression {
+ $$ = $1 - $3;
+ }
+ | '(' real_expression ')' {
+ $$ = $2;
+ }
;
+
shape_array:
/* empty */ {
$$ = new Array<Interval>;
}
- | shape_array dim dim {
+ | shape_array real real {
$$->push(Interval($2, $2 + $3));
};
$$ = THIS->default_midi_p ();
}
| MIDI_IDENTIFIER {
- $$ = $1-> access_Midi_def (true);
+ $$ = $1-> access_content_Midi_def (true);
}
| midi_body translator_spec {
$$-> assign_translator ($2);
;
+Music:
+ Simple_music
+ | Composite_music
+ ;
+
Sequential_music: '{' Music_list '}' {
$$ = new Sequential_music ($2);
}
$$ = new Simultaneous_music ($2);
}
;
-Music:
+
+Simple_music:
request_chord { $$ = $1; }
- | TYPE STRING Music {
+ | MUSIC_IDENTIFIER { $$ = $1->access_content_Music (true); }
+ | property_def
+ | translator_change
+ ;
+
+
+Composite_music:
+ TYPE STRING Music {
$$ = $3;
$$->translator_type_str_ = *$2;
delete $2;
delete $2;
delete $4;
}
+ | TIMES int '/' int Music {
+ $$ = new Compressed_music ($2, $4, $5);
+
+ }
| Simultaneous_music { $$ = $1; }
| Sequential_music { $$ = $1; }
| TRANSPOSE musical_pitch Music {
$$ = new Transposed_music ($3, *$2);
delete $2;
}
- | MUSIC_IDENTIFIER { $$ = $1->access_Music (true); }
| NOTES
{ THIS->lexer_p_->push_note_state (); }
Music
THIS->lexer_p_->pop_state ();
}
- | LYRIC
+ | LYRICS
{ THIS->lexer_p_->push_lyric_state (); }
Music
{
$$ = $3;
THIS->lexer_p_->pop_state ();
}
- | property_def
- | translator_change
| relative_music { $$ = $1; }
;
;
-
request_chord:
pre_requests simple_element post_requests {
THIS->add_requests ((Simultaneous_music*)$2);//ugh
| command_element
;
-
-
-
command_element:
command_req {
$$ = new Request_chord;
$$-> set_spot (THIS->here_input ());
$1-> set_spot (THIS->here_input ());
((Simultaneous_music*)$$) ->add_music ($1);//ugh
-
}
;
$$ = new Barcheck_req;
}
| COMMAND_IDENTIFIER {
- $$ = $1->access_Request (true);
+ $$ = $1->access_content_Request (true);
+ }
+/*
+ | '[' {
+ $$ = new Beam_req;
+ $$->spantype = Span_req::START;
+ }
+ | ']' {
+ $$ = new Beam_req;
+ $$->spantype = Span_req::STOP;
}
+*/
;
+
verbose_command_req:
BAR STRING {
$$ = new Bar_req (*$2);
post_request:
POST_REQUEST_IDENTIFIER {
- $$ = (Request*)$1->access_Request (true);
+ $$ = (Request*)$1->access_content_Request (true);
}
| dynamic_req {
$$ = $1;
;
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;
}
;
}
}
| DURATION_IDENTIFIER {
- $$ = $1->access_Duration (true);
+ $$ = $1->access_content_Duration (true);
}
| steno_duration '.' {
$$->dots_i_ ++;
steno_notepitch notemode_duration {
if (!THIS->lexer_p_->note_state_b ())
THIS->parser_error (_ ("have to be in Note mode for notes"));
- $1->set_duration (*$2);
- int durlog_i = $2->durlog_i_;
+ $1->duration_ = *$2;
$$ = THIS->get_note_element ($1, $2);
}
| RESTNAME notemode_duration {
$$ = -$2;
}
| INT_IDENTIFIER {
- $$ = *$1->access_int (false);
+ $$ = *$1->access_content_int (false);
}
;
-string_primary:
+
+string:
STRING {
$$ = $1;
}
| STRING_IDENTIFIER {
- $$ = $1->access_String (true);
+ $$ = $1->access_content_String (true);
}
- ;
-
-string:
- string_primary {
- $$ = $1;
- }
- | string '+' string_primary {
+ | string '+' string {
*$$ += *$3;
delete $3;
}
;
-dim:
- real_primary unit { $$ = $1*$2; }
- ;
-
-unit: CM_T { $$ = 1 CM; }
- |IN_T { $$ = 1 INCH; }
- |MM_T { $$ = 1 MM; }
- |PT_T { $$ = 1 PT; }
- ;
/*
symbol tables
$$ = 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 box {
- $$ = new Atom (*$1, *$2);
+ STRING unsigned box {
+ // ignore #args
+ $$ = new Atom (*$1, *$3);
delete $1;
- delete $2;
+ delete $3;
}
- | STRING {
+ | STRING unsigned {
Box b (Interval (0,0), Interval (0,0));
+ // ignore #args
$$ = new Atom (*$1, b);
delete $1;
}
}
;
-dinterval: dim dim {
+dinterval: real real {
$$ = new Interval ($1, $2);
}
;
projects / lilypond.git / blobdiff