*/
#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"
#define yyerror THIS->parser_error
#define ARRAY_SIZE(a,s) if (a.size () != s) THIS->parser_error (_f("expecting %d arguments", s))
-
%}
%token PT_T
%token RELATIVE
%token REMOVE
+%token SCHEME /* token vs typedef; can't be named SCM */
%token SCORE
%token SCRIPT
%token SHAPE
%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
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;
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;
$$ = 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);
Simple_music:
request_chord { $$ = $1; }
- | MUSIC_IDENTIFIER { $$ = $1->access_Music (true); }
+ | MUSIC_IDENTIFIER { $$ = $1->access_content_Music (true); }
| property_def
| translator_change
;
$$ = 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;
}
;
+optional_modality:
+ /* empty */ {
+ $$ = 0;
+ }
+ | int {
+ $$ = $1;
+ }
+ ;
+
sup_quotes:
'\'' {
$$ = 1;
| steno_notepitch '!' {
$$->forceacc_b_ = ! $$->forceacc_b_;
}
+ | steno_notepitch '?' {
+ $$->forceacc_b_ = ! $$->forceacc_b_;
+ $$->cautionary_b_ = ! $$->cautionary_b_;
+ }
;
;
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_ ++;
$$ = -$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