X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=e02e0047eb6b7eb176ead47e21567f027ec67d27;hb=8b8b92e31703bf4a23683efff479793227ad39c1;hp=0d802fd2ff78f6a6d2a323e419de364018c58f15;hpb=fd7e615444cf58b38283a59b56d3457c07778397;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 0d802fd2ff..e02e0047eb 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -5,13 +5,13 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include +#include "translator-def.hh" #include "lily-guile.hh" -#include "notename-table.hh" #include "translation-property.hh" #include "lookup.hh" #include "misc.hh" @@ -27,12 +27,11 @@ #include "musical-request.hh" #include "my-lily-parser.hh" #include "context-specced-music.hh" -#include "translator-group.hh" #include "score.hh" #include "music-list.hh" -#include "duration-convert.hh" #include "change-translator.hh" #include "file-results.hh" +#include "input.hh" #include "scope.hh" #include "relative-music.hh" #include "lyric-combine-music.hh" @@ -42,11 +41,19 @@ #include "mudela-version.hh" #include "grace-music.hh" #include "auto-change-music.hh" +#include "part-combine-music.hh" +#include "output-property.hh" +#include "chord.hh" -// mmm -Mudela_version oldest_version ("1.3.4"); +bool +is_duration_b (int t) +{ + return t && t == 1 << intlog2(t); +} +// mmm JUNKME ? +Mudela_version oldest_version ("1.3.59"); void print_mudela_versions (ostream &os) @@ -54,6 +61,8 @@ print_mudela_versions (ostream &os) os << _f ("Oldest supported input version: %s", oldest_version.str ()) << endl; } + + // needed for bison.simple's malloc() and free() #include @@ -76,36 +85,28 @@ print_mudela_versions (ostream &os) %union { Array *pitch_arr; Link_array *reqvec; - Array *intvec; - Notename_table *chordmodifiertab; Duration *duration; Identifier *id; String * string; Music *music; - Music_list *music_list; Score *score; Scope *scope; - Interval *interval; + Musical_req* musreq; Music_output_def * outputdef; Musical_pitch * pitch; Midi_def* midi; - Moment *moment; - Notename_table *notenametab; - Paper_def *paper; Real real; Request * request; - /* We use SCMs to do strings, because it saves us the trouble of + /* We use SCMs to do strings, because it saves us the trouble of deleting them. Let's hope that a stack overflow doesnt trigger a move of the parse stack onto the heap. */ + SCM scm; Tempo_req *tempo; - Translator_group* trans; - char c; int i; - int ii[10]; } %{ @@ -133,22 +134,23 @@ yylex (YYSTYPE *s, void * v_l) %token BREATHE %token CHORDMODIFIERS %token CHORDS -%token HYPHEN +%token CHAR_T %token CLEF %token CM_T %token CONSISTS %token SEQUENTIAL %token SIMULTANEOUS %token CONSISTSEND +%token DENIES %token DURATION %token EXTENDER %token FONT %token GRACE %token HEADER +%token HYPHEN %token IN_T %token INVALID %token KEY -%token KEYSIGNATURE %token LYRICS %token MARK %token MEASURES @@ -162,18 +164,22 @@ yylex (YYSTYPE *s, void * v_l) %token PARTIAL %token PENALTY %token PROPERTY +%token PUSHPROPERTY POPPROPERTY +%token PUSH POP %token PT_T %token RELATIVE %token REMOVE %token REPEAT -%token REPETITIONS %token ADDLYRICS +%token PARTCOMBINE %token SCM_T %token SCORE %token SCRIPT %token SKIP %token SPANREQUEST +%token COMMANDSPANREQUEST %token TEMPO +%token OUTPUTPROPERTY %token TIME_T %token TIMES %token TRANSLATOR @@ -192,22 +198,20 @@ yylex (YYSTYPE *s, void * v_l) %token CHORDMODIFIER_PITCH %token DURATION_IDENTIFIER %token IDENTIFIER -%token NOTENAME_TABLE_IDENTIFIER -%token MUSIC_IDENTIFIER -%token REQUEST_IDENTIFIER -%token REAL_IDENTIFIER -%token STRING_IDENTIFIER -%token TRANS_IDENTIFIER -%token INT_IDENTIFIER + + %token SCORE_IDENTIFIER -%token MIDI_IDENTIFIER -%token PAPER_IDENTIFIER -%token REAL +%token MUSIC_OUTPUT_DEF_IDENTIFIER + +%token NUMBER_IDENTIFIER +%token REQUEST_IDENTIFIER +%token MUSIC_IDENTIFIER TRANSLATOR_IDENTIFIER +%token STRING_IDENTIFIER SCM_IDENTIFIER %token DURATION RESTNAME -%token STRING +%token STRING %token SCM_T %token UNSIGNED - +%token REAL %type output_def %type mudela_header mudela_header_body @@ -216,45 +220,43 @@ yylex (YYSTYPE *s, void * v_l) %type sub_quotes sup_quotes %type simple_element request_chord command_element Simple_music Composite_music %type Alternative_music Repeated_music -%type abbrev_type -%type int unsigned +%type tremolo_type +%type bare_int bare_unsigned %type script_dir -%type optional_modality -%type identifier_init + +%type identifier_init + %type steno_duration optional_notemode_duration %type entered_notemode_duration explicit_duration -%type int_list + %type pre_requests post_requests %type gen_text_def -%type explicit_musical_pitch steno_musical_pitch musical_pitch absolute_musical_pitch +%type steno_musical_pitch musical_pitch absolute_musical_pitch %type steno_tonic_pitch -%type pitch_list -%type chord %type chord_additions chord_subtractions chord_notes chord_step +%type chord %type chord_note chord_inversion chord_bass -%type midi_block midi_body %type duration_length %type embedded_scm scalar %type Music Sequential_music Simultaneous_music Music_sequence -%type relative_music re_rhythmed_music +%type relative_music re_rhythmed_music part_combined_music %type property_def translator_change -%type Music_list -%type paper_block paper_def_body -%type real real_with_dimension -%type abbrev_command_req +%type Music_list +%type music_output_def_body +%type shorthand_command_req %type post_request %type command_req verbose_command_req %type extender_req %type hyphen_req -%type string +%type string bare_number number_expression %type score_block score_body -%type script_abbreviation -%type translator_spec_block translator_spec_body +%type translator_spec_block translator_spec_body %type tempo_request -%type notenames_body notenames_block chordmodifiers_block +%type notenames_body notenames_block chordmodifiers_block +%type script_abbreviation @@ -267,18 +269,22 @@ yylex (YYSTYPE *s, void * v_l) mudela: /* empty */ | mudela toplevel_expression {} | mudela assignment { } - | mudela error + | mudela error { + THIS->error_level_i_ = 1; + //THIS->parser_error (_ ("ly invalid")); + } | mudela INVALID { - THIS->error_level_i_ =1; + THIS->error_level_i_ = 1; + //THIS->parser_error (_ ("ly invalid")); } ; toplevel_expression: notenames_block { - THIS->lexer_p_->set_notename_table ($1); + THIS->lexer_p_->pitchname_tab_ = $1; } | chordmodifiers_block { - THIS->lexer_p_->set_chordmodifier_table ($1); + THIS->lexer_p_->chordmodifier_tab_ = $1; } | mudela_header { delete header_global_p; @@ -287,15 +293,13 @@ toplevel_expression: | score_block { score_global_array.push ($1); } - | paper_block { + | output_def { Identifier * id = new - Paper_def_identifier ($1, PAPER_IDENTIFIER); - THIS->lexer_p_->set_identifier ("$defaultpaper", id) - } - | midi_block { - Identifier * id = new - Midi_def_identifier ($1, MIDI_IDENTIFIER); - THIS->lexer_p_->set_identifier ("$defaultmidi", id) + Music_output_def_identifier ($1, MUSIC_OUTPUT_DEF_IDENTIFIER); + if (dynamic_cast ($1)) + THIS->lexer_p_->set_identifier ("$defaultpaper", id->self_scm ()); + else if (dynamic_cast ($1)) + THIS->lexer_p_->set_identifier ("$defaultmidi", id->self_scm ()); } | embedded_scm { // junk value @@ -304,30 +308,34 @@ toplevel_expression: embedded_scm: SCM_T + | SCM_IDENTIFIER ; chordmodifiers_block: - CHORDMODIFIERS '{' notenames_body '}' { $$ = $3; } + CHORDMODIFIERS notenames_body { $$ = $2; } ; notenames_block: - NOTENAMES '{' notenames_body '}' { $$ = $3; } + NOTENAMES notenames_body { $$ = $2; } ; notenames_body: - /**/ { - $$ = new Notename_table; - } - | NOTENAME_TABLE_IDENTIFIER { - $$ = $1-> access_content_Notename_table(true); - } - | notenames_body STRING '=' explicit_musical_pitch { - $$->add_note_name (ly_scm2string ($2), $4); - delete $4; + embedded_scm { + int i = scm_ilength ($1); + + SCM tab = scm_make_vector (gh_int2scm (i), SCM_EOL); + for (SCM s = $1; s != SCM_EOL; s = gh_cdr (s)) { + SCM pt = gh_cdar (s); + if (scm_ilength (pt) != 3) + THIS->parser_error ("Need three args"); + scm_hashq_set_x (tab, gh_caar(s), pt); + } + + $$ = tab; } ; @@ -357,9 +365,18 @@ assignment: THIS->remember_spot (); } /* cont */ '=' identifier_init { - THIS->lexer_p_->set_identifier (ly_scm2string ($1), $4); - $4->init_b_ = THIS->init_parse_b_; - $4->set_spot (THIS->pop_spot ()); + THIS->lexer_p_->set_identifier (ly_scm2string ($1), $4); + +/* + TODO: devise standard for protection in parser. + + The parser stack lives on the C-stack, which means that +all objects can be unprotected as soon as they're here. + +*/ + Identifier * id =unsmob_identifier ($4); + Input spot = THIS->pop_spot (); + if (id) id->set_spot (spot); } ; @@ -367,43 +384,33 @@ assignment: identifier_init: score_block { - $$ = 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); - } - | paper_block { - $$ = new Paper_def_identifier ($1, PAPER_IDENTIFIER); + $$ = (new Score_identifier ($1, SCORE_IDENTIFIER))->self_scm(); } - | midi_block { - $$ = new Midi_def_identifier ($1, MIDI_IDENTIFIER); - + | output_def { + $$ = (new Music_output_def_identifier ($1, MUSIC_OUTPUT_DEF_IDENTIFIER))->self_scm(); } | translator_spec_block { - $$ = new Translator_group_identifier ($1, TRANS_IDENTIFIER); + $$ = $1; } | Music { - $$ = new Music_identifier ($1, MUSIC_IDENTIFIER); + $$ = $1->self_scm (); + scm_unprotect_object ($$); } - | post_request { - $$ = new Request_identifier ($1, REQUEST_IDENTIFIER); + $$ = $1->self_scm (); + scm_unprotect_object ($$); } | explicit_duration { - $$ = new Duration_identifier ($1, DURATION_IDENTIFIER); + $$ = (new Duration_identifier ($1, DURATION_IDENTIFIER))->self_scm (); } - | real { - $$ = new Real_identifier (new Real ($1), REAL_IDENTIFIER); + | number_expression { + $$ = $1; } | string { - $$ = new String_identifier (new String (ly_scm2string ($1)), STRING_IDENTIFIER); + $$ = $1; } - | int { - $$ = new int_identifier (new int ($1), INT_IDENTIFIER); + | embedded_scm { + $$ = $1; } ; @@ -415,58 +422,54 @@ translator_spec_block: ; translator_spec_body: - TRANS_IDENTIFIER { - $$ = $1->access_content_Translator_group (true); - $$-> set_spot (THIS->here_input ()); + TRANSLATOR_IDENTIFIER { + $$ = unsmob_translator_def ($1)->clone_scm (); + unsmob_translator_def ($$)-> set_spot (THIS->here_input ()); } | TYPE STRING semicolon { - Translator* t = get_translator_l (ly_scm2string ($2)); - Translator_group * tg = dynamic_cast (t); - - if (!tg) - THIS->parser_error (_("Need a translator group for a context")); - - tg = dynamic_cast (t->clone ()); - tg->set_spot (THIS->here_input ()); - $$ = tg; + $$ = Translator_def::make_scm (); + Translator_def*td = unsmob_translator_def ($$); + td->translator_group_type_ = $2; + td->set_spot (THIS->here_input ()); } | translator_spec_body STRING '=' embedded_scm { - Translator_group* tg = dynamic_cast ($$); - tg->set_property (ly_scm2string ($2), $4); + unsmob_translator_def ($$)->add_property_assign ($2, $4); + } + | translator_spec_body STRING PUSH embedded_scm '=' embedded_scm { + unsmob_translator_def ($$) + ->add_push_property (scm_string_to_symbol ($2), $4, $6); + } + | translator_spec_body STRING POP embedded_scm { + unsmob_translator_def($$)->add_pop_property ( + scm_string_to_symbol ($2), $4); } | translator_spec_body STRING '=' identifier_init semicolon { - Identifier* id = $4; - String_identifier *s = dynamic_cast (id); - Real_identifier *r= dynamic_cast(id); - int_identifier *i = dynamic_cast (id); - - SCM v; - if (s) v = ly_str02scm (s->access_content_String (false)->ch_C()); - if (i) v = gh_int2scm (*i->access_content_int (false)); - if (r) v = gh_double2scm (*r->access_content_Real (false)); - if (!s && !i && !r) + SCM v = gh_int2scm (0); + if (gh_string_p ($4) || gh_number_p ($4) || gh_boolean_p ($4)) + v = $4; + else THIS->parser_error (_("Wrong type for property value")); - delete $4; /* ugh*/ - Translator_group* tg = dynamic_cast ($$); - - tg->set_property (ly_scm2string ($2), v); + unsmob_translator_def($$)->add_property_assign ($2, v); } | translator_spec_body NAME STRING semicolon { - $$->type_str_ = ly_scm2string ($3); + unsmob_translator_def ($$)->type_name_ = $3; } | translator_spec_body CONSISTS STRING semicolon { - dynamic_cast ($$)-> set_element (ly_scm2string ($3), true); + unsmob_translator_def ($$)->add_element ($3); } | translator_spec_body CONSISTSEND STRING semicolon { - dynamic_cast ($$)-> set_element (ly_scm2string ($3), true); + unsmob_translator_def ($$)->add_last_element ( $3); } | translator_spec_body ACCEPTS STRING semicolon { - dynamic_cast ($$)-> set_acceptor (ly_scm2string ($3), true); + unsmob_translator_def ($$)->set_acceptor ($3,true); + } + | translator_spec_body DENIES STRING semicolon { + unsmob_translator_def ($$)->set_acceptor ($3,false); } | translator_spec_body REMOVE STRING semicolon { - dynamic_cast ($$)-> set_element (ly_scm2string ($3), false); + unsmob_translator_def ($$)->remove_element ($3); } ; @@ -475,17 +478,37 @@ translator_spec_body: */ score_block: SCORE { + THIS->remember_spot (); } /*cont*/ '{' score_body '}' { + THIS->pop_spot (); $$ = $4; if (!$$->def_p_arr_.size ()) - $$->add_output (THIS->default_paper_p ()); + { + Identifier *id = + unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultpaper")); + $$->add_output (id ? id->access_content_Music_output_def (true) : new Paper_def ); + } } +/* + | SCORE '{' score_body error { + $$ = $3 + $$->set_spot (THIS->here_input ()); + // THIS->here_input ().error ("SCORE INVALID"); + $$->error ("SCORE INVALID"); + THIS->parser_error (_f ("SCORE ERROR")); + } +*/ ; -score_body: { +score_body: + Music { $$ = new Score; + $$->set_spot (THIS->here_input ()); + SCM m = $1->self_scm (); + scm_unprotect_object (m); + $$->music_ = m; } | SCORE_IDENTIFIER { $$ = $1->access_content_Score (true); @@ -493,11 +516,6 @@ score_body: { | score_body mudela_header { $$->header_p_ = $2; } - | score_body Music { - if ($$->music_p_) - $2->warning (_ ("More than one music block")); - $$->music_p_ = $2; - } | score_body output_def { $$->add_output ($2); } @@ -506,149 +524,77 @@ score_body: { } ; -output_def: - paper_block { - $$ = $1; - } - | midi_block { - $$= $1; - } - ; - /* - PAPER + MIDI */ -paper_block: - PAPER '{' paper_def_body '}' { - $$ = $3; - THIS-> lexer_p_->scope_l_arr_.pop (); +output_def: + music_output_def_body '}' { + $$ = $1; + THIS-> lexer_p_-> scope_l_arr_.pop(); } ; +music_output_def_body: + MIDI '{' { + Identifier *id = unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultmidi")); -paper_def_body: - /* empty */ { - Paper_def *p = THIS->default_paper_p (); + + Midi_def* p =0; + if (id) + p = dynamic_cast (id->access_content_Music_output_def (true)); + else + p = new Midi_def; + + $$ = p; + THIS->lexer_p_->scope_l_arr_.push (p->scope_p_); + } + | PAPER '{' { + Identifier *id = unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultpaper")); + Paper_def *p = 0; + if (id) + p = dynamic_cast (id->access_content_Music_output_def (true)); + else + p = new Paper_def; THIS-> lexer_p_-> scope_l_arr_.push (p->scope_p_); $$ = p; } - | PAPER_IDENTIFIER { - Paper_def *p = $1->access_content_Paper_def (true); + | PAPER '{' MUSIC_OUTPUT_DEF_IDENTIFIER { + Music_output_def *p = $3->access_content_Music_output_def (true); THIS->lexer_p_->scope_l_arr_.push (p->scope_p_); $$ = p; } - | paper_def_body int '=' FONT STRING { // ugh, what a syntax - Lookup * l = new Lookup; - l->font_name_ = ly_scm2string ($5); - $$->set_lookup ($2, l); - } - | paper_def_body assignment semicolon { - - } - | paper_def_body SCM_T '=' SCM_T { - if (!gh_symbol_p ($2)) - THIS->parser_error ("expect a symbol as lvalue"); - else - $$->default_properties_[$2] = $4; - } - | paper_def_body SCM_T '=' real semicolon { - if (!gh_symbol_p ($2)) - THIS->parser_error ("expect a symbol as lvalue"); - else - $$->default_properties_[$2] = gh_double2scm ($4); - } - | paper_def_body translator_spec_block { - $$->assign_translator ($2); - } - | paper_def_body error { - - } - ; - - - -real_with_dimension: - REAL CM_T { - $$ = $1 CM; - } - | REAL PT_T { - $$ = $1 PT; - } - | REAL IN_T { - $$ = $1 INCH; - } - | REAL MM_T { - $$ = $1 MM; - } - ; - -real: - REAL { - $$ = $1; - } - | real_with_dimension - | REAL_IDENTIFIER { - $$= *$1->access_content_Real (false); - } - | '-' real %prec UNARY_MINUS { - $$ = -$2; - } - | real '*' real { - $$ = $1 * $3; - } - | real '/' real { - $$ = $1 / $3; - } - | real '+' real { - $$ = $1 + $3; - } - | real '-' real { - $$ = $1 - $3; - } - | '(' real ')' { - $$ = $2; - } - ; - -/* - MIDI -*/ -midi_block: - MIDI - '{' midi_body '}' { - $$ = $3; - THIS-> lexer_p_-> scope_l_arr_.pop(); - } - ; - -midi_body: /* empty */ { - Midi_def * p =THIS->default_midi_p (); - $$ = p; + | MIDI '{' MUSIC_OUTPUT_DEF_IDENTIFIER { + Music_output_def *p = $3->access_content_Music_output_def (true); THIS->lexer_p_->scope_l_arr_.push (p->scope_p_); - } - | MIDI_IDENTIFIER { - Midi_def * p =$1-> access_content_Midi_def (true); $$ = p; - THIS->lexer_p_->scope_l_arr_.push (p->scope_p_); } - | midi_body assignment semicolon { + | music_output_def_body assignment semicolon { } - | midi_body translator_spec_block { - $$-> assign_translator ($2); + | music_output_def_body translator_spec_block { + $$->assign_translator ($2); } - | midi_body tempo_request semicolon { - $$->set_tempo ($2->dur_.length_mom (), $2->metronome_i_); - delete $2; + | music_output_def_body tempo_request semicolon { + /* + junk this ? there already is tempo stuff in + music. + */ + dynamic_cast ($$)->set_tempo ($2->dur_.length_mom (), $2->metronome_i_); } - | midi_body error { + | music_output_def_body bare_int '=' FONT STRING { // ugh, what a syntax + SCM sl = Lookup::make_lookup(); + Lookup * l =unsmob_lookup (sl); + l->font_name_ = ly_scm2string ($5); + dynamic_cast ($$)->set_lookup ($2, sl); + } + | music_output_def_body error { } ; tempo_request: - TEMPO steno_duration '=' unsigned { + TEMPO steno_duration '=' bare_unsigned { $$ = new Tempo_req; $$->dur_ = *$2; delete $2; @@ -657,11 +603,19 @@ tempo_request: ; Music_list: /* empty */ { - $$ = new Music_list; - $$->set_spot (THIS->here_input ()); + $$ = gh_cons (SCM_EOL, SCM_EOL); } | Music_list Music { - $$->add_music ($2); + SCM s = $$; + SCM c = gh_cons ($2->self_scm (), SCM_EOL); + scm_unprotect_object ($2->self_scm ()); /* UGH */ + + + if (gh_pair_p (gh_cdr (s))) + gh_set_cdr_x (gh_cdr (s), c); /* append */ + else + gh_set_car_x (s, c); /* set first cons */ + gh_set_cdr_x (s, c) ; /* remember last cell */ } | Music_list error { } @@ -687,58 +641,80 @@ Alternative_music: Repeated_music: - REPEAT STRING unsigned Music Alternative_music + REPEAT STRING bare_unsigned Music Alternative_music { Music_sequence* m = dynamic_cast ($5); if (m && $3 < m->length_i ()) - $5->warning (_ ("More alternatives than repeats. Junking excess alternatives.")); + $5->origin ()->warning (_ ("More alternatives than repeats. Junking excess alternatives.")); Repeated_music * r = new Repeated_music ($4, $3 >? 1, m); $$ = r; - r->fold_b_ = (ly_scm2string ($2) == "fold"); - r->volta_fold_b_ = (ly_scm2string ($2) == "volta"); - r->set_spot ($4->spot ()); + r->type_ = ly_scm2string ($2); + r->fold_b_ = (r->type_ == "fold"); + r->volta_fold_b_ = (r->type_ == "volta"); + r->set_spot (*$4->origin ()); } ; Music_sequence: '{' Music_list '}' { - $$ = new Music_sequence ($2); - $$->set_spot ($2->spot ()); + $$ = new Music_sequence (gh_car ($2)); } ; Sequential_music: SEQUENTIAL '{' Music_list '}' { - $$ = new Sequential_music ($3); - $$->set_spot ($3->spot ()); + $$ = new Sequential_music (gh_car ($3)); } | '{' Music_list '}' { - $$ = new Sequential_music ($2); - $$->set_spot ($2->spot ()); + $$ = new Sequential_music (gh_car ($2)); } ; Simultaneous_music: SIMULTANEOUS '{' Music_list '}'{ - $$ = new Simultaneous_music ($3); - $$->set_spot ($3->spot ()); + $$ = new Simultaneous_music (gh_car ($3)); } | '<' Music_list '>' { - $$ = new Simultaneous_music ($2); - $$->set_spot ($2->spot ()); + $$ = new Simultaneous_music (gh_car ($2)); } ; Simple_music: request_chord { $$ = $1; } - | MUSIC_IDENTIFIER { $$ = $1->access_content_Music (true); } + | OUTPUTPROPERTY embedded_scm embedded_scm '=' embedded_scm { + SCM pred = $2; + if (!gh_symbol_p ($3)) + { + THIS->parser_error (_("Second argument must be a symbol")); + } + /*hould check # args */ + if (!gh_procedure_p (pred)) + { + THIS->parser_error (_("First argument must be a procedure taking 1 argument")); + } + + $$ = new Output_property (pred,$3, $5); + } + | MUSIC_IDENTIFIER { $$ = unsmob_music ($1)->clone (); } | property_def +/* | PUSHPROPERTY embedded_scm embedded_scm embedded_scm { + $$ = new Push_translation_property; + $$->set_mus_property ("symbols", $2); + $$->set_mus_property ("element-property", $3); + $$->set_mus_property ("element-value", $4); + } + | POPPROPERTY embedded_scm embedded_scm { + $$ = new Pop_translation_property; + $$->set_mus_property ("symbols", $2); + $$->set_mus_property ("element-property", $3); + } +*/ | translator_change - | Simple_music '*' unsigned '/' unsigned { + | Simple_music '*' bare_unsigned '/' bare_unsigned { $$ = $1; $$->compress (Moment($3, $5 )); } - | Simple_music '*' unsigned { + | Simple_music '*' bare_unsigned { $$ = $1; $$->compress (Moment ($3, 1)); } @@ -759,7 +735,7 @@ Composite_music: Auto_change_music * chm = new Auto_change_music (ly_scm2string ($2), $3); $$ = chm; - chm->set_spot ($3->spot ()); + chm->set_spot (*$3->origin ()); } | GRACE Music { $$ = new Grace_music ($2); @@ -776,7 +752,7 @@ Composite_music: THIS->remember_spot (); } /* CONTINUED */ - unsigned '/' unsigned Music + bare_unsigned '/' bare_unsigned Music { $$ = new Time_scaled_music ($3, $5, $6); @@ -787,11 +763,11 @@ Composite_music: | Sequential_music { $$ = $1; } | TRANSPOSE musical_pitch Music { $$ = new Transposed_music ($3, *$2); - delete $2; + delete $2; // ugh } | TRANSPOSE steno_tonic_pitch Music { $$ = new Transposed_music ($3, *$2); - delete $2; + delete $2; // ugh } | NOTES { THIS->lexer_p_->push_note_state (); } @@ -815,12 +791,13 @@ Composite_music: } | relative_music { $$ = $1; } | re_rhythmed_music { $$ = $1; } + | part_combined_music { $$ = $1; } ; relative_music: RELATIVE absolute_musical_pitch Music { $$ = new Relative_octave_music ($3, *$2); - delete $2; + delete $2; // ugh } ; @@ -831,6 +808,13 @@ re_rhythmed_music: } ; +part_combined_music: + PARTCOMBINE STRING Music Music { + Part_combine_music * p = new Part_combine_music (ly_scm2string ($2), $3, $4); + $$ = p; + } + ; + translator_change: TRANSLATOR STRING '=' STRING { Change_translator * t = new Change_translator; @@ -846,20 +830,37 @@ property_def: PROPERTY STRING '.' STRING '=' scalar { Translation_property *t = new Translation_property; - t->var_str_ = ly_scm2string ($4); - t->value_ = $6; + t->set_mus_property ("symbol", scm_string_to_symbol ($4)); + t->set_mus_property ("value", $6); + + Context_specced_music *csm = new Context_specced_music (t); + $$ = csm; + $$->set_spot (THIS->here_input ()); + + csm-> translator_type_str_ = ly_scm2string ($2); + } + | PROPERTY STRING '.' STRING PUSH embedded_scm '=' embedded_scm { + Push_translation_property *t = new Push_translation_property; + t->set_mus_property ("symbols", scm_string_to_symbol ($4)); + t->set_mus_property ("element-property", $6); + t->set_mus_property ("element-value", $8); Context_specced_music *csm = new Context_specced_music (t); $$ = csm; $$->set_spot (THIS->here_input ()); csm-> translator_type_str_ = ly_scm2string ($2); } + | PROPERTY STRING POP embedded_scm { + $$ = new Pop_translation_property; + $$->set_mus_property ("symbols", scm_string_to_symbol ($2)); + $$->set_mus_property ("element-property", $4); + } ; scalar: string { $$ = $1; } - | int { $$ = gh_int2scm ($1); } + | bare_int { $$ = gh_int2scm ($1); } | embedded_scm { $$ = $1; } ; @@ -867,10 +868,14 @@ scalar: request_chord: pre_requests simple_element post_requests { Music_sequence *l = dynamic_cast($2); - for (int i=0; i < $1->size(); i++) - l->add_music ($1->elem(i)); - for (int i=0; i < $3->size(); i++) - l->add_music ($3->elem(i)); + if (l) { + for (int i=0; i < $1->size(); i++) + l->append_music ($1->elem(i)); + for (int i=0; i < $3->size(); i++) + l->append_music ($3->elem(i)); + } + else + programming_error ("Need Sequence to add music to"); $$ = $2; } @@ -879,16 +884,16 @@ request_chord: command_element: command_req { - $$ = new Request_chord; + $$ = new Request_chord (gh_cons ($1->self_scm (), SCM_EOL)); $$-> set_spot (THIS->here_input ()); $1-> set_spot (THIS->here_input ()); - ((Simultaneous_music*)$$) ->add_music ($1);//ugh } | PARTIAL duration_length ';' { Translation_property * p = new Translation_property; - p->var_str_ = "measurePosition"; - p->value_ = (new Moment (-$2->length_mom ()))->smobify_self (); - delete $2; + p->set_mus_property ("symbol", ly_symbol2scm ( "measurePosition")); + Moment m = - $2->length_mom (); + p->set_mus_property ("value", m.make_scm()); + delete $2; // ugh Context_specced_music * sp = new Context_specced_music (p); $$ =sp ; sp-> translator_type_str_ = "Score"; @@ -896,11 +901,11 @@ command_element: ; command_req: - abbrev_command_req + shorthand_command_req | verbose_command_req semicolon { $$ = $1; } ; -abbrev_command_req: +shorthand_command_req: extender_req { $$ = $1; } @@ -919,35 +924,11 @@ abbrev_command_req: b->span_type_str_ = "beam"; $$ =b; } - | '[' ':' unsigned { - if (!Duration::duration_type_b ($3)) - THIS->parser_error (_f ("not a duration: %d", $3)); - else if ($3 < 8) - THIS->parser_error (_ ("Can't abbreviate")); - else - THIS->set_abbrev_beam ($3); - - Chord_tremolo_req* a = new Chord_tremolo_req; - a->span_dir_ = START; - a->type_i_ = THIS->abbrev_beam_type_i_; - $$=a; - } | ']' { - if (!THIS->abbrev_beam_type_i_) - { - Span_req*b= new Span_req; - b->span_dir_ = STOP; - b->span_type_str_ = "beam"; - $$ = b; - } - else - { - Chord_tremolo_req* a = new Chord_tremolo_req; - a->span_dir_ = STOP; - a->type_i_ = THIS->abbrev_beam_type_i_; - THIS->set_abbrev_beam (0); - $$ = a; - } + Span_req*b= new Span_req; + b->span_dir_ = STOP; + b->span_type_str_ = "beam"; + $$ = b; } | BREATHE { $$ = new Breathing_sign_req; @@ -956,23 +937,40 @@ abbrev_command_req: verbose_command_req: + BAR STRING { $$ = new Bar_req (ly_scm2string ($2)); } + | COMMANDSPANREQUEST bare_int STRING { + Span_req * sp_p = new Span_req; + sp_p-> span_dir_ = Direction($2); + sp_p->span_type_str_ = ly_scm2string ($3); + sp_p->set_spot (THIS->here_input ()); + $$ = sp_p; + } + | MARK { + Mark_req * m = new Mark_req; + $$ = m; + } | MARK STRING { - $$ = new Mark_req (ly_scm2string ($2)); + Mark_req *m = new Mark_req; + m->set_mus_property ("label", $2); + $$ = m; } - | MARK unsigned { - $$ = new Mark_req (to_str ($2)); + | MARK bare_unsigned { + Mark_req *m = new Mark_req; + m->set_mus_property ("label", gh_int2scm ($2)); + $$ = m; } - | TIME_T unsigned '/' unsigned { + + | TIME_T bare_unsigned '/' bare_unsigned { Time_signature_change_req *m = new Time_signature_change_req; m->beats_i_ = $2; m->one_beat_i_=$4; $$ = m; } - | PENALTY int { + | PENALTY bare_int { Break_req * b = new Break_req; b->penalty_f_ = $2 / 100.0; b->set_spot (THIS->here_input ()); @@ -981,7 +979,7 @@ verbose_command_req: | SKIP duration_length { Skip_req * skip_p = new Skip_req; skip_p->duration_ = *$2; - delete $2; + delete $2; // ugh $$ = skip_p; } | tempo_request { @@ -991,23 +989,17 @@ verbose_command_req: $$ = new Clef_change_req (ly_scm2string ($2)); } -/* UGH. optional. */ - | KEY NOTENAME_PITCH optional_modality { + | KEY { Key_change_req *key_p= new Key_change_req; - key_p->key_.pitch_arr_.push (*$2); - key_p->key_.ordinary_key_b_ = true; - key_p->key_.modality_i_ = $3; $$ = key_p; - delete $2; } - | KEYSIGNATURE pitch_list { + | KEY NOTENAME_PITCH SCM_IDENTIFIER { Key_change_req *key_p= new Key_change_req; - key_p->key_.pitch_arr_ = *$2; - key_p->key_.ordinary_key_b_ = false; - $$ = key_p; - delete $2; + + key_p->set_mus_property ("pitch-alist", $3); + ((Music* )key_p)->transpose (* $2); + $$ = key_p; } - ; post_requests: @@ -1031,9 +1023,11 @@ request_that_take_dir: gen_text_def | verbose_request | script_abbreviation { - Identifier*i = THIS->lexer_p_->lookup_identifier ("dash-" + ly_scm2string ($1)); + SCM s = THIS->lexer_p_->lookup_identifier ("dash-" + ly_scm2string ($1)); Articulation_req *a = new Articulation_req; - a->articulation_str_ = *i->access_content_String (false); + if (gh_string_p (s)) + a->articulation_str_ = ly_scm2string (s); + else THIS->parser_error (_ ("Expecting string as script definition")); $$ = a; } ; @@ -1043,14 +1037,14 @@ request_with_dir: if (Script_req * gs = dynamic_cast ($2)) gs->dir_ = Direction ($1); else if ($1) - $2->warning (_ ("Can't specify direction for this request")); + $2->origin ()->warning (_ ("Can't specify direction for this request")); $$ = $2; } ; verbose_request: REQUEST_IDENTIFIER { - $$ = (Request*)$1->access_content_Request (true); + $$ = dynamic_cast (unsmob_music ($1)->clone ()); $$->set_spot (THIS->here_input ()); } | TEXTSCRIPT STRING STRING { @@ -1061,14 +1055,14 @@ verbose_request: $$ = ts_p; } - | SPANREQUEST int STRING { + | SPANREQUEST bare_int STRING { Span_req * sp_p = new Span_req; - sp_p-> span_dir_ = Direction($2); + sp_p->span_dir_ = Direction($2); sp_p->span_type_str_ = ly_scm2string ($3); sp_p->set_spot (THIS->here_input ()); $$ = sp_p; } - | abbrev_type { + | tremolo_type { Tremolo_req* a = new Tremolo_req; a->set_spot (THIS->here_input ()); a->type_i_ = $1; @@ -1079,16 +1073,6 @@ verbose_request: a->articulation_str_ = ly_scm2string ($2); a->set_spot (THIS->here_input ()); $$ = a; - - } - ; - -optional_modality: - /* empty */ { - $$ = 0; - } - | int { - $$ = $1; } ; @@ -1138,39 +1122,30 @@ steno_tonic_pitch: } ; -explicit_musical_pitch: - MUSICAL_PITCH '{' int_list '}' {/* ugh */ - Array &a = *$3; - ARRAY_SIZE(a,3); - $$ = new Musical_pitch; - $$->octave_i_ = a[0]; - $$->notename_i_ = a[1]; - $$->accidental_i_ = a[2]; - delete &a; - } - ; - musical_pitch: steno_musical_pitch { $$ = $1; - THIS->set_last_pitch ($1); } - | explicit_musical_pitch { - $$ = $1; - THIS->set_last_pitch ($1); + | MUSICAL_PITCH embedded_scm { + int sz = scm_ilength ($2); + if (sz != 3) { + THIS->parser_error (_f ("Expecting %d arguments", 3)); + $2 = gh_list (gh_int2scm (0), gh_int2scm (0), gh_int2scm (0), SCM_UNDEFINED); + } + $$ = new Musical_pitch ($2); } ; explicit_duration: - DURATION '{' int_list '}' { + DURATION embedded_scm { $$ = new Duration; - Array &a = *$3; - ARRAY_SIZE(a,2); - - $$-> durlog_i_ = a[0]; - $$-> dots_i_ = a[1]; - - delete &a; + if (scm_ilength ($2) == 2) + { + $$-> durlog_i_ = gh_scm2int (gh_car($2)); + $$-> dots_i_ = gh_scm2int (gh_cadr($2)); + } + else + THIS->parser_error (_("Must have 2 arguments for duration")); } ; @@ -1299,11 +1274,11 @@ duration_length: steno_duration { $$ = $1; } - | duration_length '*' unsigned { - $$->plet_.iso_i_ *= $3; + | duration_length '*' bare_unsigned { + $$->tuplet_iso_i_ *= $3; } - | duration_length '/' unsigned { - $$->plet_.type_i_ *= $3; + | duration_length '/' bare_unsigned { + $$->tuplet_type_i_ *= $3; } ; @@ -1323,12 +1298,12 @@ optional_notemode_duration: ; steno_duration: - unsigned { + bare_unsigned { $$ = new Duration; - if (!Duration::duration_type_b ($1)) + if (!is_duration_b ($1)) THIS->parser_error (_f ("not a duration: %d", $1)); else { - $$->durlog_i_ = Duration_convert::i2_type ($1); + $$->durlog_i_ = intlog2 ($1); } } | DURATION_IDENTIFIER { @@ -1340,15 +1315,13 @@ steno_duration: ; -abbrev_type: +tremolo_type: ':' { $$ =0; } - | ':' unsigned { - if (!Duration::duration_type_b ($2)) + | ':' bare_unsigned { + if (!is_duration_b ($2)) THIS->parser_error (_f ("not a duration: %d", $2)); - else if ($2 < 8) - THIS->parser_error (_ ("Can't abbreviate")); $$ = $2; } ; @@ -1363,55 +1336,83 @@ simple_element: Note_req *n = new Note_req; n->pitch_ = *$1; - delete $1; n->duration_ = *$4; - delete $4; - if (THIS->abbrev_beam_type_i_) - { - if (n->duration_.plet_b ()) - THIS->parser_error (_ ("Can't abbreviate tuplet")); - else - n->duration_.set_plet (1, 2); - } + n->cautionary_b_ = $3 % 2; n->forceacc_b_ = $2 % 2 || n->cautionary_b_; - Simultaneous_music*v = new Request_chord; - v->set_spot (THIS->here_input ()); - n->set_spot (THIS->here_input ()); - - v->add_music (n); + Simultaneous_music*v = new Request_chord (gh_list (n->self_scm (), SCM_UNDEFINED)); + v->set_spot ($1->spot ()); + n->set_spot ($1->spot ()); $$ = v; + + delete $1; + delete $4; } | RESTNAME optional_notemode_duration { - $$ = THIS->get_rest_element (ly_scm2string ($1), $2); + SCM e = SCM_UNDEFINED; + if (ly_scm2string ($1) =="s") + { /* Space */ + Skip_req * skip_p = new Skip_req; + skip_p->duration_ = *$2; + + skip_p->set_spot (THIS->here_input()); + e = skip_p->self_scm (); + } + else + { + Rest_req * rest_req_p = new Rest_req; + rest_req_p->duration_ = *$2; + rest_req_p->set_spot (THIS->here_input()); + e = rest_req_p->self_scm (); + } + Simultaneous_music* velt_p = new Request_chord (gh_list (e,SCM_UNDEFINED)); + velt_p->set_spot (THIS->here_input()); + + delete $2; // ugh + $$ = velt_p; } | MEASURES optional_notemode_duration { - Multi_measure_rest_req* m = new Multi_measure_rest_req; - m->duration_ = *$2; - delete $2; + Skip_req * sk = new Skip_req; + sk->duration_ = *$2; + - Simultaneous_music*velt_p = new Request_chord; - velt_p->set_spot (THIS->here_input ()); - velt_p->add_music (m); - $$ = velt_p; - } - | REPETITIONS optional_notemode_duration { - Repetitions_req* r = new Repetitions_req; - r->duration_ = *$2; - delete $2; + Span_req *sp1 = new Span_req; + Span_req *sp2 = new Span_req; + sp1-> span_dir_ = START; + sp2-> span_dir_ = STOP; + sp1->span_type_str_ = sp2->span_type_str_ = "rest"; + + Request_chord * rqc1 = new Request_chord (gh_list (sp1->self_scm (), SCM_UNDEFINED)); + Request_chord * rqc2 = new Request_chord (gh_list (sk->self_scm (), SCM_UNDEFINED));; + Request_chord * rqc3 = new Request_chord(gh_list (sp2->self_scm (), SCM_UNDEFINED));; + + SCM ms = gh_list (rqc1->self_scm (), rqc2->self_scm (), rqc3->self_scm (), SCM_UNDEFINED); - Simultaneous_music*velt_p = new Request_chord; - velt_p->set_spot (THIS->here_input ()); - velt_p->add_music (r); - $$ = velt_p; + $$ = new Sequential_music (ms); } - | STRING optional_notemode_duration { - if (!THIS->lexer_p_->lyric_state_b ()) - THIS->parser_error (_ ("Have to be in Lyric mode for lyrics")); - $$ = THIS->get_word_element (ly_scm2string ($1), $2); + | STRING { + THIS->remember_spot (); + } + /* cont */ + optional_notemode_duration { + if (!THIS->lexer_p_->lyric_state_b ()) { + THIS->pop_spot ().error (_ ("Have to be in Lyric mode for lyrics")); + THIS->error_level_i_ = 1; + THIS->parser_error (_ ("Giving up")); + } + else + THIS->pop_spot (); + Lyric_req* lreq_p = new Lyric_req; + lreq_p ->text_str_ = ly_scm2string ($1); + lreq_p->duration_ = *$3; + lreq_p->set_spot (THIS->here_input()); + Simultaneous_music* velt_p = new Request_chord (gh_list (lreq_p->self_scm (), SCM_UNDEFINED)); + + delete $3; // ugh + $$= velt_p; } | chord { @@ -1421,9 +1422,11 @@ simple_element: } ; + chord: steno_tonic_pitch optional_notemode_duration chord_additions chord_subtractions chord_inversion chord_bass { - $$ = THIS->get_chord (*$1, $3, $4, $5, $6, *$2); + $$ = get_chord (*$1, $3, $4, $5, $6, *$2); + $$->set_spot (THIS->here_input ()); }; chord_additions: @@ -1492,19 +1495,19 @@ chord_step: ; chord_note: - unsigned { + bare_unsigned { $$ = new Musical_pitch; $$->notename_i_ = ($1 - 1) % 7; $$->octave_i_ = $1 > 7 ? 1 : 0; $$->accidental_i_ = 0; } - | unsigned '+' { + | bare_unsigned '+' { $$ = new Musical_pitch; $$->notename_i_ = ($1 - 1) % 7; $$->octave_i_ = $1 > 7 ? 1 : 0; $$->accidental_i_ = 1; } - | unsigned CHORD_MINUS { + | bare_unsigned CHORD_MINUS { $$ = new Musical_pitch; $$->notename_i_ = ($1 - 1) % 7; $$->octave_i_ = $1 > 7 ? 1 : 0; @@ -1515,43 +1518,91 @@ chord_note: /* UTILITIES */ -pitch_list: { - $$ = new Array; +number_expression: + bare_number { + $$ = $1; } - | pitch_list musical_pitch { - $$->push (*$2); - delete $2; + | '-' number_expression %prec UNARY_MINUS { + $$ = scm_difference ($2, SCM_UNDEFINED); } - ; - - -int_list: - /**/ { - $$ = new Array + | number_expression '*' number_expression { + $$ = scm_product ($1, $3); + } + | number_expression '/' number_expression { + $$ = scm_divide ($1, $3); } - | int_list int { - $$->push ($2); + | number_expression '+' number_expression { + $$ = scm_sum ($1, $3); + } + | number_expression '-' number_expression { + $$ = scm_difference ($1, $3); + } + | '(' number_expression ')' { + $$ = $2; } ; -unsigned: +bare_number: UNSIGNED { - $$ = $1; + $$ = gh_int2scm ($1); } | DIGIT { + $$ = gh_int2scm ($1); + } + | REAL { + $$ = gh_double2scm ($1); + } + | NUMBER_IDENTIFIER { $$ = $1; } + | REAL CM_T { + $$ = gh_double2scm ($1 CM); + } + | REAL PT_T { + $$ = gh_double2scm ($1 PT); + } + | REAL IN_T { + $$ = gh_double2scm ($1 INCH); + } + | REAL MM_T { + $$ = gh_double2scm ($1 MM); + } + | REAL CHAR_T { + $$ = gh_double2scm ($1 CHAR); + } ; -int: - unsigned { - $$ = $1; + +bare_unsigned: + bare_number { + if (scm_integer_p ($1) == SCM_BOOL_T) { + $$ = gh_scm2int ($1); + + } else { + THIS->parser_error (_("need integer number arg")); + $$ = 0; + } + if ($$ < 0) { + THIS->parser_error (_("Must be positive integer")); + $$ = -$$; + } + } - | '-' unsigned { - $$ = -$2; + ; +bare_int: + bare_number { + if (scm_integer_p ($1) == SCM_BOOL_T) + { + int k = gh_scm2int ($1); + $$ = k; + } else + { + THIS->parser_error (_("need integer number arg")); + $$ = 0; + } } - | INT_IDENTIFIER { - $$ = *$1->access_content_int (false); + | '-' bare_int { + $$ = -$2; } ; @@ -1561,7 +1612,7 @@ string: $$ = $1; } | STRING_IDENTIFIER { - $$ = ly_str02scm ($1->access_content_String (true)->ch_C ()); + $$ = $1; } | string '+' string { $$ = scm_string_append (scm_listify ($1, $3, SCM_UNDEFINED)); @@ -1583,6 +1634,7 @@ questions: semicolon: ';' ; + %% void