X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=f5425dc2ef69462145804df25f8e29dd93472bf0;hb=0817e0513d1016ff22a633b6fee20ddba2a062f2;hp=16e9c0ee2fe02c56babbdae02aed5c00908c7bad;hpb=4eb6f42fc6ca20d65c788a73eb78dfcc22ea0453;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 16e9c0ee2f..f5425dc2ef 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -9,7 +9,23 @@ Jan Nieuwenhuizen */ +/* + Two shift/reduce problems: + - + - + */ + +/* + +the rules for who is protecting what are very shady. TODO: uniformise +this. + + +*/ + +#include #include + #include "translator-def.hh" #include "lily-guile.hh" #include "change-iterator.hh" @@ -37,6 +53,7 @@ #include "transposed-music.hh" #include "time-scaled-music.hh" #include "repeated-music.hh" +#include "untransposable-music.hh" #include "lilypond-input-version.hh" #include "grace-music.hh" #include "part-combine-music.hh" @@ -45,32 +62,53 @@ #include "un-relativable-music.hh" #include "chord.hh" +bool +regular_identifier_b (SCM id) +{ + String str = ly_scm2string (id); + char const *s = str.ch_C() ; + + bool v = true; + while (*s && v) + { + v = v && isalpha (*s); + s++; + } + return v; +} + + +Music* +set_property_music (SCM sym, SCM value) +{ + Music * p = new Music (SCM_EOL); + p->set_mus_property ("symbol", sym); + p->set_mus_property ("iterator-ctor", + Property_iterator::constructor_cxx_function); + + p->set_mus_property ("value", value); + return p; +} + bool is_duration_b (int t) { return t && t == 1 << intlog2 (t); } - void set_music_properties (Music *p, SCM a) { - for (SCM k = a; gh_pair_p (k); k = gh_cdr (k)) + for (SCM k = a; gh_pair_p (k); k = ly_cdr (k)) { - p->set_mus_property (gh_caar (k), gh_cdar (k)); + p->internal_set_mus_property (ly_caar (k), ly_cdar (k)); } } -// mmm JUNKME ? -Lilypond_version oldest_version ("1.3.59"); -void -print_lilypond_versions (ostream &os) -{ - os << _f ("Oldest supported input version: %s", oldest_version.str ()) - << endl; -} + + // needed for bison.simple's malloc () and free () @@ -96,16 +134,14 @@ print_lilypond_versions (ostream &os) %union { Link_array *reqvec; - String * string; + + String *string; // needed by the lexer as temporary scratch area. Music *music; Score *score; Scope *scope; Scheme_hash_table *scmhash; - Musical_req* musreq; Music_output_def * outputdef; - Midi_def* midi; - Real real; Request * request; /* We use SCMs to do strings, because it saves us the trouble of @@ -152,15 +188,15 @@ yylex (YYSTYPE *s, void * v_l) %token CONSISTS %token DURATION %token SEQUENTIAL -%token ELEMENTDESCRIPTIONS +%token GROBDESCRIPTIONS %token SIMULTANEOUS %token CONSISTSEND %token DENIES %token DURATION %token EXTENDER -%token FONT +%token FIGURES FIGURE_OPEN FIGURE_CLOSE %token GLISSANDO -%token GRACE +%token GRACE %token HEADER %token HYPHEN %token IN_T @@ -172,6 +208,7 @@ yylex (YYSTYPE *s, void * v_l) %token MIDI %token MM_T %token PITCH +%token DEFAULT %token NAME %token PITCHNAMES %token NOTES @@ -204,15 +241,18 @@ yylex (YYSTYPE *s, void * v_l) %token CONTEXT /* escaped */ -%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE +%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE E_TILDE %token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET %type exclamations questions dots +%type bass_number bass_mod +%type bass_figure figure_list figure_spec %token DIGIT %token NOTENAME_PITCH %token TONICNAME_PITCH %token CHORDMODIFIER_PITCH %token DURATION_IDENTIFIER +%token FRACTION %token IDENTIFIER @@ -224,10 +264,10 @@ yylex (YYSTYPE *s, void * v_l) %token MUSIC_IDENTIFIER TRANSLATOR_IDENTIFIER %token STRING_IDENTIFIER SCM_IDENTIFIER %token RESTNAME -%token STRING +%token STRING %token SCM_T %token UNSIGNED -%token REAL +%token REAL %type output_def %type lilypond_header lilypond_header_body @@ -235,7 +275,8 @@ yylex (YYSTYPE *s, void * v_l) %type request_with_dir request_that_take_dir verbose_request %type sub_quotes sup_quotes %type simple_element request_chord command_element Simple_music Composite_music -%type Alternative_music Repeated_music +%type Repeated_music +%type Alternative_music %type tremolo_type %type bare_int bare_unsigned %type script_dir @@ -253,10 +294,10 @@ yylex (YYSTYPE *s, void * v_l) %type chord_additions chord_subtractions chord_notes chord_step %type chord %type chord_note chord_inversion chord_bass -%type duration_length +%type duration_length fraction %type embedded_scm scalar -%type Music Sequential_music Simultaneous_music Music_sequence +%type Music Sequential_music Simultaneous_music %type relative_music re_rhythmed_music part_combined_music %type property_def translator_change %type Music_list @@ -266,7 +307,8 @@ yylex (YYSTYPE *s, void * v_l) %type command_req verbose_command_req %type extender_req %type hyphen_req -%type string bare_number number_expression +%type string bare_number number_expression number_term number_factor + %type score_block score_body %type translator_spec_block translator_spec_body @@ -277,7 +319,10 @@ yylex (YYSTYPE *s, void * v_l) %left '-' '+' -%left '*' '/' + +/* We don't assign precedence to / and *, because we might need varied +prec levels in different prods */ + %left UNARY_MINUS %% @@ -287,11 +332,9 @@ lilypond: /* empty */ | lilypond assignment { } | lilypond error { THIS->error_level_i_ = 1; - //THIS->parser_error (_ ("ly invalid")); } | lilypond INVALID { THIS->error_level_i_ = 1; - //THIS->parser_error (_ ("ly invalid")); } ; @@ -304,12 +347,11 @@ toplevel_expression: } | lilypond_header { if (global_header_p) - scm_unprotect_object (global_header_p->self_scm ()); + scm_gc_unprotect_object (global_header_p->self_scm ()); global_header_p = $1; } | score_block { score_global_array.push ($1); - } | output_def { if (dynamic_cast ($1)) @@ -332,24 +374,21 @@ chordmodifiers_block: CHORDMODIFIERS notenames_body { $$ = $2; } ; - notenames_block: PITCHNAMES notenames_body { $$ = $2; } ; - - notenames_body: embedded_scm { int i = scm_ilength ($1); SCM tab = scm_make_vector (gh_int2scm (i), SCM_EOL); - for (SCM s = $1; gh_pair_p (s); s = gh_cdr (s)) { - SCM pt = gh_cdar (s); + for (SCM s = $1; gh_pair_p (s); s = ly_cdr (s)) { + SCM pt = ly_cdar (s); if (!unsmob_pitch (pt)) THIS->parser_error ("Need pitch object."); else - scm_hashq_set_x (tab, gh_caar (s), pt); + scm_hashq_set_x (tab, ly_caar (s), pt); } $$ = tab; @@ -363,7 +402,7 @@ lilypond_header_body: Scope *sc = new Scope ($$); THIS->lexer_p_-> scope_l_arr_.push (sc); } - | lilypond_header_body assignment semicolon { + | lilypond_header_body assignment { } ; @@ -381,9 +420,20 @@ lilypond_header: */ assignment: STRING { - THIS->remember_spot (); + THIS->push_spot (); } /* cont */ '=' identifier_init { + + /* + Should find generic way of associating input with objects. + */ + Input ip = THIS->pop_spot (); + + if (! regular_identifier_b ($1)) + { + ip.warning (_ ("Identifier should have alphabetic characters only")); + } + THIS->lexer_p_->set_identifier (ly_scm2string ($1), $4); /* @@ -393,10 +443,6 @@ assignment: all objects can be unprotected as soon as they're here. */ - /* - Should find generic way of associating input with objects. - */ - THIS->pop_spot (); } ; @@ -405,22 +451,22 @@ all objects can be unprotected as soon as they're here. identifier_init: score_block { $$ = $1->self_scm (); - scm_unprotect_object ($$); + scm_gc_unprotect_object ($$); } | output_def { $$ = $1->self_scm (); - scm_unprotect_object ($$); + scm_gc_unprotect_object ($$); } | translator_spec_block { $$ = $1; } | Music { $$ = $1->self_scm (); - scm_unprotect_object ($$); + scm_gc_unprotect_object ($$); } | post_request { $$ = $1->self_scm (); - scm_unprotect_object ($$); + scm_gc_unprotect_object ($$); } | explicit_duration { $$ = $1; @@ -448,7 +494,7 @@ translator_spec_body: $$ = unsmob_translator_def ($1)->clone_scm (); unsmob_translator_def ($$)-> set_spot (THIS->here_input ()); } - | TYPE STRING semicolon { + | TYPE STRING { $$ = Translator_def::make_scm (); Translator_def*td = unsmob_translator_def ($$); td->translator_group_type_ = $2; @@ -465,42 +511,32 @@ translator_spec_body: unsmob_translator_def ($$)->add_pop_property ( scm_string_to_symbol ($2), $4); } - | translator_spec_body STRING '=' identifier_init semicolon { - 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")); - - /* ugh*/ - unsmob_translator_def ($$)->add_property_assign ($2, v); - } - | translator_spec_body NAME STRING semicolon { + | translator_spec_body NAME STRING { unsmob_translator_def ($$)->type_name_ = $3; } - | translator_spec_body CONSISTS STRING semicolon { + | translator_spec_body CONSISTS STRING { unsmob_translator_def ($$)->add_element ($3); } - | translator_spec_body ALIAS STRING semicolon { + | translator_spec_body ALIAS STRING { Translator_def*td = unsmob_translator_def ($$); td->type_aliases_ = gh_cons ($3, td->type_aliases_); } - | translator_spec_body ELEMENTDESCRIPTIONS embedded_scm { - for (SCM p = $3; gh_pair_p (p); p = gh_cdr (p)) - unsmob_translator_def ($$) - ->add_property_assign (scm_symbol_to_string (gh_caar (p)), gh_cdar (p)); - + | translator_spec_body GROBDESCRIPTIONS embedded_scm { + Translator_def*td = unsmob_translator_def($$); + // td->add_property_assign (ly_symbol2scm ("allGrobDescriptions"), $3); + for (SCM p = $3; gh_pair_p (p); p = ly_cdr (p)) + td->add_property_assign (scm_symbol_to_string (ly_caar (p)), ly_cdar (p)); } - | translator_spec_body CONSISTSEND STRING semicolon { + | translator_spec_body CONSISTSEND STRING { unsmob_translator_def ($$)->add_last_element ( $3); } - | translator_spec_body ACCEPTS STRING semicolon { + | translator_spec_body ACCEPTS STRING { unsmob_translator_def ($$)->set_acceptor ($3,true); } - | translator_spec_body DENIES STRING semicolon { + | translator_spec_body DENIES STRING { unsmob_translator_def ($$)->set_acceptor ($3,false); } - | translator_spec_body REMOVE STRING semicolon { + | translator_spec_body REMOVE STRING { unsmob_translator_def ($$)->remove_element ($3); } ; @@ -510,7 +546,7 @@ translator_spec_body: */ score_block: SCORE { - THIS->remember_spot (); + THIS->push_spot (); } /*cont*/ '{' score_body '}' { THIS->pop_spot (); @@ -530,7 +566,7 @@ score_body: $$->set_spot (THIS->here_input ()); SCM m = $1->self_scm (); - scm_unprotect_object (m); + scm_gc_unprotect_object (m); $$->music_ = m; } | SCORE_IDENTIFIER { @@ -538,7 +574,7 @@ score_body: $$->set_spot (THIS->here_input ()); } | score_body lilypond_header { - scm_unprotect_object ($2->self_scm ()); + scm_gc_unprotect_object ($2->self_scm ()); $$->header_p_ = $2; } | score_body output_def { @@ -597,7 +633,7 @@ music_output_def_body: THIS->lexer_p_->scope_l_arr_.push (p->scope_p_); $$ = p; } - | music_output_def_body assignment semicolon { + | music_output_def_body assignment { } | music_output_def_body translator_spec_block { @@ -606,7 +642,7 @@ music_output_def_body: | music_output_def_body STYLESHEET embedded_scm { dynamic_cast ($$)-> style_sheet_ = $3; } - | music_output_def_body tempo_request semicolon { + | music_output_def_body tempo_request { /* junk this ? there already is tempo stuff in music. @@ -628,15 +664,22 @@ tempo_request: } ; +/* +The representation of a list is the + + (LIST . LAST-CONS) + + to have efficient append. +*/ Music_list: /* empty */ { $$ = gh_cons (SCM_EOL, SCM_EOL); } | Music_list Music { 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 */ + scm_gc_unprotect_object ($2->self_scm ()); /* UGH */ + if (gh_pair_p (ly_cdr (s))) + gh_set_cdr_x (ly_cdr (s), c); /* append */ else gh_set_car_x (s, c); /* set first cons */ gh_set_cdr_x (s, c) ; /* remember last cell */ @@ -653,42 +696,36 @@ Music: Alternative_music: /* empty */ { - $$ = 0; + $$ = SCM_EOL; } - | ALTERNATIVE Music_sequence { - $$ = $2; - $2->set_spot (THIS->here_input ()); + | ALTERNATIVE '{' Music_list '}' { + $$ = $3; } ; - - - Repeated_music: REPEAT string bare_unsigned Music Alternative_music { - Music_sequence* alts = dynamic_cast ($5); - if (alts && $3 < alts->length_i ()) - $5->origin ()->warning (_ ("More alternatives than repeats. Junking excess alternatives.")); Music *beg = $4; int times = $3; + SCM alts = gh_pair_p ($5) ? gh_car ($5) : SCM_EOL; + if (times < scm_ilength (alts)) { + unsmob_music (gh_car (alts)) + ->origin ()->warning ( + _("More alternatives than repeats. Junking excess alternatives.")); + alts = ly_truncate_list (times, alts); + } Repeated_music * r = new Repeated_music (SCM_EOL); - if (beg) { - r-> set_mus_property ("body", beg->self_scm ()); - scm_unprotect_object (beg->self_scm ()); + r-> set_mus_property ("element", beg->self_scm ()); + scm_gc_unprotect_object (beg->self_scm ()); } r->set_mus_property ("repeat-count", gh_int2scm (times >? 1)); - if (alts) - { - alts->truncate (times); - r-> set_mus_property ("alternatives", alts->self_scm ()); - scm_unprotect_object (alts->self_scm ()); - } - SCM func = scm_eval2 (ly_symbol2scm ("repeat-name-to-ctor"), SCM_EOL); + r-> set_mus_property ("elements",alts); + SCM func = scm_primitive_eval (ly_symbol2scm ("repeat-name-to-ctor")); SCM result = gh_call1 (func, $2); set_music_properties (r, result); @@ -698,32 +735,26 @@ Repeated_music: } ; -Music_sequence: '{' Music_list '}' { - $$ = new Music_sequence (SCM_EOL); - $$->set_mus_property ("elements", gh_car ($2)); - } - ; - Sequential_music: SEQUENTIAL '{' Music_list '}' { $$ = new Sequential_music (SCM_EOL); - $$->set_mus_property ("elements", gh_car ($3)); + $$->set_mus_property ("elements", ly_car ($3)); } | '{' Music_list '}' { $$ = new Sequential_music (SCM_EOL); - $$->set_mus_property ("elements", gh_car ($2)); + $$->set_mus_property ("elements", ly_car ($2)); } ; Simultaneous_music: SIMULTANEOUS '{' Music_list '}'{ $$ = new Simultaneous_music (SCM_EOL); - $$->set_mus_property ("elements", gh_car ($3)); + $$->set_mus_property ("elements", ly_car ($3)); } | '<' Music_list '>' { $$ = new Simultaneous_music (SCM_EOL); - $$->set_mus_property ("elements", gh_car ($2)); + $$->set_mus_property ("elements", ly_car ($2)); } ; @@ -743,8 +774,8 @@ Simple_music: Music *m = new Music (SCM_EOL); m->set_mus_property ("predicate", pred); - m->set_mus_property ("symbol", $3); - m->set_mus_property ("value", $5); + m->set_mus_property ("grob-property", $3); + m->set_mus_property ("grob-value", $5); m->set_mus_property ("iterator-ctor", Output_property_music_iterator::constructor_cxx_function); @@ -762,7 +793,7 @@ Composite_music: CONTEXT STRING Music { Context_specced_music *csm = new Context_specced_music (SCM_EOL); csm->set_mus_property ("element", $3->self_scm ()); - scm_unprotect_object ($3->self_scm ()); + scm_gc_unprotect_object ($3->self_scm ()); csm->set_mus_property ("context-type",$2); csm->set_mus_property ("context-id", ly_str02scm ("")); @@ -774,22 +805,54 @@ Composite_music: chm->set_mus_property ("element", $3->self_scm ()); chm->set_mus_property ("iterator-ctor", Auto_change_iterator::constructor_cxx_function); - scm_unprotect_object ($3->self_scm ()); + scm_gc_unprotect_object ($3->self_scm ()); chm->set_mus_property ("what", $2); $$ = chm; chm->set_spot (*$3->origin ()); } | GRACE Music { +#if 1 + /* + The other version is for easier debugging of + Sequential_music_iterator in combination with grace notes. + */ + + SCM start = THIS->lexer_p_->lookup_identifier ("startGraceMusic"); + SCM stop = THIS->lexer_p_->lookup_identifier ("stopGraceMusic"); + Music *startm = unsmob_music (start); + Music *stopm = unsmob_music (stop); + + SCM ms = SCM_EOL; + if (stopm) { + stopm = stopm->clone (); + ms = gh_cons (stopm->self_scm (), ms); + scm_gc_unprotect_object (stopm->self_scm ()); + } + ms = gh_cons ($2->self_scm (), ms); + scm_gc_unprotect_object ($2->self_scm()); + if (startm) { + startm = startm->clone (); + ms = gh_cons (startm->self_scm () , ms); + scm_gc_unprotect_object (startm->self_scm ()); + } + + Music* seq = new Sequential_music (SCM_EOL); + seq->set_mus_property ("elements", ms); + + $$ = new Grace_music (SCM_EOL); + $$->set_mus_property ("element", seq->self_scm ()); + scm_gc_unprotect_object (seq->self_scm ()); +#else $$ = new Grace_music (SCM_EOL); $$->set_mus_property ("element", $2->self_scm ()); - scm_unprotect_object ($2->self_scm ()); - + scm_gc_unprotect_object ($2->self_scm ()); +#endif } - | CONTEXT STRING '=' STRING Music { + | CONTEXT string '=' string Music { Context_specced_music *csm = new Context_specced_music (SCM_EOL); csm->set_mus_property ("element", $5->self_scm ()); - scm_unprotect_object ($5->self_scm ()); + scm_gc_unprotect_object ($5->self_scm ()); csm->set_mus_property ("context-type", $2); csm->set_mus_property ("context-id", $4); @@ -797,23 +860,23 @@ Composite_music: $$ = csm; } | TIMES { - THIS->remember_spot (); + THIS->push_spot (); } /* CONTINUED */ - bare_unsigned '/' bare_unsigned Music + fraction Music { - int n = $3; int d = $5; - Music *mp = $6; + int n = gh_scm2int (ly_car ($3)); int d = gh_scm2int (ly_cdr ($3)); + Music *mp = $4; $$ = new Time_scaled_music (SCM_EOL); $$->set_spot (THIS->pop_spot ()); $$->set_mus_property ("element", mp->self_scm ()); - scm_unprotect_object (mp->self_scm ()); + scm_gc_unprotect_object (mp->self_scm ()); $$->set_mus_property ("numerator", gh_int2scm (n)); $$->set_mus_property ("denominator", gh_int2scm (d)); - $$->compress (Moment (n,d)); + $$->compress (Moment (Rational (n,d))); } | Repeated_music { $$ = $1; } @@ -826,7 +889,7 @@ Composite_music: p->transpose (pit); $$->set_mus_property ("element", p->self_scm ()); - scm_unprotect_object (p->self_scm ()); + scm_gc_unprotect_object (p->self_scm ()); } | TRANSPOSE steno_tonic_pitch Music { $$ = new Transposed_music (SCM_EOL); @@ -835,7 +898,7 @@ Composite_music: p->transpose (pit); $$->set_mus_property ("element", p->self_scm ()); - scm_unprotect_object (p->self_scm ()); + scm_gc_unprotect_object (p->self_scm ()); } | APPLY embedded_scm Music { @@ -853,6 +916,16 @@ Composite_music: { $$ = $3; THIS->lexer_p_->pop_state (); } + | FIGURES + { THIS->lexer_p_->push_figuredbass_state (); } + Music + { + Music * chm = new Untransposable_music () ; + chm->set_mus_property ("element", $3->self_scm ()); + $$ = chm; + + THIS->lexer_p_->pop_state (); + } | CHORDS { THIS->lexer_p_->push_chord_state (); } Music @@ -882,7 +955,7 @@ relative_music: $$ = new Relative_octave_music (SCM_EOL); $$->set_mus_property ("element", p->self_scm ()); - scm_unprotect_object (p->self_scm ()); + scm_gc_unprotect_object (p->self_scm ()); $$->set_mus_property ("last-pitch", p->to_relative_octave (pit).smobbed_copy ()); @@ -892,10 +965,9 @@ relative_music: re_rhythmed_music: ADDLYRICS Music Music { Lyric_combine_music * l = new Lyric_combine_music (SCM_EOL); - l->set_mus_property ("music", $2->self_scm ()); - l->set_mus_property ("lyrics", $3->self_scm ()); - scm_unprotect_object ($3->self_scm ()); - scm_unprotect_object ($2->self_scm ()); + l->set_mus_property ("elements", gh_list ($2->self_scm (), $3->self_scm (), SCM_UNDEFINED)); + scm_gc_unprotect_object ($3->self_scm ()); + scm_gc_unprotect_object ($2->self_scm ()); $$ = l; } ; @@ -905,12 +977,10 @@ part_combined_music: Part_combine_music * p = new Part_combine_music (SCM_EOL); p->set_mus_property ("what", $2); - p->set_mus_property ("one", $3->self_scm ()); - p->set_mus_property ("two", $4->self_scm ()); - - scm_unprotect_object ($3->self_scm ()); - scm_unprotect_object ($4->self_scm ()); + p->set_mus_property ("elements", gh_list ($3->self_scm (),$4->self_scm (), SCM_UNDEFINED)); + scm_gc_unprotect_object ($3->self_scm ()); + scm_gc_unprotect_object ($4->self_scm ()); $$ = p; } @@ -931,17 +1001,12 @@ translator_change: property_def: PROPERTY STRING '.' STRING '=' scalar { - Music *t = new Music (SCM_EOL); - - t->set_mus_property ("iterator-ctor", - Property_iterator::constructor_cxx_function); - t->set_mus_property ("symbol", scm_string_to_symbol ($4)); - t->set_mus_property ("value", $6); - + + Music *t = set_property_music (scm_string_to_symbol ($4), $6); Context_specced_music *csm = new Context_specced_music (SCM_EOL); csm->set_mus_property ("element", t->self_scm ()); - scm_unprotect_object (t->self_scm ()); + scm_gc_unprotect_object (t->self_scm ()); $$ = csm; $$->set_spot (THIS->here_input ()); @@ -957,7 +1022,7 @@ property_def: Context_specced_music *csm = new Context_specced_music (SCM_EOL); csm->set_mus_property ("element", t->self_scm ()); - scm_unprotect_object (t->self_scm ()); + scm_gc_unprotect_object (t->self_scm ()); $$ = csm; $$->set_spot (THIS->here_input ()); @@ -974,7 +1039,7 @@ property_def: t->set_mus_property ("grob-value", $8); Context_specced_music *csm = new Context_specced_music (SCM_EOL); csm->set_mus_property ("element", t->self_scm ()); - scm_unprotect_object (t->self_scm ()); + scm_gc_unprotect_object (t->self_scm ()); $$ = csm; $$->set_spot (THIS->here_input ()); @@ -989,7 +1054,7 @@ property_def: t->set_mus_property ("grob-value", $8); Context_specced_music *csm = new Context_specced_music (SCM_EOL); csm->set_mus_property ("element", t->self_scm ()); - scm_unprotect_object (t->self_scm ()); + scm_gc_unprotect_object (t->self_scm ()); $$ = csm; $$->set_spot (THIS->here_input ()); @@ -1005,7 +1070,7 @@ property_def: Context_specced_music *csm = new Context_specced_music (SCM_EOL); csm->set_mus_property ("element", t->self_scm ()); - scm_unprotect_object (t->self_scm ()); + scm_gc_unprotect_object (t->self_scm ()); $$ = csm; $$->set_spot (THIS->here_input ()); @@ -1022,18 +1087,19 @@ scalar: request_chord: - pre_requests simple_element post_requests { - Music_sequence *l = dynamic_cast ($2); + pre_requests { + THIS->push_spot (); + } /*cont */ simple_element post_requests { + Music_sequence *l = dynamic_cast ($3); 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)); + for (int i=0; i < $4->size (); i++) + l->append_music ($4->elem (i)); } else programming_error ("Need Sequence to add music to"); - $$ = $2; - + $$ = $3; } | command_element ; @@ -1045,73 +1111,77 @@ command_element: $$-> set_spot (THIS->here_input ()); $1-> set_spot (THIS->here_input ()); } - | BAR STRING ';' { - Music *t = new Music (SCM_EOL); - - t->set_mus_property ("iterator-ctor", - Property_iterator::constructor_cxx_function); - t->set_mus_property ("symbol", ly_symbol2scm ("whichBar")); - t->set_mus_property ("value", $2); + | BAR STRING { + Music *t = set_property_music (ly_symbol2scm ("whichBar"), $2); Context_specced_music *csm = new Context_specced_music (SCM_EOL); csm->set_mus_property ("element", t->self_scm ()); - scm_unprotect_object (t->self_scm ()); + scm_gc_unprotect_object (t->self_scm ()); $$ = csm; $$->set_spot (THIS->here_input ()); csm->set_mus_property ("context-type", ly_str02scm ("Score")); } - | PARTIAL duration_length ';' { - Music * p = new Music (SCM_EOL); - p->set_mus_property ("symbol", ly_symbol2scm ( "measurePosition")); - p->set_mus_property ("iterator-ctor", - Property_iterator::constructor_cxx_function); - + | PARTIAL duration_length { Moment m = - unsmob_duration ($2)->length_mom (); - p->set_mus_property ("value", m.smobbed_copy ()); + Music * p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ()); Context_specced_music * sp = new Context_specced_music (SCM_EOL); sp->set_mus_property ("element", p->self_scm ()); - scm_unprotect_object (p->self_scm ()); + scm_gc_unprotect_object (p->self_scm ()); $$ =sp ; sp-> set_mus_property ("context-type", ly_str02scm ( "Score")); } - | CLEF STRING ';' { - SCM func = scm_eval2 (ly_symbol2scm ("clef-name-to-properties"), SCM_EOL); + | CLEF STRING { + SCM func = scm_primitive_eval (ly_symbol2scm ("clef-name-to-properties")); SCM result = gh_call1 (func, $2); SCM l = SCM_EOL; - for (SCM s = result ; gh_pair_p (s); s = gh_cdr (s)) { + for (SCM s = result ; gh_pair_p (s); s = ly_cdr (s)) { Music * p = new Music (SCM_EOL); - set_music_properties (p, gh_car (s)); + set_music_properties (p, ly_car (s)); l = gh_cons (p->self_scm (), l); - scm_unprotect_object (p->self_scm ()); + scm_gc_unprotect_object (p->self_scm ()); } Sequential_music * seq = new Sequential_music (SCM_EOL); seq->set_mus_property ("elements", l); Context_specced_music * sp = new Context_specced_music (SCM_EOL); sp->set_mus_property ("element", seq->self_scm ()); - scm_unprotect_object (seq->self_scm ()); + scm_gc_unprotect_object (seq->self_scm ()); $$ =sp ; sp-> set_mus_property ("context-type", ly_str02scm ("Staff")); } - | TIME_T bare_unsigned '/' bare_unsigned ';' { - Music * p = new Music (SCM_EOL); - p->set_mus_property ("symbol", - ly_symbol2scm ( "timeSignatureFraction")); - p->set_mus_property ("iterator-ctor", - Property_iterator::constructor_cxx_function); + | TIME_T fraction { + Music * p1 = set_property_music (ly_symbol2scm ( "timeSignatureFraction"), $2); + + int l = gh_scm2int (ly_car ($2)); + int o = gh_scm2int (ly_cdr ($2)); + + Moment one_beat = Moment (1)/Moment (o); + Moment len = Moment (l) * one_beat; + + + Music *p2 = set_property_music (ly_symbol2scm ("measureLength"), len.smobbed_copy ()); + Music *p3 = set_property_music (ly_symbol2scm ("beatLength"), one_beat.smobbed_copy ()); - p->set_mus_property ("value", gh_cons (gh_int2scm ($2), - gh_int2scm ($4))); + SCM list = scm_list_n (p1->self_scm (), p2->self_scm (), p3->self_scm(), SCM_UNDEFINED); + Sequential_music *seq = new Sequential_music (SCM_EOL); + seq->set_mus_property ("elements", list); + Context_specced_music * sp = new Context_specced_music (SCM_EOL); - sp->set_mus_property ("element", p->self_scm ()); - scm_unprotect_object (p->self_scm ()); + sp->set_mus_property ("element", seq->self_scm ()); + + + + scm_gc_unprotect_object (p3->self_scm ()); + scm_gc_unprotect_object (p2->self_scm ()); + scm_gc_unprotect_object (p1->self_scm ()); + scm_gc_unprotect_object (seq->self_scm ()); $$ = sp; @@ -1125,7 +1195,7 @@ command_element: command_req: shorthand_command_req { $$ = $1; } - | verbose_command_req semicolon { $$ = $1; } + | verbose_command_req { $$ = $1; } ; shorthand_command_req: @@ -1156,9 +1226,11 @@ shorthand_command_req: | BREATHE { $$ = new Breathing_sign_req; } + | E_TILDE { + $$ = new Porrectus_req; + } ; - verbose_command_req: COMMANDSPANREQUEST bare_int STRING { /*TODO: junkme */ Span_req * sp_p = new Span_req; @@ -1167,7 +1239,7 @@ verbose_command_req: sp_p->set_spot (THIS->here_input ()); $$ = sp_p; } - | MARK { + | MARK DEFAULT { Mark_req * m = new Mark_req; $$ = m; } @@ -1177,9 +1249,15 @@ verbose_command_req: $$ = m; } - | PENALTY bare_int { + | PENALTY SCM_T { + + Break_req * b = new Break_req; - b->set_mus_property ("penalty", gh_double2scm ( $2 / 100.0)); + SCM s = $2; + if (!gh_number_p (s)) + s =gh_int2scm (0); + + b->set_mus_property ("penalty", s); b->set_spot (THIS->here_input ()); $$ = b; } @@ -1192,7 +1270,7 @@ verbose_command_req: | tempo_request { $$ = $1; } - | KEY { + | KEY DEFAULT { Key_change_req *key_p= new Key_change_req; $$ = key_p; } @@ -1200,7 +1278,7 @@ verbose_command_req: Key_change_req *key_p= new Key_change_req; key_p->set_mus_property ("pitch-alist", $3); - ((Music* )key_p)->transpose (* unsmob_pitch ($2)); + ((Music*)key_p)->transpose (* unsmob_pitch ($2)); $$ = key_p; } ; @@ -1226,7 +1304,7 @@ request_that_take_dir: gen_text_def | verbose_request | script_abbreviation { - SCM s = 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; if (gh_string_p (s)) a->set_mus_property ("articulation-type", s); @@ -1480,22 +1558,22 @@ gen_text_def: script_abbreviation: '^' { - $$ = gh_str02scm ("hat"); + $$ = gh_str02scm ("Hat"); } | '+' { - $$ = gh_str02scm ("plus"); + $$ = gh_str02scm ("Plus"); } | '-' { - $$ = gh_str02scm ("dash"); + $$ = gh_str02scm ("Dash"); } | '|' { - $$ = gh_str02scm ("bar"); + $$ = gh_str02scm ("Bar"); } | '>' { - $$ = gh_str02scm ("larger"); + $$ = gh_str02scm ("Larger"); } | '.' { - $$ = gh_str02scm ("dot"); + $$ = gh_str02scm ("Dot"); } ; @@ -1573,8 +1651,17 @@ multiplied_duration: | multiplied_duration '*' bare_unsigned { $$ = unsmob_duration ($$)->compressed ( $3) .smobbed_copy (); } - | multiplied_duration '/' bare_unsigned { - $$ = unsmob_duration ($$)->compressed (Moment (1,$3)).smobbed_copy (); + | multiplied_duration '*' FRACTION { + Rational m (gh_scm2int (ly_car ($3)), gh_scm2int (ly_cdr ($3))); + + $$ = unsmob_duration ($$)->compressed (m).smobbed_copy (); + } + ; + +fraction: + FRACTION { $$ = $1; } + | UNSIGNED '/' UNSIGNED { + $$ = gh_cons (gh_int2scm ($1), gh_int2scm ($3)); } ; @@ -1600,8 +1687,60 @@ tremolo_type: ; +bass_number: + DIGIT + | UNSIGNED + ; + +bass_mod: + '-' { $$ = -1; } + | '+' { $$ = 1; } + | '!' { $$ = 0; } + ; + +bass_figure: + bass_number { + Pitch p ; + p .notename_i_ = $1 - 1; + p.normalise(); + + Note_req * nr = new Note_req; + $$ = nr->self_scm (); + nr->set_mus_property ("pitch", p.smobbed_copy ()); + scm_gc_unprotect_object ($$); + } + | bass_figure bass_mod { + if ($2) { + SCM sp = unsmob_music ($1)->get_mus_property ("pitch"); + unsmob_pitch (sp)->alteration_i_ += $2; + } else { + unsmob_music ($1)->set_mus_property ("force-accidental", SCM_BOOL_T); + } + } + ; + +figure_list: + /**/ { + $$ = SCM_EOL; + } + | figure_list bass_figure { + $$ = gh_cons ($2, $1); + } + ; + +figure_spec: + FIGURE_OPEN figure_list FIGURE_CLOSE { + Music * m = new Request_chord (SCM_EOL); + $2 = scm_reverse_x ($2, SCM_EOL); + m->set_mus_property ("elements", $2); + $$ = m->self_scm (); + } + ; + simple_element: pitch exclamations questions optional_notemode_duration { + + Input i = THIS->pop_spot (); if (!THIS->lexer_p_->note_state_b ()) THIS->parser_error (_ ("Have to be in Note mode for notes")); @@ -1616,42 +1755,48 @@ simple_element: n->set_mus_property ("force-accidental", SCM_BOOL_T); Simultaneous_music*v = new Request_chord (SCM_EOL); - v->set_mus_property ("elements", gh_list (n->self_scm (), SCM_UNDEFINED)); + v->set_mus_property ("elements", scm_list_n (n->self_scm (), SCM_UNDEFINED)); -/* -FIXME: location is one off, since ptich & duration don't contain origin refs. -*/ - v->set_spot (THIS->here_input ()); - n->set_spot (THIS->here_input ()); - + v->set_spot (i); + n->set_spot (i); $$ = v; } - | RESTNAME optional_notemode_duration { - - SCM e = SCM_UNDEFINED; - if (ly_scm2string ($1) =="s") - { /* Space */ - Skip_req * skip_p = new Skip_req; - skip_p->set_mus_property ("duration" ,$2); - - skip_p->set_spot (THIS->here_input ()); + | figure_spec optional_notemode_duration { + Music * m = unsmob_music ($1); + Input i = THIS->pop_spot (); + m->set_spot (i); + for (SCM s = m->get_mus_property ("elements"); gh_pair_p (s); s = ly_cdr (s)) + { + unsmob_music (ly_car (s))->set_mus_property ("duration", $2); + } + $$ = m; + } + | RESTNAME optional_notemode_duration { + + Input i = THIS->pop_spot (); + SCM e = SCM_UNDEFINED; + if (ly_scm2string ($1) =="s") { + /* Space */ + Skip_req * skip_p = new Skip_req; + skip_p->set_mus_property ("duration" ,$2); + skip_p->set_spot (i); e = skip_p->self_scm (); - } - else - { - Rest_req * rest_req_p = new Rest_req; - rest_req_p->set_mus_property ("duration", $2); - rest_req_p->set_spot (THIS->here_input ()); + } + else { + Rest_req * rest_req_p = new Rest_req; + rest_req_p->set_mus_property ("duration", $2); + rest_req_p->set_spot (i); e = rest_req_p->self_scm (); } - Simultaneous_music* velt_p = new Request_chord (SCM_EOL); - velt_p-> set_mus_property ("elements", gh_list (e,SCM_UNDEFINED)); - velt_p->set_spot (THIS->here_input ()); + Simultaneous_music* velt_p = new Request_chord (SCM_EOL); + velt_p-> set_mus_property ("elements", scm_list_n (e,SCM_UNDEFINED)); + velt_p->set_spot (i); - - $$ = velt_p; + $$ = velt_p; } | MULTI_MEASURE_REST optional_notemode_duration { + Input i = THIS->pop_spot (); + Skip_req * sk = new Skip_req; sk->set_mus_property ("duration", $2); Span_req *sp1 = new Span_req; @@ -1663,41 +1808,32 @@ FIXME: location is one off, since ptich & duration don't contain origin refs. sp2->set_mus_property ("span-type", r); Request_chord * rqc1 = new Request_chord (SCM_EOL); - rqc1->set_mus_property ("elements", gh_list (sp1->self_scm (), SCM_UNDEFINED)); + rqc1->set_mus_property ("elements", scm_list_n (sp1->self_scm (), SCM_UNDEFINED)); Request_chord * rqc2 = new Request_chord (SCM_EOL); - rqc2->set_mus_property ("elements", gh_list (sk->self_scm (), SCM_UNDEFINED));; + rqc2->set_mus_property ("elements", scm_list_n (sk->self_scm (), SCM_UNDEFINED));; Request_chord * rqc3 = new Request_chord (SCM_EOL); - rqc3->set_mus_property ("elements", gh_list (sp2->self_scm (), SCM_UNDEFINED));; + rqc3->set_mus_property ("elements", scm_list_n (sp2->self_scm (), SCM_UNDEFINED));; - SCM ms = gh_list (rqc1->self_scm (), rqc2->self_scm (), rqc3->self_scm (), SCM_UNDEFINED); + SCM ms = scm_list_n (rqc1->self_scm (), rqc2->self_scm (), rqc3->self_scm (), SCM_UNDEFINED); $$ = new Sequential_music (SCM_EOL); $$->set_mus_property ("elements", ms); } - | 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 (); + | STRING optional_notemode_duration { + Input i = THIS->pop_spot (); + Lyric_req* lreq_p = new Lyric_req; lreq_p->set_mus_property ("text", $1); - lreq_p->set_mus_property ("duration",$3); - lreq_p->set_spot (THIS->here_input ()); + lreq_p->set_mus_property ("duration",$2); + lreq_p->set_spot (i); Simultaneous_music* velt_p = new Request_chord (SCM_EOL); - velt_p->set_mus_property ("elements", gh_list (lreq_p->self_scm (), SCM_UNDEFINED)); - + velt_p->set_mus_property ("elements", scm_list_n (lreq_p->self_scm (), SCM_UNDEFINED)); $$= velt_p; - } | chord { + Input i = THIS->pop_spot (); + if (!THIS->lexer_p_->chord_state_b ()) THIS->parser_error (_ ("Have to be in Chord mode for chords")); $$ = $1; @@ -1762,10 +1898,11 @@ chord_step: $$ = gh_cons ($1, SCM_EOL); } | CHORDMODIFIER_PITCH { - $$ = gh_cons ($1, SCM_EOL); + $$ = gh_cons (unsmob_pitch ($1)->smobbed_copy (), SCM_EOL); } | CHORDMODIFIER_PITCH chord_note { /* Ugh. */ - $$ = gh_list ($1, $2, SCM_UNDEFINED); + $$ = scm_list_n (unsmob_pitch ($1)->smobbed_copy (), + $2, SCM_UNDEFINED); } ; @@ -1801,76 +1938,75 @@ chord_note: UTILITIES */ number_expression: - bare_number { - $$ = $1; + number_expression '+' number_term { + $$ = scm_sum ($1, $3); } - | '-' number_expression %prec UNARY_MINUS { - $$ = scm_difference ($2, SCM_UNDEFINED); + | number_expression '-' number_term { + $$ = scm_difference ($1, $3); + } + | number_term + ; + +number_term: + number_factor { + $$ = $1; } - | number_expression '*' number_expression { + | number_factor '*' number_factor { $$ = scm_product ($1, $3); } - | number_expression '/' number_expression { + | number_factor '/' number_factor { $$ = scm_divide ($1, $3); } - | number_expression '+' number_expression { - $$ = scm_sum ($1, $3); - } - | number_expression '-' number_expression { - $$ = scm_difference ($1, $3); - } - | '(' number_expression ')' { + ; + +number_factor: + '(' number_expression ')' { $$ = $2; } + | '-' number_factor { /* %prec UNARY_MINUS */ + $$ = scm_difference ($2, SCM_UNDEFINED); + } + | bare_number ; + bare_number: UNSIGNED { $$ = gh_int2scm ($1); } - | DIGIT { - $$ = gh_int2scm ($1); - } | REAL { - $$ = gh_double2scm ($1); + $$ = $1; } | NUMBER_IDENTIFIER { $$ = $1; } | REAL CM_T { - $$ = gh_double2scm ($1 CM); + $$ = gh_double2scm (gh_scm2double ($1) CM ); } | REAL PT_T { - $$ = gh_double2scm ($1 PT); + $$ = gh_double2scm (gh_scm2double ($1) PT); } | REAL IN_T { - $$ = gh_double2scm ($1 INCH); + $$ = gh_double2scm (gh_scm2double ($1) INCH); } | REAL MM_T { - $$ = gh_double2scm ($1 MM); + $$ = gh_double2scm (gh_scm2double ($1) MM); } | REAL CHAR_T { - $$ = gh_double2scm ($1 CHAR); + $$ = gh_double2scm (gh_scm2double ($1) CHAR); } ; 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 { + $$ = $1; + } + | DIGIT { + $$ = $1; } ; + bare_int: bare_number { if (scm_integer_p ($1) == SCM_BOOL_T) @@ -1897,7 +2033,7 @@ string: $$ = $1; } | string '+' string { - $$ = scm_string_append (scm_listify ($1, $3, SCM_UNDEFINED)); + $$ = scm_string_append (scm_list_n ($1, $3, SCM_UNDEFINED)); } ; @@ -1913,10 +2049,6 @@ questions: ; -semicolon: - ';' - ; - %% void