X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=b9f4793d2c50450cad3c7c9bd15b1d567ff385f2;hb=6bf1606d827527f02953add0988a4fbbf0dc0c4e;hp=54d0ce94000943bfeec744dee367af01d05dc784;hpb=a2991295b2c1fb36bec19de207161855ca3c1756;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 54d0ce9400..b9f4793d2c 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -9,7 +9,15 @@ Jan Nieuwenhuizen */ +/* + Two shift/reduce problems: + - + - + */ + +#include #include + #include "translator-def.hh" #include "lily-guile.hh" #include "change-iterator.hh" @@ -37,6 +45,7 @@ #include "transposed-music.hh" #include "time-scaled-music.hh" #include "repeated-music.hh" + #include "lilypond-input-version.hh" #include "grace-music.hh" #include "part-combine-music.hh" @@ -45,13 +54,40 @@ #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) { @@ -62,15 +98,9 @@ set_music_properties (Music *p, SCM a) } -// 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 +126,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 @@ -160,7 +188,7 @@ yylex (YYSTYPE *s, void * v_l) %token EXTENDER %token FONT %token GLISSANDO -%token GRACE +%token GRACE NGRACE %token HEADER %token HYPHEN %token IN_T @@ -172,6 +200,7 @@ yylex (YYSTYPE *s, void * v_l) %token MIDI %token MM_T %token PITCH +%token DEFAULT %token NAME %token PITCHNAMES %token NOTES @@ -213,6 +242,7 @@ yylex (YYSTYPE *s, void * v_l) %token TONICNAME_PITCH %token CHORDMODIFIER_PITCH %token DURATION_IDENTIFIER +%token FRACTION %token IDENTIFIER @@ -224,10 +254,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 @@ -242,8 +272,8 @@ yylex (YYSTYPE *s, void * v_l) %type identifier_init -%type steno_duration optional_notemode_duration -%type entered_notemode_duration explicit_duration +%type steno_duration optional_notemode_duration multiplied_duration +%type explicit_duration %type pre_requests post_requests %type gen_text_def @@ -253,7 +283,7 @@ 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 @@ -266,7 +296,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 +308,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 +321,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 +336,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,13 +363,10 @@ chordmodifiers_block: CHORDMODIFIERS notenames_body { $$ = $2; } ; - notenames_block: PITCHNAMES notenames_body { $$ = $2; } ; - - notenames_body: embedded_scm { int i = scm_ilength ($1); @@ -363,7 +391,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 { } ; @@ -384,6 +412,17 @@ assignment: THIS->remember_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 +432,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 +440,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 +483,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,23 +500,13 @@ 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_); } @@ -491,16 +516,16 @@ translator_spec_body: ->add_property_assign (scm_symbol_to_string (gh_caar (p)), gh_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); } ; @@ -530,7 +555,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 +563,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 +622,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 +631,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. @@ -634,7 +659,7 @@ Music_list: /* empty */ { | Music_list Music { SCM s = $$; SCM c = gh_cons ($2->self_scm (), SCM_EOL); - scm_unprotect_object ($2->self_scm ()); /* UGH */ + scm_gc_unprotect_object ($2->self_scm ()); /* UGH */ if (gh_pair_p (gh_cdr (s))) gh_set_cdr_x (gh_cdr (s), c); /* append */ else @@ -678,7 +703,7 @@ Repeated_music: if (beg) { r-> set_mus_property ("body", beg->self_scm ()); - scm_unprotect_object (beg->self_scm ()); + scm_gc_unprotect_object (beg->self_scm ()); } r->set_mus_property ("repeat-count", gh_int2scm (times >? 1)); @@ -686,9 +711,9 @@ Repeated_music: { alts->truncate (times); r-> set_mus_property ("alternatives", alts->self_scm ()); - scm_unprotect_object (alts->self_scm ()); + scm_gc_unprotect_object (alts->self_scm ()); } - SCM func = scm_eval2 (ly_symbol2scm ("repeat-name-to-ctor"), SCM_EOL); + SCM func = scm_primitive_eval (ly_symbol2scm ("repeat-name-to-ctor")); SCM result = gh_call1 (func, $2); set_music_properties (r, result); @@ -743,8 +768,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); @@ -755,14 +780,6 @@ Simple_music: } | property_def | translator_change - | Simple_music '*' bare_unsigned '/' bare_unsigned { - $$ = $1; - $$->compress (Moment ($3, $5 )); - } - | Simple_music '*' bare_unsigned { - $$ = $1; - $$->compress (Moment ($3, 1)); - } ; @@ -770,7 +787,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 ("")); @@ -782,22 +799,56 @@ 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 0 + /* + 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); @@ -808,17 +859,17 @@ Composite_music: THIS->remember_spot (); } /* CONTINUED */ - bare_unsigned '/' bare_unsigned Music + fraction Music { - int n = $3; int d = $5; - Music *mp = $6; + int n = gh_scm2int (gh_car ($3)); int d = gh_scm2int (gh_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)); @@ -834,7 +885,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); @@ -843,7 +894,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 { @@ -890,7 +941,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 ()); @@ -902,8 +953,8 @@ re_rhythmed_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 ()); + scm_gc_unprotect_object ($3->self_scm ()); + scm_gc_unprotect_object ($2->self_scm ()); $$ = l; } ; @@ -916,8 +967,8 @@ part_combined_music: 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 ()); + scm_gc_unprotect_object ($3->self_scm ()); + scm_gc_unprotect_object ($4->self_scm ()); $$ = p; @@ -939,17 +990,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 ()); @@ -965,7 +1011,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 ()); @@ -982,7 +1028,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 ()); @@ -997,7 +1043,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 ()); @@ -1013,7 +1059,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 ()); @@ -1053,41 +1099,31 @@ 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; @@ -1095,31 +1131,45 @@ command_element: Music * p = new Music (SCM_EOL); set_music_properties (p, gh_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); - p->set_mus_property ("value", gh_cons (gh_int2scm ($2), - gh_int2scm ($4))); + int l = gh_scm2int (gh_car ($2)); + int o = gh_scm2int (gh_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 ()); + + SCM list = gh_list (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; @@ -1133,7 +1183,7 @@ command_element: command_req: shorthand_command_req { $$ = $1; } - | verbose_command_req semicolon { $$ = $1; } + | verbose_command_req { $$ = $1; } ; shorthand_command_req: @@ -1175,7 +1225,7 @@ verbose_command_req: sp_p->set_spot (THIS->here_input ()); $$ = sp_p; } - | MARK { + | MARK DEFAULT { Mark_req * m = new Mark_req; $$ = m; } @@ -1185,9 +1235,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; } @@ -1200,7 +1256,7 @@ verbose_command_req: | tempo_request { $$ = $1; } - | KEY { + | KEY DEFAULT { Key_change_req *key_p= new Key_change_req; $$ = key_p; } @@ -1234,7 +1290,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); @@ -1488,22 +1544,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"); } ; @@ -1530,31 +1586,19 @@ absolute_pitch: ; duration_length: - steno_duration { + multiplied_duration { $$ = $1; } | explicit_duration { $$ = $1; } - | duration_length '*' bare_unsigned { - $$ = unsmob_duration ($$)->compressed ( $3) .smobbed_copy (); - } - | duration_length '/' bare_unsigned { - $$ = unsmob_duration ($$)->compressed (Moment (1,$3)).smobbed_copy (); - } - ; - -entered_notemode_duration: - steno_duration { - THIS->set_last_duration (unsmob_duration ($1)); - } ; optional_notemode_duration: { $$ = THIS->default_duration_.smobbed_copy (); } - | entered_notemode_duration { + | multiplied_duration { $$ = $1; } | explicit_duration { @@ -1571,11 +1615,39 @@ steno_duration: l = intlog2 ($1); $$ = Duration (l, $2).smobbed_copy (); + + THIS->set_last_duration (unsmob_duration ($$)); } | DURATION_IDENTIFIER dots { Duration *d =unsmob_duration ($1); Duration k (d->duration_log (),d->dot_count () + $2); - $$ = k.smobbed_copy (); + $$ = k.smobbed_copy (); + + THIS->set_last_duration (unsmob_duration ($$)); + } + ; + + + + +multiplied_duration: + steno_duration { + $$ = $1; + } + | multiplied_duration '*' bare_unsigned { + $$ = unsmob_duration ($$)->compressed ( $3) .smobbed_copy (); + } + | multiplied_duration '*' FRACTION { + Rational m (gh_scm2int (gh_car ($3)), gh_scm2int (gh_cdr ($3))); + + $$ = unsmob_duration ($$)->compressed (m).smobbed_copy (); + } + ; + +fraction: + FRACTION { $$ = $1; } + | UNSIGNED '/' UNSIGNED { + $$ = gh_cons (gh_int2scm ($1), gh_int2scm ($3)); } ; @@ -1675,21 +1747,11 @@ FIXME: location is one off, since ptich & duration don't contain origin refs. $$ = 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 { + Lyric_req* lreq_p = new Lyric_req; lreq_p->set_mus_property ("text", $1); - lreq_p->set_mus_property ("duration",$3); + lreq_p->set_mus_property ("duration",$2); lreq_p->set_spot (THIS->here_input ()); Simultaneous_music* velt_p = new Request_chord (SCM_EOL); velt_p->set_mus_property ("elements", gh_list (lreq_p->self_scm (), SCM_UNDEFINED)); @@ -1763,10 +1825,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); + $$ = gh_list (unsmob_pitch ($1)->smobbed_copy (), + $2, SCM_UNDEFINED); } ; @@ -1802,76 +1865,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) @@ -1898,7 +1960,7 @@ string: $$ = $1; } | string '+' string { - $$ = scm_string_append (scm_listify ($1, $3, SCM_UNDEFINED)); + $$ = scm_string_append (scm_list_n ($1, $3, SCM_UNDEFINED)); } ; @@ -1914,10 +1976,6 @@ questions: ; -semicolon: - ';' - ; - %% void