%{ // -*-Fundamental-*-
#include <iostream.h>
+#include "lookup.hh"
+#include "misc.hh"
#include "lexer.hh"
-#include "paper.hh"
-#include "inputstaff.hh"
+#include "paperdef.hh"
+#include "mididef.hh"
#include "inputscore.hh"
-#include "inputmusic.hh"
#include "main.hh"
#include "keyword.hh"
-#include "inputcommand.hh"
#include "debug.hh"
#include "parseconstruct.hh"
#include "dimen.hh"
#include "identifier.hh"
-
+#include "commandrequest.hh"
+#include "musicalrequest.hh"
#ifndef NDEBUG
#define YYDEBUG 1
#endif
-svec<Request*> pre_reqs, post_reqs;
+Array<Request*> pre_reqs, post_reqs;
+Array<const char *> define_spots;
+Paperdef*default_paper();
+char const* defined_ch_c_l;
+char const* req_defined_ch_c_l;
+int fatal_error_i = 0;
+
%}
-%union {
+%union {
+ Request * request;
Real real;
- Input_command *command;
Identifier *id;
- Voice *voice;
+ Voice *voice;
Voice_element *el;
String *string;
const char *consstr;
Paperdef *paper;
- Request* request;
- Horizontal_music *horizontal;
- Vertical_music *vertical;
+ Midi_def* midi;
+ Input_music *music;
Music_general_chord *chord;
Music_voice *mvoice;
int i;
char c;
-
- svec<String> * strvec;
- svec<Input_command*> *commandvec;
- Voice_list *voicelist;
- Input_staff *staff;
- Input_score *score;
+ int ii[10];
+ Moment *moment;
+
+ Array<String> * strvec;
+ Array<int> *intvec;
+ Array<Melodic_req*> *melreqvec;
+ Input_staff *staff;
+ Input_score *score;
+ Symtables * symtables;
+ Symtable * symtable;
+ Symbol * symbol;
+ Lookup*lookup;
+ Interval *interval;
+ Box *box;
+ Notename_tab *notename_tab;
+ Script_def * script;
+ Text_def * textdef;
}
-%token VOICE STAFF SCORE TITLE BAR NOTENAME OUTPUT
-%token CM IN PT MM PAPER WIDTH METER UNITSPACE SKIP COMMANDS
+%token VOICE STAFF SCORE TITLE BAR OUTPUT MULTIVOICE
+%token CM_T IN_T PT_T MM_T PAPER WIDTH METER UNITSPACE SKIP COMMANDS COMMAND
%token GEOMETRIC START_T DURATIONCOMMAND OCTAVECOMMAND
-%token KEY CLEF VIOLIN BASS MULTI TABLE CHORD VOICES
-%token PARTIAL RHYTHMIC MELODIC MUSIC
+%token KEY CLEF TABLE VOICES STEM
+%token PARTIAL MUSIC GROUPING CADENZA
+%token END SYMBOLTABLES TEXID TABLE NOTENAMES SCRIPT TEXTSTYLE PLET
+%token GOTO
+%token MIDI TEMPO
%token <id> IDENTIFIER
-%token <string> NEWIDENTIFIER
-%token <string> PITCH DURATION RESTNAME
-%token <real> REAL
+%token <string> PITCHMOD DURATION RESTNAME
+%token <ii> NOTENAME
+%token <real> REAL
%token <string> STRING
-%token <i> OPEN_REQUEST_PARENS CLOSE_REQUEST_PARENS
-
-%type <consstr> unit
-
-%type <id> declaration
+%token <i> DOTS INT
+%type <real> unit
+%type <melreqvec> pitch_list
+%type <c> open_request_parens close_request_parens close_plet_parens
+%type <id> declaration
+%type <string> declarable_identifier
%type <paper> paper_block paper_body
-%type <real> dim
+%type <midi> midi_block midi_body
+%type <real> dim real
+%type <ii> default_duration explicit_duration notemode_duration mudela_duration
+%type <ii> notename
+%type <moment> duration_length
+%type <el> voice_elt full_element lyrics_elt command_elt
-%type <el> voice_elt full_element
-%type <command> score_command staff_command skipcommand
%type <score> score_block score_body
%type <staff> staff_block staff_init staff_body
%type <i> int
-%type <commandvec> score_commands_block score_commands_body
-%type <commandvec> staff_commands_block staff_commands_body
-%type <request> post_request pre_request
-%type <strvec> pitch_list
-%type <string> clef_id
-%type <vertical> vertical_music
+%type <intvec> intastint_list
+%type <request> post_request pre_request command_req
+%type <string> pitchmod
+%type <music> music
%type <chord> music_chord music_chord_body
-%type <horizontal> horizontal_music
-%type <mvoice> music_voice_body music_voice
+
+%type <mvoice> music_voice_body music_voice
+
+%type <interval> dinterval
+%type <box> box
+%type <symtable> symtable symtable_body
+%type <lookup> symtables symtables_body
+%type <symbol> symboldef
+%type <notename_tab> notename_tab notename_tab_body
+%type <i> script_dir
+%type <script> script_definition script_body mudela_script
+%type <request> script_req textscript_req
+%type <textdef> mudela_text
%%
mudela: /* empty */
- | mudela score_block {
- add_score($2);
+ | mudela score_block {
+ add_score($2);
}
| mudela add_declaration { }
+ | mudela mudela_command {}
;
+
+mudela_command:
+ notename_tab { lexer->set($1); }
+ ;
+
/*
DECLARATIONS
*/
add_declaration: declaration {
- add_identifier($1);
+ lexer->add_identifier($1);
}
;
+declarable_identifier:
+ STRING { $$ = $1; }
+ | IDENTIFIER { $$ = new String($1->name); }
+ ;
+
declaration:
- NEWIDENTIFIER '=' staff_block {
+ declarable_identifier '=' staff_block {
$$ = new Staff_id(*$1, $3);
- delete $1; // this sux
+ delete $1;
}
- | NEWIDENTIFIER '=' music_voice {
+ | declarable_identifier '=' music_voice {
$$ = new M_voice_id(*$1, $3);
delete $1;
}
- | NEWIDENTIFIER '=' music_chord {
+ | declarable_identifier '=' script_definition {
+ $$ = new Script_id(*$1, $3);
+ delete $1;
+ }
+ | declarable_identifier '=' music_chord {
$$ = new M_chord_id(*$1, $3);
delete $1;
}
- ;
+ | declarable_identifier '=' symtables {
+ $$ = new Lookup_id(*$1, $3);
+ delete $1;
+ }
+ | declarable_identifier '=' notename_tab {
+ $$ = new Notetab_id(*$1, $3);
+ delete $1;
+ }
+ | declarable_identifier '=' real {
+ $$ = new Real_id(*$1, new Real($3));
+ delete $1;
+ }
+ | declarable_identifier error '}' {
+ }
+ ;
-/*
- SCORE
-*/
-score_block: SCORE '{' score_body '}' { $$ = $3; }
+notename_tab:
+ NOTENAMES '{' notename_tab_body '}' { $$ = $3; }
;
-score_body: { $$ = new Input_score; }
- | score_body staff_block { $$->add($2); }
- | score_body score_commands_block {
- $$->add(*$2);
+notename_tab_body: {
+ $$ = new Notename_tab;
+ }
+ | IDENTIFIER {
+ $$ = $1->notename_tab(true);
+ }
+ | notename_tab_body STRING int int {
+ $$->set($3, $4, *$2);
delete $2;
}
- | score_body paper_block { $$->set($2); }
;
+
/*
- COMMANDS
+ SCORE
*/
-score_commands_block:
- COMMANDS '{' score_commands_body '}' { $$ =$3;}
- ;
+score_block:
+ SCORE { define_spots.push(lexer->here_ch_c_l()); }
+ /*cont*/ '{' score_body '}' {
+ $$ = $4;
+ $$->defined_ch_c_l_ = define_spots.pop();
+ if (!$$->paper_p_ && ! $$->midi_p_)
+ $$->paper_p_ = default_paper();
-score_commands_body: { $$ = new svec<Input_command*>; }
- | score_commands_body score_command {
- $$->add($2);
+ /* handle error levels. */
+ $$->errorlevel_i_ = lexer->errorlevel_i_;
+ lexer->errorlevel_i_ = 0;
}
;
-staff_commands_block: COMMANDS '{' staff_commands_body '}' {
- $$ = $3; }
- ;
-
-staff_commands_body:
- /* empty */ { $$ = new svec<Input_command*>; }
- | staff_commands_body staff_command {
- $$->add($2);
+score_body: {
+ $$ = new Input_score;
}
- ;
-
-staff_command:
- skipcommand
- | KEY pitch_list {/*UGH*/
- $$ = get_key_interpret_command(*$2);
- delete $2;
- }
- | CLEF clef_id {
- $$ = get_clef_interpret_command(*$2);
- delete $2;
+ | score_body staff_block { $$->add($2); }
+ | score_body COMMANDS '{' music_voice_body '}' {
+ $$->set($4);
}
- ;
+ | score_body paper_block { $$->set($2); }
+ | score_body midi_block { $$->set($2); }
+ | score_body error {
-skipcommand:
- SKIP int ':' REAL {
- $$ = get_skip_command($2, $4);
}
+ ;
-score_command:
- skipcommand
- | METER int int {
- $$ = get_meterchange_command($2, $3);
- }
- | PARTIAL REAL {
- $$ = get_partial_command($2);
+intastint_list:
+ /* */ { $$ =new Array<int>; }
+ | intastint_list int '*' int {
+ $$->push($2); $$->push($4);
}
;
-
+
/*
PAPER
*/
paper_block:
- PAPER '{' paper_body '}' { $$ = $3; }
+ PAPER
+
+ '{' paper_body '}' { $$ = $3; }
;
paper_body:
- /* empty */ { $$ = new Paperdef; }
+ /* empty */ {
+ $$ = default_paper();
+ }
| paper_body WIDTH dim { $$->linewidth = $3;}
| paper_body OUTPUT STRING { $$->outfile = *$3;
delete $3;
}
+ | paper_body symtables { $$->set($2); }
| paper_body UNITSPACE dim { $$->whole_width = $3; }
| paper_body GEOMETRIC REAL { $$->geometric_ = $3; }
+ | paper_body error {
+
+ }
+ ;
+
+/*
+ MIDI
+*/
+midi_block:
+ MIDI
+
+ '{' midi_body '}' { $$ = $3; }
+ ;
+
+midi_body: {
+ $$ = new Midi_def;
+ }
+ | midi_body OUTPUT STRING {
+ $$->outfile_str_ = *$3;
+ delete $3;
+ }
+ | midi_body TEMPO mudela_duration ':' int {
+ $$->set_tempo( wholes( $3[0], $3[1] ), $5 );
+ }
+ | midi_body error {
+
+ }
;
+
/*
STAFFs
*/
staff_block:
- STAFF '{' staff_body '}' { $$ = $3; }
+ STAFF { define_spots.push(lexer->here_ch_c_l()); }
+/*cont*/ '{' staff_body '}' {
+ $$ = $4;
+ $$-> defined_ch_c_l_ = define_spots.pop();
+ }
;
staff_init:
- IDENTIFIER { $$ = new Input_staff(*$1->staff()); }
- | RHYTHMIC {
- $$ = new Input_staff("rhythmic");
- }
- | MELODIC {
- $$ = new Input_staff( "melodic");
+ IDENTIFIER { $$ = $1->staff(true); }
+ | STRING {
+ $$ = new Input_staff(*$1);
+ delete $1;
}
;
staff_body:
staff_init
- | staff_body horizontal_music {
+ | staff_body COMMANDS '{' music_voice_body '}' {
+ $$->set_score_wide($4);
+ }
+ | staff_body music {
+ $2->set_default_group( "staff_music" + String($$->music_.size()));
$$->add($2);
}
- | staff_body staff_commands_block {
- $$->add(*$2);
- delete $2;
+ | staff_body error {
}
;
/*
MUSIC
*/
-horizontal_music:
+music:
music_voice { $$ = $1; }
+ | music_chord { $$ = $1; }
;
-vertical_music:
- music_chord { $$ = $1; }
+music_voice: MUSIC '{' music_voice_body '}' { $$ = $3; }
;
-music_voice: MUSIC '{' music_voice_body '}' { $$ = $3; }
- ;
-
-music_voice_body: {
+music_voice_body:
+ /* */ {
$$ = new Music_voice;
}
| music_voice_body IDENTIFIER {
- $$->concatenate($2->mvoice());
+ $$->concatenate($2->mvoice(true));
}
| music_voice_body full_element {
- $$->add($2);
+ $$->add_elt($2);
}
| music_voice_body voice_command {
}
- | music_voice_body vertical_music {
+ | music_voice_body music {
$$->add($2);
}
+ | music_voice_body error {
+ }
;
-
-music_chord: CHORD '{' music_chord_body '}' { $$ = $3; }
+music_chord: '{' music_chord_body '}' { $$ = $2; }
;
-music_chord_body: {
- $$ = new Music_general_chord;
+music_chord_body:
+ /* */ {
+ $$ = new Voice_group_chord;
}
- | music_voice_body IDENTIFIER {
- $$->concatenate($2->mchord());
+ | MULTIVOICE {
+ $$ = new Multi_voice_chord;
+ }
+ | music_chord_body IDENTIFIER {
+ $$->concatenate($2->mchord(true));
+ }
+ | music_chord_body music {
+ $$->add($2);
+ }
+ | music_chord_body full_element {
+ $$ ->add_elt($2);
}
- | music_chord_body horizontal_music {
- $$ -> add($2);
+ | music_chord_body error {
}
;
-
/*
VOICE ELEMENTS
*/
add_requests($2, post_reqs);
$$ = $2;
}
+ | pre_requests lyrics_elt post_requests {
+ add_requests($2, pre_reqs);
+ add_requests($2, post_reqs);
+ $$ = $2;
+ }
+ | command_elt
+ ;
+
+command_elt:
+/* empty */ {
+ $$ = new Voice_element;
+ $$-> defined_ch_c_l_ = lexer->here_ch_c_l();
+ }
+/* cont: */
+ command_req {
+ $2-> defined_ch_c_l_ = $$->defined_ch_c_l_;
+ $$->add($2);
+
+ }
+ ;
+
+command_req:
+ '|' {
+ $$ = new Barcheck_req;
+ }
+ | BAR STRING {
+ $$ = new Bar_req(*$2);
+ delete $2;
+ }
+ | METER '{' int '*' int '}' {
+ Meter_change_req *m = new Meter_change_req;
+ m->set($3,$5);
+ $$ = m;
+ }
+ | SKIP '{' duration_length '}' {
+ Skip_req * skip_p = new Skip_req;
+ skip_p->duration_ = *$3;
+ delete $3;
+ $$ = skip_p;
+ }
+ | CADENZA '{' int '}' {
+ $$ = new Cadenza_req($3);
+ }
+ | PARTIAL '{' duration_length '}' {
+ $$ = new Partial_measure_req(*$3);
+ delete $3;
+ }
+ | STEM '{' int '}' {
+ $$ = get_stemdir_req($3);
+ }
+ | CLEF STRING {
+ $$ = new Clef_change_req(*$2);
+ delete $2;
+ }
+ | KEY '{' pitch_list '}' {
+ Key_change_req *key_p= new Key_change_req;
+ key_p->melodic_p_arr_ = *$3;
+ $$ = key_p;
+ delete $3;
+ }
+ | GROUPING '{' intastint_list '}' {
+ $$ = get_grouping_req(*$3); delete $3;
+ }
;
post_requests:
assert(post_reqs.empty());
}
| post_requests post_request {
- post_reqs.add($2);
+ $2->defined_ch_c_l_ = lexer->here_ch_c_l();
+ post_reqs.push($2);
+ }
+ | post_requests close_plet_parens INT '/' INT {
+ post_reqs.push( get_request($2) );
+ req_defined_ch_c_l = lexer->here_ch_c_l();
+ post_reqs.push( get_plet_request( $2, $3, $5 ) );
}
;
post_request:
- CLOSE_REQUEST_PARENS { $$ = get_request($1); }
+ close_request_parens {
+ $$ = get_request($1);
+ }
+ | script_req
+ | textscript_req
+ ;
+
+close_plet_parens:
+ ']' {
+ req_defined_ch_c_l = lexer->here_ch_c_l();
+ $$ = ']';
+ }
+ ;
+
+close_request_parens:
+ '(' {
+ $$='(';
+ }
+ | ']' {
+ $$ = ']';
+ }
+ ;
+
+open_request_parens:
+ ')' {
+ $$=')';
+ }
+ | '[' {
+ $$='[';
+ }
+ ;
+
+script_definition:
+ SCRIPT '{' script_body '}' { $$ = $3; }
;
-pre_requests:
+script_body:
+ STRING int int int {
+ $$ = new Script_def(*$1,$2, $3,$4);
+ delete $1;
+ }
+ ;
+
+textscript_req:
+ script_dir mudela_text { $$ = get_text_req($1,$2); }
+ ;
+
+mudela_text:
+ STRING {
+ defined_ch_c_l = lexer->here_ch_c_l();
+ $$ = get_text(*$1);
+ delete $1;
+ }
+ ;
+
+script_req:
+ script_dir mudela_script {
+ $$ = get_script_req($1, $2);
+ }
+ ;
+
+mudela_script:
+ IDENTIFIER { $$ = $1->script(true); }
+ | script_definition { $$ = $1; }
+ | '^' { $$ = get_scriptdef('^'); }
+ | '+' { $$ = get_scriptdef('+'); }
+ | '-' { $$ = get_scriptdef('-'); }
+ | '|' { $$ = get_scriptdef('|'); }
+ | 'o' { $$ = get_scriptdef('o'); }
+ | '>' { $$ = get_scriptdef('>'); }
+ | '.' { $$ = get_scriptdef('.'); }
+ | DOTS {
+ if ( $1 > 1 )
+ warning( "too many staccato dots", lexer->here_ch_c_l() );
+ $$ = get_scriptdef('.');
+ }
+ | error {
+ $$ = get_scriptdef('.');
+ yyerrok;
+ }
+ ;
+
+script_dir:
+ '_' { $$ = -1; }
+ |'^' { $$ = 1; }
+ |'-' { $$ = 0; }
+ ;
+
+pre_requests:
| pre_requests pre_request {
- pre_reqs.add($2);
+ pre_reqs.push($2);
+ $2->defined_ch_c_l_ = lexer->here_ch_c_l();
}
;
pre_request:
- OPEN_REQUEST_PARENS { $$ = get_request($1); }
+ open_request_parens {
+ defined_ch_c_l = lexer->here_ch_c_l();
+ $$ = get_request($1);
+ }
;
voice_command:
- DURATIONCOMMAND '{' DURATION '}' {
- set_default_duration(*$3);
+ PLET '{' INT '/' INT '}' {
+ set_plet($3,$5);
+ }
+ | DURATIONCOMMAND '{' STRING '}' {
+ set_duration_mode(*$3);
delete $3;
}
- | OCTAVECOMMAND '{' PITCH '}' {
- set_default_pitch(*$3);
+ | DURATIONCOMMAND '{' notemode_duration '}' {
+ set_default_duration($3);
+ }
+ | OCTAVECOMMAND '{' pitchmod '}' {
+ set_default_octave(*$3);
delete $3;
}
+ | TEXTSTYLE STRING {
+ set_text_style(*$2);
+ delete $2;
+ }
;
-voice_elt:
- PITCH DURATION {
- $$ = get_note_element(*$1, *$2);
- delete $1;
- delete $2;
+duration_length:
+ mudela_duration {
+ $$ = new Moment(wholes($1[0], $1[1]));
}
- | RESTNAME DURATION {
- $$ = get_rest_element(*$1, *$2);
- delete $1;
- delete $2;
+ |int '*' mudela_duration {
+ $$ = new Moment(Rational($1) * wholes($3[0], $3[1]));
+ }
+ ;
+
+notemode_duration:
+ explicit_duration
+ | default_duration
+ ;
+
+mudela_duration:
+ int {
+ $$[0] = $1;
+ $$[1] = 0;
+ }
+ | int DOTS {
+ $$[0] = $1;
+ $$[1] = $2;
+ }
+ ;
+
+
+explicit_duration:
+ INT {
+ last_duration($1);
+ $$[0] = $1;
+ $$[1] = 0;
+ }
+ | INT DOTS {
+ last_duration($1);
+ $$[0] = $1;
+ $$[1] = $2;
+ }
+ | DOTS {
+ get_default_duration($$);
+ $$[1] = $1;
}
- | PITCH { $$ = get_note_element(*$1, "");
+ ;
+
+default_duration:
+ {
+ get_default_duration($$);
+ }
+ ;
+
+pitchmod: {
+ defined_ch_c_l = lexer->here_ch_c_l();
+ $$ = new String;
+ }
+ | PITCHMOD {
+ defined_ch_c_l = lexer->here_ch_c_l();
+ $$ = $1;
+ }
+ ;
+
+notename:
+ NOTENAME
+ ;
+
+voice_elt:
+ pitchmod notename notemode_duration {
+ $$ = get_note_element(*$1, $2, $3);
delete $1;
}
- | RESTNAME { $$ = get_rest_element(*$1, "");
+ | RESTNAME notemode_duration {
+ $$ = get_rest_element(*$1, $2);
delete $1;
+
}
;
+
+lyrics_elt:
+ mudela_text notemode_duration {
+ $$ = get_word_element($1, $2);
+ };
+
/*
UTILITIES
-*/
+ */
pitch_list: {
- $$ = new svec<String>;
+ $$ = new Array<Melodic_req*>;
}
- | pitch_list PITCH {
- $$->add(*$2);
- delete $2;
+ | pitch_list NOTENAME {
+ Melodic_req *m_p = new Melodic_req;
+ m_p->notename_i_ = $2[0];
+ m_p->accidental_i_ = $2[1];
+ $$->push(m_p);
}
+ ;
int:
- REAL {
+ real {
$$ = int($1);
- if (ABS($1-Real(int($$))) > 1e-8)
- yyerror("expecting integer number");
-
+ if ( distance($1,Real(int($$)) ) > 1e-8)
+ error( "integer expected", lexer->here_ch_c_l() );
}
;
+real:
+ INT {
+ $$ = Real($1);
+ }
+ | REAL {
+ $$ = $1;
+ }
+ | IDENTIFIER {
+ $$ = * $1->real(0);
+ }
+ ;
+
+
dim:
- REAL unit { $$ = convert_dimen($1,$2); }
+ real unit { $$ = $1*$2; }
;
-unit: CM { $$ = "cm"; }
- |IN { $$ = "in"; }
- |MM { $$ = "mm"; }
- |PT { $$ = "pt"; }
+unit: CM_T { $$ = 1 CM; }
+ |IN_T { $$ = 1 INCH; }
+ |MM_T { $$ = 1 MM; }
+ |PT_T { $$ = 1 PT; }
;
-clef_id:
- VIOLIN { $$ = new String("violin"); }
- | BASS { $$ = new String("bass"); }
+/*
+ symbol tables
+*/
+symtables:
+ SYMBOLTABLES '{' symtables_body '}' { $$ = $3; }
+ ;
+
+symtables_body:
+ {
+ $$ = new Lookup;
+ }
+ | IDENTIFIER {
+ $$ = new Lookup(*$1->lookup(true));
+ }
+ | symtables_body TEXID STRING {
+ $$->texsetting = *$3;
+ delete $3;
+ }
+ | symtables_body STRING '=' symtable {
+ $$->add(*$2, $4);
+ delete $2;
+ }
+ ;
+
+symtable:
+ TABLE '{' symtable_body '}' { $$ = $3; }
+ ;
+
+symtable_body:
+ { $$ = new Symtable; }
+ | symtable_body STRING symboldef {
+ $$->add(*$2, *$3);
+ delete $2;
+ delete $3;
+ }
+ ;
+
+symboldef:
+ STRING box {
+ $$ = new Symbol(*$1, *$2);
+ delete $1;
+ delete $2;
+ }
+ | STRING {
+ Box b;
+ $$ = new Symbol(*$1, b);
+ delete $1;
+ }
;
+
+box:
+ dinterval dinterval {
+ $$ = new Box(*$1, *$2);
+ delete $1;
+ delete $2;
+ }
+ ;
+
+dinterval: dim dim {
+ $$ = new Interval($1, $2);
+ }
+ ;
+
%%
void
-parse_file(String s)
+yyerror(const char *s)
+{
+ lexer->LexerError(s);
+
+ if ( fatal_error_i )
+ exit( fatal_error_i );
+}
+
+void
+parse_file(String init, String s)
{
*mlog << "Parsing ... ";
+ lexer = new My_flex_lexer;
+
+#ifdef YYDEBUG
+ yydebug = !monitor->silence("InitParser") && check_debug;
+ lexer->set_debug( !monitor->silence("InitLexer") && check_debug);
+#endif
+
+ lexer->new_input(init);
+ yyparse();
#ifdef YYDEBUG
- yydebug = !monitor.silence("Parser") & check_debug;
+ yydebug = !monitor->silence("Parser") && check_debug;
+ lexer->set_debug( !monitor->silence("Lexer") && check_debug);
#endif
- new_input(s);
+ lexer->new_input(s);
yyparse();
- delete_identifiers();
- kill_lexer();
- *mlog << "\n";
+ delete lexer;
+ lexer = 0;
+
+ if(!define_spots.empty())
+ warning("Braces don't match.",0);
}
+Paperdef*
+default_paper()
+{
+ return new Paperdef(
+ lexer->lookup_identifier("default_table")->lookup(true));
+}
+
+
projects / lilypond.git / blobdiff