X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=b9f4793d2c50450cad3c7c9bd15b1d567ff385f2;hb=6bf1606d827527f02953add0988a4fbbf0dc0c4e;hp=1ac8e9b9e9969633ab74f701950526d5b9a16250;hpb=103b4daf1ba90415029388126ce9f742b9cf62db;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 1ac8e9b9e9..b9f4793d2c 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1,19 +1,26 @@ %{ // -*-Fundamental-*- /* - parser.yy -- Bison/C++ parser for mudela + parser.yy -- Bison/C++ parser for lilypond source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys Jan Nieuwenhuizen */ +/* + Two shift/reduce problems: + - + - + */ + +#include #include + #include "translator-def.hh" #include "lily-guile.hh" - -#include "lookup.hh" +#include "change-iterator.hh" #include "misc.hh" #include "my-lily-lexer.hh" #include "paper-def.hh" @@ -22,14 +29,14 @@ #include "file-path.hh" #include "debug.hh" #include "dimensions.hh" -#include "identifier.hh" #include "command-request.hh" #include "musical-request.hh" #include "my-lily-parser.hh" #include "context-specced-music.hh" #include "score.hh" #include "music-list.hh" - +#include "output-property-music-iterator.hh" +#include "property-iterator.hh" #include "file-results.hh" #include "input.hh" #include "scope.hh" @@ -38,32 +45,65 @@ #include "transposed-music.hh" #include "time-scaled-music.hh" #include "repeated-music.hh" -#include "mudela-version.hh" + +#include "lilypond-input-version.hh" #include "grace-music.hh" -#include "auto-change-music.hh" #include "part-combine-music.hh" - +#include "scm-hash.hh" +#include "auto-change-iterator.hh" +#include "un-relativable-music.hh" #include "chord.hh" bool -is_duration_b (int t) +regular_identifier_b (SCM id) { - return t && t == 1 << intlog2(t); + String str = ly_scm2string (id); + char const *s = str.ch_C() ; + + bool v = true; + while (*s && v) + { + v = v && isalpha (*s); + s++; + } + return v; } -// mmm JUNKME ? -Mudela_version oldest_version ("1.3.59"); +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 -print_mudela_versions (ostream &os) +set_music_properties (Music *p, SCM a) { - os << _f ("Oldest supported input version: %s", oldest_version.str ()) - << endl; + for (SCM k = a; gh_pair_p (k); k = gh_cdr (k)) + { + p->set_mus_property (gh_caar (k), gh_cdar (k)); + } } -// needed for bison.simple's malloc() and free() + + + + + +// needed for bison.simple's malloc () and free () #include #ifndef NDEBUG @@ -74,7 +114,8 @@ print_mudela_versions (ostream &os) #define YYPARSE_PARAM my_lily_parser_l #define YYLEX_PARAM my_lily_parser_l -#define THIS ((My_lily_parser *) my_lily_parser_l) +#define THIS\ + ((My_lily_parser *) my_lily_parser_l) #define yyerror THIS->parser_error #define ARRAY_SIZE(a,s) if (a.size () != s) THIS->parser_error (_f ("Expecting %d arguments", s)) @@ -83,20 +124,16 @@ print_mudela_versions (ostream &os) %union { - Array *pitch_arr; + Link_array *reqvec; - Duration *duration; - Identifier *id; - String * string; + + String *string; // needed by the lexer as temporary scratch area. Music *music; Score *score; Scope *scope; - - Musical_req* musreq; + Scheme_hash_table *scmhash; Music_output_def * outputdef; - Musical_pitch * pitch; - Midi_def* midi; - Real real; + Request * request; /* We use SCMs to do strings, because it saves us the trouble of @@ -127,9 +164,10 @@ yylex (YYSTYPE *s, void * v_l) /* tokens which are not keywords */ %token AUTOCHANGE +%token ALIAS +%token APPLY %token ARPEGGIO %token DYNAMICSCRIPT -%token TEXTSCRIPT %token ACCEPTS %token ALTERNATIVE %token BAR @@ -140,14 +178,17 @@ yylex (YYSTYPE *s, void * v_l) %token CLEF %token CM_T %token CONSISTS +%token DURATION %token SEQUENTIAL +%token ELEMENTDESCRIPTIONS %token SIMULTANEOUS %token CONSISTSEND %token DENIES %token DURATION %token EXTENDER %token FONT -%token GRACE +%token GLISSANDO +%token GRACE NGRACE %token HEADER %token HYPHEN %token IN_T @@ -155,18 +196,19 @@ yylex (YYSTYPE *s, void * v_l) %token KEY %token LYRICS %token MARK -%token MEASURES +%token MULTI_MEASURE_REST %token MIDI %token MM_T -%token MUSICAL_PITCH +%token PITCH +%token DEFAULT %token NAME -%token NOTENAMES +%token PITCHNAMES %token NOTES %token PAPER %token PARTIAL %token PENALTY %token PROPERTY -%token PUSH POP +%token OVERRIDE SET REVERT %token PT_T %token RELATIVE %token REMOVE @@ -178,6 +220,7 @@ yylex (YYSTYPE *s, void * v_l) %token SCRIPT %token SKIP %token SPANREQUEST +%token STYLESHEET %token COMMANDSPANREQUEST %token TEMPO %token OUTPUTPROPERTY @@ -186,36 +229,38 @@ yylex (YYSTYPE *s, void * v_l) %token TRANSLATOR %token TRANSPOSE %token TYPE +%token UNSET %token CONTEXT /* escaped */ -%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER +%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE %token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET -%type exclamations questions +%type exclamations questions dots %token DIGIT -%token NOTENAME_PITCH -%token TONICNAME_PITCH -%token CHORDMODIFIER_PITCH -%token DURATION_IDENTIFIER +%token NOTENAME_PITCH +%token TONICNAME_PITCH +%token CHORDMODIFIER_PITCH +%token DURATION_IDENTIFIER +%token FRACTION %token IDENTIFIER -%token SCORE_IDENTIFIER -%token MUSIC_OUTPUT_DEF_IDENTIFIER +%token SCORE_IDENTIFIER +%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 RESTNAME +%token STRING %token SCM_T %token UNSIGNED -%token REAL +%token REAL %type output_def -%type mudela_header mudela_header_body +%type lilypond_header lilypond_header_body %type open_request_parens close_request_parens open_request close_request %type request_with_dir request_that_take_dir verbose_request %type sub_quotes sup_quotes @@ -227,18 +272,18 @@ 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 -%type steno_musical_pitch musical_pitch absolute_musical_pitch -%type steno_tonic_pitch +%type steno_pitch pitch absolute_pitch +%type explicit_pitch steno_tonic_pitch -%type chord_additions chord_subtractions chord_notes chord_step +%type chord_additions chord_subtractions chord_notes chord_step %type chord -%type chord_note chord_inversion chord_bass -%type duration_length +%type chord_note chord_inversion chord_bass +%type duration_length fraction %type embedded_scm scalar %type Music Sequential_music Simultaneous_music Music_sequence @@ -248,10 +293,11 @@ yylex (YYSTYPE *s, void * v_l) %type music_output_def_body %type shorthand_command_req %type post_request -%type command_req verbose_command_req +%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 @@ -262,21 +308,22 @@ 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 %% -mudela: /* empty */ - | mudela toplevel_expression {} - | mudela assignment { } - | mudela error { +lilypond: /* empty */ + | lilypond toplevel_expression {} + | lilypond assignment { } + | lilypond error { THIS->error_level_i_ = 1; - //THIS->parser_error (_ ("ly invalid")); } - | mudela INVALID { + | lilypond INVALID { THIS->error_level_i_ = 1; - //THIS->parser_error (_ ("ly invalid")); } ; @@ -287,20 +334,19 @@ toplevel_expression: | chordmodifiers_block { THIS->lexer_p_->chordmodifier_tab_ = $1; } - | mudela_header { - delete header_global_p; - header_global_p = $1; + | lilypond_header { + if (global_header_p) + scm_gc_unprotect_object (global_header_p->self_scm ()); + global_header_p = $1; } | score_block { score_global_array.push ($1); } | output_def { - Identifier * id = new - Music_output_def_identifier ($1, MUSIC_OUTPUT_DEF_IDENTIFIER); if (dynamic_cast ($1)) - THIS->lexer_p_->set_identifier ("$defaultpaper", id->self_scm ()); + THIS->lexer_p_->set_identifier ("$defaultpaper", $1->self_scm ()); else if (dynamic_cast ($1)) - THIS->lexer_p_->set_identifier ("$defaultmidi", id->self_scm ()); + THIS->lexer_p_->set_identifier ("$defaultmidi", $1->self_scm ()); } | embedded_scm { // junk value @@ -317,43 +363,43 @@ chordmodifiers_block: CHORDMODIFIERS notenames_body { $$ = $2; } ; - notenames_block: - NOTENAMES notenames_body { $$ = $2; } + 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; s != SCM_EOL; s = gh_cdr (s)) { + for (SCM s = $1; gh_pair_p (s); 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); + if (!unsmob_pitch (pt)) + THIS->parser_error ("Need pitch object."); + else + scm_hashq_set_x (tab, gh_caar (s), pt); } $$ = tab; } ; -mudela_header_body: +lilypond_header_body: { - $$ = new Scope; - THIS->lexer_p_-> scope_l_arr_.push ($$); + $$ = new Scheme_hash_table; + + Scope *sc = new Scope ($$); + THIS->lexer_p_-> scope_l_arr_.push (sc); } - | mudela_header_body assignment semicolon { + | lilypond_header_body assignment { } ; -mudela_header: - HEADER '{' mudela_header_body '}' { +lilypond_header: + HEADER '{' lilypond_header_body '}' { $$ = $3; - THIS->lexer_p_-> scope_l_arr_.pop (); + delete THIS->lexer_p_-> scope_l_arr_.pop (); } ; @@ -366,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); /* @@ -375,9 +432,6 @@ assignment: 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); } ; @@ -385,24 +439,26 @@ all objects can be unprotected as soon as they're here. identifier_init: score_block { - $$ = (new Score_identifier ($1, SCORE_IDENTIFIER))->self_scm(); + $$ = $1->self_scm (); + scm_gc_unprotect_object ($$); } | output_def { - $$ = (new Music_output_def_identifier ($1, MUSIC_OUTPUT_DEF_IDENTIFIER))->self_scm(); + $$ = $1->self_scm (); + 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 { - $$ = (new Duration_identifier ($1, DURATION_IDENTIFIER))->self_scm (); + $$ = $1; } | number_expression { $$ = $1; @@ -427,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; @@ -436,40 +492,40 @@ translator_spec_body: | translator_spec_body STRING '=' embedded_scm { unsmob_translator_def ($$)->add_property_assign ($2, $4); } - | translator_spec_body STRING PUSH embedded_scm '=' embedded_scm { + | translator_spec_body STRING OVERRIDE 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 ( + | translator_spec_body STRING REVERT embedded_scm { + 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 CONSISTSEND 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 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); } ; @@ -486,35 +542,28 @@ score_block: $$ = $4; if (!$$->def_p_arr_.size ()) { - Identifier *id = - unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultpaper")); - $$->add_output (id ? id->access_content_Music_output_def (true) : new Paper_def ); + Music_output_def *id = + unsmob_music_output_def (THIS->lexer_p_->lookup_identifier ("$defaultpaper")); + $$->add_output (id ? id->clone () : 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: Music { $$ = new Score; - + $$->set_spot (THIS->here_input ()); SCM m = $1->self_scm (); - scm_unprotect_object (m); + scm_gc_unprotect_object (m); $$->music_ = m; } | SCORE_IDENTIFIER { - $$ = $1->access_content_Score (true); + $$ = new Score (*unsmob_score ($1)); + $$->set_spot (THIS->here_input ()); } - | score_body mudela_header { + | score_body lilypond_header { + scm_gc_unprotect_object ($2->self_scm ()); $$->header_p_ = $2; } | score_body output_def { @@ -532,18 +581,18 @@ score_body: output_def: music_output_def_body '}' { $$ = $1; - THIS-> lexer_p_-> scope_l_arr_.pop(); + THIS-> lexer_p_-> scope_l_arr_.pop (); } ; music_output_def_body: MIDI '{' { - Identifier *id = unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultmidi")); + Music_output_def *id = unsmob_music_output_def (THIS->lexer_p_->lookup_identifier ("$defaultmidi")); Midi_def* p =0; if (id) - p = dynamic_cast (id->access_content_Music_output_def (true)); + p = dynamic_cast (id->clone ()); else p = new Midi_def; @@ -551,43 +600,45 @@ music_output_def_body: THIS->lexer_p_->scope_l_arr_.push (p->scope_p_); } | PAPER '{' { - Identifier *id = unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultpaper")); + Music_output_def *id = unsmob_music_output_def (THIS->lexer_p_->lookup_identifier ("$defaultpaper")); Paper_def *p = 0; if (id) - p = dynamic_cast (id->access_content_Music_output_def (true)); + p = dynamic_cast (id->clone ()); else p = new Paper_def; THIS-> lexer_p_-> scope_l_arr_.push (p->scope_p_); $$ = p; } | PAPER '{' MUSIC_OUTPUT_DEF_IDENTIFIER { - Music_output_def *p = $3->access_content_Music_output_def (true); + Music_output_def *p = unsmob_music_output_def ($3); + p = p->clone (); THIS->lexer_p_->scope_l_arr_.push (p->scope_p_); $$ = p; } | MIDI '{' MUSIC_OUTPUT_DEF_IDENTIFIER { - Music_output_def *p = $3->access_content_Music_output_def (true); + Music_output_def *p = unsmob_music_output_def ($3); + p = p->clone (); + 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 { $$->assign_translator ($2); } - | music_output_def_body tempo_request semicolon { + | music_output_def_body STYLESHEET embedded_scm { + dynamic_cast ($$)-> style_sheet_ = $3; + } + | music_output_def_body tempo_request { /* junk this ? there already is tempo stuff in music. */ - dynamic_cast ($$)->set_tempo ($2->dur_.length_mom (), $2->metronome_i_); - } - | 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); + int m = gh_scm2int ( $2->get_mus_property ("metronome-count")); + Duration *d = unsmob_duration ($2->get_mus_property ("duration")); + dynamic_cast ($$)->set_tempo (d->length_mom (), m); } | music_output_def_body error { @@ -597,9 +648,8 @@ music_output_def_body: tempo_request: TEMPO steno_duration '=' bare_unsigned { $$ = new Tempo_req; - $$->dur_ = *$2; - delete $2; - $$-> metronome_i_ = $4; + $$->set_mus_property ("duration", $2); + $$->set_mus_property ("metronome-count", gh_int2scm ( $4)); } ; @@ -609,9 +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 @@ -642,41 +690,65 @@ Alternative_music: Repeated_music: - REPEAT STRING bare_unsigned Music Alternative_music + REPEAT string bare_unsigned Music Alternative_music { - Music_sequence* m = dynamic_cast ($5); - if (m && $3 < m->length_i ()) + 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; + + Repeated_music * r = new Repeated_music (SCM_EOL); + + if (beg) + { + r-> set_mus_property ("body", 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_gc_unprotect_object (alts->self_scm ()); + } + SCM func = scm_primitive_eval (ly_symbol2scm ("repeat-name-to-ctor")); + SCM result = gh_call1 (func, $2); + + set_music_properties (r, result); - Repeated_music * r = new Repeated_music ($4, $3 >? 1, m); - $$ = r; - r->type_ = ly_scm2string ($2); - r->fold_b_ = (r->type_ == "fold"); - r->volta_fold_b_ = (r->type_ == "volta"); r->set_spot (*$4->origin ()); + $$ = r; } ; Music_sequence: '{' Music_list '}' { - $$ = new Music_sequence (gh_car ($2)); + $$ = new Music_sequence (SCM_EOL); + $$->set_mus_property ("elements", gh_car ($2)); } ; Sequential_music: SEQUENTIAL '{' Music_list '}' { - $$ = new Sequential_music (gh_car ($3)); + $$ = new Sequential_music (SCM_EOL); + $$->set_mus_property ("elements", gh_car ($3)); } | '{' Music_list '}' { - $$ = new Sequential_music (gh_car ($2)); + $$ = new Sequential_music (SCM_EOL); + $$->set_mus_property ("elements", gh_car ($2)); } ; Simultaneous_music: SIMULTANEOUS '{' Music_list '}'{ - $$ = new Simultaneous_music (gh_car ($3)); + $$ = new Simultaneous_music (SCM_EOL); + $$->set_mus_property ("elements", gh_car ($3)); + } | '<' Music_list '>' { - $$ = new Simultaneous_music (gh_car ($2)); + $$ = new Simultaneous_music (SCM_EOL); + $$->set_mus_property ("elements", gh_car ($2)); } ; @@ -686,19 +758,20 @@ Simple_music: SCM pred = $2; if (!gh_symbol_p ($3)) { - THIS->parser_error (_("Second argument must be a symbol")); + 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")); + THIS->parser_error (_ ("First argument must be a procedure taking 1 argument")); } - Music *m = new Music; - m->set_mus_property ("predicate", pred); - m->set_mus_property ("symbol", $3); - m->set_mus_property ("value", $5); - m->set_mus_property ("type", ly_symbol2scm ("output-property")); + Music *m = new Music (SCM_EOL); + m->set_mus_property ("predicate", pred); + 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); $$ = m; } @@ -707,42 +780,78 @@ 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)); - } ; Composite_music: CONTEXT STRING Music { - Context_specced_music *csm = new Context_specced_music ($3); - - csm->translator_type_str_ = ly_scm2string ($2); - csm->translator_id_str_ = ""; + Context_specced_music *csm = new Context_specced_music (SCM_EOL); + csm->set_mus_property ("element", $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 ("")); $$ = csm; } | AUTOCHANGE STRING Music { - Auto_change_music * chm = new Auto_change_music ($3); + Music * chm = new Music_wrapper (SCM_EOL); + chm->set_mus_property ("element", $3->self_scm ()); + chm->set_mus_property ("iterator-ctor", Auto_change_iterator::constructor_cxx_function); + + scm_gc_unprotect_object ($3->self_scm ()); chm->set_mus_property ("what", $2); $$ = chm; chm->set_spot (*$3->origin ()); } | GRACE Music { - $$ = new Grace_music ($2); +#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_gc_unprotect_object ($2->self_scm ()); +#endif + + } - | CONTEXT STRING '=' STRING Music { - Context_specced_music *csm = new Context_specced_music ($5); + | CONTEXT string '=' string Music { + Context_specced_music *csm = new Context_specced_music (SCM_EOL); + csm->set_mus_property ("element", $5->self_scm ()); + scm_gc_unprotect_object ($5->self_scm ()); - csm->translator_type_str_ = ly_scm2string ($2); - csm->translator_id_str_ = ly_scm2string ($4); + csm->set_mus_property ("context-type", $2); + csm->set_mus_property ("context-id", $4); $$ = csm; } @@ -750,22 +859,52 @@ Composite_music: THIS->remember_spot (); } /* CONTINUED */ - bare_unsigned '/' bare_unsigned Music + fraction Music { - $$ = new Time_scaled_music ($3, $5, $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_gc_unprotect_object (mp->self_scm ()); + $$->set_mus_property ("numerator", gh_int2scm (n)); + $$->set_mus_property ("denominator", gh_int2scm (d)); + $$->compress (Moment (n,d)); + } | Repeated_music { $$ = $1; } | Simultaneous_music { $$ = $1; } | Sequential_music { $$ = $1; } - | TRANSPOSE musical_pitch Music { - $$ = new Transposed_music ($3, *$2); - delete $2; // ugh + | TRANSPOSE pitch Music { + $$ = new Transposed_music (SCM_EOL); + Music *p = $3; + Pitch pit = *unsmob_pitch ($2); + + p->transpose (pit); + $$->set_mus_property ("element", p->self_scm ()); + scm_gc_unprotect_object (p->self_scm ()); } | TRANSPOSE steno_tonic_pitch Music { - $$ = new Transposed_music ($3, *$2); - delete $2; // ugh + $$ = new Transposed_music (SCM_EOL); + Music *p = $3; + Pitch pit = *unsmob_pitch ($2); + + p->transpose (pit); + $$->set_mus_property ("element", p->self_scm ()); + scm_gc_unprotect_object (p->self_scm ()); + + } + | APPLY embedded_scm Music { + SCM ret = gh_call1 ($2, $3->self_scm ()); + Music *m = unsmob_music (ret); + if (!m) { + THIS->parser_error ("\\apply must return a Music"); + m = new Music (SCM_EOL); + } + $$ = m; } | NOTES { THIS->lexer_p_->push_note_state (); } @@ -777,7 +916,10 @@ Composite_music: { THIS->lexer_p_->push_chord_state (); } Music { - $$ = $3; + Music * chm = new Un_relativable_music ; + chm->set_mus_property ("element", $3->self_scm ()); + $$ = chm; + THIS->lexer_p_->pop_state (); } | LYRICS @@ -793,31 +935,51 @@ Composite_music: ; relative_music: - RELATIVE absolute_musical_pitch Music { - $$ = new Relative_octave_music ($3, *$2); - delete $2; // ugh + RELATIVE absolute_pitch Music { + Music * p = $3; + Pitch pit = *unsmob_pitch ($2); + $$ = new Relative_octave_music (SCM_EOL); + + $$->set_mus_property ("element", p->self_scm ()); + scm_gc_unprotect_object (p->self_scm ()); + + $$->set_mus_property ("last-pitch", p->to_relative_octave (pit).smobbed_copy ()); + } ; re_rhythmed_music: ADDLYRICS Music Music { - Lyric_combine_music * l = new Lyric_combine_music ($2, $3); - $$ = l; + 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_gc_unprotect_object ($3->self_scm ()); + scm_gc_unprotect_object ($2->self_scm ()); + $$ = l; } ; part_combined_music: PARTCOMBINE STRING Music Music { - Part_combine_music * p = new Part_combine_music (ly_scm2string ($2), $3, $4); + 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_gc_unprotect_object ($3->self_scm ()); + scm_gc_unprotect_object ($4->self_scm ()); + + $$ = p; } ; translator_change: TRANSLATOR STRING '=' STRING { - Music * t = new Music; - t->set_mus_property ("type", - ly_symbol2scm ("change-translator")); + Music * t = new Music (SCM_EOL); + t->set_mus_property ("iterator-ctor", + Change_iterator::constructor_cxx_function); t-> set_mus_property ("change-to-type", $2); t-> set_mus_property ("change-to-id", $4); @@ -828,41 +990,81 @@ translator_change: property_def: PROPERTY STRING '.' STRING '=' scalar { - Music *t = new Music; + + 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_gc_unprotect_object (t->self_scm ()); + + $$ = csm; + $$->set_spot (THIS->here_input ()); + + csm-> set_mus_property ("context-type", $2); + } + | PROPERTY STRING '.' STRING UNSET { + Music *t = new Music (SCM_EOL); - t->set_mus_property ("type", ly_symbol2scm ("property-set")); + t->set_mus_property ("iterator-ctor", + Property_unset_iterator::constructor_cxx_function); 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); + Context_specced_music *csm = new Context_specced_music (SCM_EOL); + csm->set_mus_property ("element", t->self_scm ()); + scm_gc_unprotect_object (t->self_scm ()); + $$ = csm; $$->set_spot (THIS->here_input ()); - csm-> translator_type_str_ = ly_scm2string ($2); + csm-> set_mus_property ("context-type", $2); } - | PROPERTY STRING '.' STRING PUSH embedded_scm '=' embedded_scm { - Music *t = new Music; - t->set_mus_property ("type", ly_symbol2scm ("property-push")); + | PROPERTY STRING '.' STRING SET embedded_scm '=' embedded_scm { + Music *t = new Music (SCM_EOL); + t->set_mus_property ("iterator-ctor", + Push_property_iterator::constructor_cxx_function); 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); + t->set_mus_property ("pop-first", SCM_BOOL_T); + t->set_mus_property ("grob-property", $6); + 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_gc_unprotect_object (t->self_scm ()); $$ = csm; $$->set_spot (THIS->here_input ()); - csm-> translator_type_str_ = ly_scm2string ($2); + csm-> set_mus_property ("context-type", $2); } - | PROPERTY STRING '.' STRING POP embedded_scm { - Music *t = new Music; - t->set_mus_property ("type", ly_symbol2scm ("property-pop")); + | PROPERTY STRING '.' STRING OVERRIDE embedded_scm '=' embedded_scm { + Music *t = new Music (SCM_EOL); + t->set_mus_property ("iterator-ctor", + Push_property_iterator::constructor_cxx_function); t->set_mus_property ("symbols", scm_string_to_symbol ($4)); - t->set_mus_property ("element-property", $6); + t->set_mus_property ("grob-property", $6); + 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_gc_unprotect_object (t->self_scm ()); - Context_specced_music *csm = new Context_specced_music (t); $$ = csm; $$->set_spot (THIS->here_input ()); - csm-> translator_type_str_ = ly_scm2string ($2); + csm-> set_mus_property ("context-type", $2); + } + | PROPERTY STRING '.' STRING REVERT embedded_scm { + Music *t = new Music (SCM_EOL); + t->set_mus_property ("iterator-ctor", + Pop_property_iterator::constructor_cxx_function); + t->set_mus_property ("symbols", scm_string_to_symbol ($4)); + t->set_mus_property ("grob-property", $6); + + Context_specced_music *csm = new Context_specced_music (SCM_EOL); + csm->set_mus_property ("element", t->self_scm ()); + scm_gc_unprotect_object (t->self_scm ()); + + $$ = csm; + $$->set_spot (THIS->here_input ()); + + csm-> set_mus_property ("context-type", $2); } ; @@ -875,12 +1077,12 @@ scalar: request_chord: pre_requests simple_element post_requests { - Music_sequence *l = dynamic_cast($2); + Music_sequence *l = dynamic_cast ($2); 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 < $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"); @@ -892,27 +1094,96 @@ request_chord: command_element: command_req { - $$ = new Request_chord (gh_cons ($1->self_scm (), SCM_EOL)); + $$ = new Request_chord (SCM_EOL); + $$->set_mus_property ("elements", gh_cons ($1->self_scm (), SCM_EOL)); $$-> set_spot (THIS->here_input ()); $1-> set_spot (THIS->here_input ()); } - | PARTIAL duration_length ';' { - Music * p = new Music; - p->set_mus_property ("symbol", ly_symbol2scm ( "measurePosition")); - p->set_mus_property ("type", ly_symbol2scm ("property-set")); + | 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_gc_unprotect_object (t->self_scm ()); + + $$ = csm; + $$->set_spot (THIS->here_input ()); + + csm->set_mus_property ("context-type", ly_str02scm ("Score")); + } + | PARTIAL duration_length { + Moment m = - unsmob_duration ($2)->length_mom (); + 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_gc_unprotect_object (p->self_scm ()); + + $$ =sp ; + sp-> set_mus_property ("context-type", ly_str02scm ( "Score")); + } + | 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)) { + Music * p = new Music (SCM_EOL); + set_music_properties (p, gh_car (s)); + l = gh_cons (p->self_scm (), l); + 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_gc_unprotect_object (seq->self_scm ()); - 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"; + sp-> set_mus_property ("context-type", ly_str02scm ("Staff")); + } + | TIME_T fraction { + Music * p1 = set_property_music (ly_symbol2scm ( "timeSignatureFraction"), $2); + + 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", 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; + +/* + TODO: should make alias TimingContext for Score +*/ + + sp-> set_mus_property ("context-type", ly_str02scm ( "Score")); } ; command_req: - shorthand_command_req - | verbose_command_req semicolon { $$ = $1; } + shorthand_command_req { $$ = $1; } + | verbose_command_req { $$ = $1; } ; shorthand_command_req: @@ -930,15 +1201,15 @@ shorthand_command_req: } | '[' { Span_req*b= new Span_req; - b->span_dir_ = START; - b->span_type_str_ = "beam"; + b->set_span_dir (START); + b->set_mus_property ("span-type", ly_str02scm ("beam")); $$ =b; } | ']' { - Span_req*b= new Span_req; - b->span_dir_ = STOP; - b->span_type_str_ = "beam"; - $$ = b; + Span_req*b= new Span_req; + b->set_span_dir ( STOP); + b->set_mus_property ("span-type", ly_str02scm ("beam")); + $$ = b; } | BREATHE { $$ = new Breathing_sign_req; @@ -947,59 +1218,45 @@ shorthand_command_req: verbose_command_req: - - BAR STRING { - $$ = new Bar_req (ly_scm2string ($2)); - } - | COMMANDSPANREQUEST bare_int STRING { + COMMANDSPANREQUEST bare_int STRING { /*TODO: junkme */ Span_req * sp_p = new Span_req; - sp_p-> span_dir_ = Direction($2); - sp_p->span_type_str_ = ly_scm2string ($3); + sp_p-> set_span_dir ( Direction ($2)); + sp_p->set_mus_property ("span-type",$3); sp_p->set_spot (THIS->here_input ()); $$ = sp_p; } - | MARK { + | MARK DEFAULT { Mark_req * m = new Mark_req; $$ = m; } - | MARK STRING { + | MARK scalar { Mark_req *m = new Mark_req; m->set_mus_property ("label", $2); $$ = m; } - | MARK bare_unsigned { - Mark_req *m = new Mark_req; - m->set_mus_property ("label", gh_int2scm ($2)); - $$ = m; - } + | PENALTY SCM_T { - | 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 bare_int { + Break_req * b = new Break_req; - b->penalty_f_ = $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; } | SKIP duration_length { Skip_req * skip_p = new Skip_req; - skip_p->duration_ = *$2; - delete $2; // ugh + skip_p->set_mus_property ("duration", $2); + $$ = skip_p; } | tempo_request { $$ = $1; } - | CLEF STRING { - $$ = new Clef_change_req (ly_scm2string ($2)); - - } - | KEY { + | KEY DEFAULT { Key_change_req *key_p= new Key_change_req; $$ = key_p; } @@ -1007,7 +1264,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 (* $2); + ((Music* )key_p)->transpose (* unsmob_pitch ($2)); $$ = key_p; } ; @@ -1033,10 +1290,10 @@ 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->articulation_str_ = ly_scm2string (s); + a->set_mus_property ("articulation-type", s); else THIS->parser_error (_ ("Expecting string as script definition")); $$ = a; } @@ -1045,7 +1302,7 @@ request_that_take_dir: request_with_dir: script_dir request_that_take_dir { if (Script_req * gs = dynamic_cast ($2)) - gs->dir_ = Direction ($1); + gs->set_direction (Direction ($1)); else if ($1) $2->origin ()->warning (_ ("Can't specify direction for this request")); $$ = $2; @@ -1058,41 +1315,47 @@ verbose_request: $$->set_spot (THIS->here_input ()); } | DYNAMICSCRIPT embedded_scm { - Dynamic_script_req *d = new Dynamic_script_req; - d->text_ = $2; + /* + TODO: junkme, use text-type == dynamic + */ + Text_script_req *d = new Text_script_req; + d->set_mus_property ("text-type" , ly_symbol2scm ("dynamic")); + d->set_mus_property ("text", $2); d->set_spot (THIS->here_input ()); $$ = d; } - | TEXTSCRIPT embedded_scm { - Text_script_req *t = new Text_script_req; - t->text_ = $2; - t->set_spot (THIS->here_input ()); - $$ = t; - } | SPANREQUEST 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_span_dir ( Direction ($2)); + sp_p->set_mus_property ("span-type", $3); sp_p->set_spot (THIS->here_input ()); $$ = sp_p; } - | tremolo_type { - Tremolo_req* a = new Tremolo_req; - a->set_spot (THIS->here_input ()); - a->type_i_ = $1; - $$ = a; - } + | tremolo_type { + Tremolo_req* a = new Tremolo_req; + a->set_spot (THIS->here_input ()); + a->set_mus_property ("tremolo-type", gh_int2scm ($1)); + $$ = a; + } | SCRIPT STRING { Articulation_req * a = new Articulation_req; - a->articulation_str_ = ly_scm2string ($2); + a->set_mus_property ("articulation-type", $2); a->set_spot (THIS->here_input ()); $$ = a; } + /* +duh, junk this syntax from the parser, if possible. + */ | ARPEGGIO { Arpeggio_req *a = new Arpeggio_req; a->set_spot (THIS->here_input ()); $$ = a; } + | GLISSANDO { + Glissando_req *g = new Glissando_req; + g->set_spot /* No pun intended */ (THIS->here_input ()); + $$ = g; + } ; sup_quotes: @@ -1113,58 +1376,73 @@ sub_quotes: } ; -steno_musical_pitch: +steno_pitch: NOTENAME_PITCH { $$ = $1; } | NOTENAME_PITCH sup_quotes { - $$ = $1; - $$->octave_i_ += $2; + Pitch p = *unsmob_pitch ($1); + p.octave_i_ += $2; + $$ = p.smobbed_copy (); } | NOTENAME_PITCH sub_quotes { - $$ = $1; - $$->octave_i_ += - $2; + Pitch p =* unsmob_pitch ($1); + + p.octave_i_ += -$2; + $$ = p.smobbed_copy (); + } ; +/* +ugh. duplication +*/ + steno_tonic_pitch: TONICNAME_PITCH { $$ = $1; } | TONICNAME_PITCH sup_quotes { - $$ = $1; - $$->octave_i_ += $2; + Pitch p = *unsmob_pitch ($1); + p.octave_i_ += $2; + $$ = p.smobbed_copy (); } | TONICNAME_PITCH sub_quotes { - $$ = $1; - $$->octave_i_ += - $2; + Pitch p =* unsmob_pitch ($1); + + p.octave_i_ += -$2; + $$ = p.smobbed_copy (); + } ; -musical_pitch: - steno_musical_pitch { +pitch: + steno_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); + | explicit_pitch { + $$ = $1; + } + ; + +explicit_pitch: + PITCH embedded_scm { + $$ = $2; + if (!unsmob_pitch ($2)) { + THIS->parser_error (_f ("Expecting musical-pitch value", 3)); + $$ = Pitch ().smobbed_copy (); } - $$ = new Musical_pitch ($2); } ; explicit_duration: DURATION embedded_scm { - $$ = new Duration; - 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")); + $$ = $2; + if (!unsmob_duration ($2)) + { + THIS->parser_error (_ ("Must have duration object")); + $$ = Duration ().smobbed_copy (); + } } ; @@ -1187,24 +1465,29 @@ hyphen_req: close_request: close_request_parens { $$ = $1; - dynamic_cast ($$)->span_dir_ = START; + dynamic_cast ($$)->set_span_dir ( START); } close_request_parens: '(' { Span_req* s= new Span_req; $$ = s; - s->span_type_str_ = "slur"; + s->set_mus_property ("span-type", ly_str02scm ( "slur")); + } + | E_OPEN { + Span_req* s= new Span_req; + $$ = s; + s->set_mus_property ("span-type", ly_str02scm ( "phrasing-slur")); } | E_SMALLER { Span_req*s =new Span_req; $$ = s; - s->span_type_str_ = "crescendo"; + s->set_mus_property ("span-type", ly_str02scm ( "crescendo")); } | E_BIGGER { Span_req*s =new Span_req; $$ = s; - s->span_type_str_ = "decrescendo"; + s->set_mus_property ("span-type", ly_str02scm ("decrescendo")); } ; @@ -1212,43 +1495,48 @@ close_request_parens: open_request: open_request_parens { $$ = $1; - dynamic_cast ($$)->span_dir_ = STOP; + dynamic_cast ($$)->set_span_dir (STOP); } ; open_request_parens: E_EXCLAMATION { Span_req *s = new Span_req; - s->span_type_str_ = "crescendo"; + s->set_mus_property ("span-type", ly_str02scm ( "crescendo")); + $$ = s; } | ')' { Span_req* s= new Span_req; $$ = s; - s->span_type_str_ = "slur"; + s->set_mus_property ("span-type", ly_str02scm ( "slur")); + } + | E_CLOSE { + Span_req* s= new Span_req; + $$ = s; + s->set_mus_property ("span-type", ly_str02scm ( "phrasing-slur")); } ; gen_text_def: embedded_scm { Text_script_req *t = new Text_script_req; - t->text_ = $1; + t->set_mus_property ("text", $1); t->set_spot (THIS->here_input ()); $$ = t; } | string { Text_script_req *t = new Text_script_req; - t->text_ = $1; + t->set_mus_property ("text", $1); t->set_spot (THIS->here_input ()); $$ = t; } | DIGIT { - /* - Maybe use Finger_script_request? - */ + String ds = to_str ($1); Text_script_req* t = new Text_script_req; - t->text_ = gh_cons (ly_symbol2scm ("finger"), - ly_str02scm (to_str ($1).ch_C ())); + + t->set_mus_property ("text", ly_str02scm (ds.ch_C ())); + t->set_mus_property ("text-type" , ly_symbol2scm ("finger")); t->set_spot (THIS->here_input ()); $$ = t; } @@ -1256,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"); } ; @@ -1291,53 +1579,84 @@ pre_requests: } ; -absolute_musical_pitch: - steno_musical_pitch { +absolute_pitch: + steno_pitch { $$ = $1; } ; duration_length: - steno_duration { + multiplied_duration { $$ = $1; } - | duration_length '*' bare_unsigned { - $$->tuplet_iso_i_ *= $3; - } - | duration_length '/' bare_unsigned { - $$->tuplet_type_i_ *= $3; - } - ; - -entered_notemode_duration: - steno_duration { - THIS->set_last_duration ($1); - } + | explicit_duration { + $$ = $1; + } ; optional_notemode_duration: { - $$ = new Duration (THIS->default_duration_); + $$ = THIS->default_duration_.smobbed_copy (); } - | entered_notemode_duration { + | multiplied_duration { $$ = $1; } + | explicit_duration { + $$ = $1; + } ; steno_duration: - bare_unsigned { - $$ = new Duration; + bare_unsigned dots { + int l = 0; if (!is_duration_b ($1)) THIS->parser_error (_f ("not a duration: %d", $1)); - else { - $$->durlog_i_ = intlog2 ($1); - } + else + l = intlog2 ($1); + + $$ = Duration (l, $2).smobbed_copy (); + + THIS->set_last_duration (unsmob_duration ($$)); } - | DURATION_IDENTIFIER { - $$ = $1->access_content_Duration (true); + | DURATION_IDENTIFIER dots { + Duration *d =unsmob_duration ($1); + Duration k (d->duration_log (),d->dot_count () + $2); + $$ = k.smobbed_copy (); + + THIS->set_last_duration (unsmob_duration ($$)); } - | steno_duration '.' { - $$->dots_i_ ++; + ; + + + + +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)); + } + ; + +dots: + /* empty */ { + $$ = 0; + } + | dots '.' { + $$ ++; } ; @@ -1355,27 +1674,30 @@ tremolo_type: simple_element: - musical_pitch exclamations questions optional_notemode_duration { + pitch exclamations questions optional_notemode_duration { if (!THIS->lexer_p_->note_state_b ()) THIS->parser_error (_ ("Have to be in Note mode for notes")); - Note_req *n = new Note_req; - n->pitch_ = *$1; - n->duration_ = *$4; + n->set_mus_property ("pitch", $1); + n->set_mus_property ("duration", $4); - n->cautionary_b_ = $3 % 2; - n->forceacc_b_ = $2 % 2 || n->cautionary_b_; + if ($3 % 2) + n->set_mus_property ("cautionary", SCM_BOOL_T); + if ($2 % 2 || $3 % 2) + 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)); + +/* +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 ()); - 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 { @@ -1383,62 +1705,58 @@ simple_element: if (ly_scm2string ($1) =="s") { /* Space */ Skip_req * skip_p = new Skip_req; - skip_p->duration_ = *$2; + skip_p->set_mus_property ("duration" ,$2); - skip_p->set_spot (THIS->here_input()); + 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()); + rest_req_p->set_mus_property ("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()); + 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 ()); + - delete $2; // ugh $$ = velt_p; } - | MEASURES optional_notemode_duration { + | MULTI_MEASURE_REST optional_notemode_duration { Skip_req * sk = new Skip_req; - sk->duration_ = *$2; - - + sk->set_mus_property ("duration", $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));; + sp1-> set_span_dir ( START); + sp2-> set_span_dir ( STOP); + SCM r = ly_str02scm ("rest"); + sp1->set_mus_property ("span-type", r); + 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)); + Request_chord * rqc2 = new Request_chord (SCM_EOL); + rqc2->set_mus_property ("elements", gh_list (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));; SCM ms = gh_list (rqc1->self_scm (), rqc2->self_scm (), rqc3->self_scm (), SCM_UNDEFINED); - $$ = new Sequential_music (ms); + $$ = 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 ->text_ = $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)); + lreq_p->set_mus_property ("text", $1); + 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)); + - delete $3; // ugh $$= velt_p; } @@ -1452,13 +1770,13 @@ simple_element: chord: steno_tonic_pitch optional_notemode_duration chord_additions chord_subtractions chord_inversion chord_bass { - $$ = get_chord (*$1, $3, $4, $5, $6, *$2); + $$ = Chord::get_chord ($1, $3, $4, $5, $6, $2); $$->set_spot (THIS->here_input ()); }; chord_additions: { - $$ = new Array; + $$ = SCM_EOL; } | CHORD_COLON chord_notes { $$ = $2; @@ -1470,14 +1788,13 @@ chord_notes: $$ = $1 } | chord_notes '.' chord_step { - $$ = $1; - $$->concat (*$3); + $$ = gh_append2 ($$, $3); } ; chord_subtractions: { - $$ = new Array; + $$ = SCM_EOL; } | CHORD_CARET chord_notes { $$ = $2; @@ -1487,58 +1804,60 @@ chord_subtractions: chord_inversion: { - $$ = 0; + $$ = SCM_EOL; } | '/' steno_tonic_pitch { $$ = $2; - $$->set_spot (THIS->here_input ()); } ; chord_bass: { - $$ = 0; + $$ = SCM_EOL; } | CHORD_BASS steno_tonic_pitch { $$ = $2; - $$->set_spot (THIS->here_input ()); } ; chord_step: chord_note { - $$ = new Array; - $$->push (*$1); + $$ = gh_cons ($1, SCM_EOL); } | CHORDMODIFIER_PITCH { - $$ = new Array; - $$->push (*$1); + $$ = gh_cons (unsmob_pitch ($1)->smobbed_copy (), SCM_EOL); } | CHORDMODIFIER_PITCH chord_note { /* Ugh. */ - $$ = new Array; - $$->push (*$1); - $$->push (*$2); + $$ = gh_list (unsmob_pitch ($1)->smobbed_copy (), + $2, SCM_UNDEFINED); } ; chord_note: bare_unsigned { - $$ = new Musical_pitch; - $$->notename_i_ = ($1 - 1) % 7; - $$->octave_i_ = $1 > 7 ? 1 : 0; - $$->accidental_i_ = 0; + Pitch m; + m.notename_i_ = ($1 - 1) % 7; + m.octave_i_ = $1 > 7 ? 1 : 0; + m.alteration_i_ = 0; + + $$ = m.smobbed_copy (); } | bare_unsigned '+' { - $$ = new Musical_pitch; - $$->notename_i_ = ($1 - 1) % 7; - $$->octave_i_ = $1 > 7 ? 1 : 0; - $$->accidental_i_ = 1; + Pitch m; + m.notename_i_ = ($1 - 1) % 7; + m.octave_i_ = $1 > 7 ? 1 : 0; + m.alteration_i_ = 1; + + + $$ = m.smobbed_copy (); } | bare_unsigned CHORD_MINUS { - $$ = new Musical_pitch; - $$->notename_i_ = ($1 - 1) % 7; - $$->octave_i_ = $1 > 7 ? 1 : 0; - $$->accidental_i_ = -1; + Pitch m; + m.notename_i_ = ($1 - 1) % 7; + m.octave_i_ = $1 > 7 ? 1 : 0; + m.alteration_i_ = -1; + + $$ = m.smobbed_copy (); } ; @@ -1546,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) @@ -1624,7 +1942,7 @@ bare_int: $$ = k; } else { - THIS->parser_error (_("need integer number arg")); + THIS->parser_error (_ ("need integer number arg")); $$ = 0; } } @@ -1642,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)); } ; @@ -1658,10 +1976,6 @@ questions: ; -semicolon: - ';' - ; - %% void @@ -1671,9 +1985,14 @@ My_lily_parser::set_yydebug (bool b) yydebug = b; #endif } + +extern My_lily_parser * current_parser; + void My_lily_parser::do_yyparse () { + + current_parser = this;; yyparse ((void*)this); }