X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=a69ba4b34507527a76eea46fbc8be179d1778670;hb=fa2334a102b9a1a195df25f3ff28ec3b16224ad4;hp=190b42ce83770d0511eda246be92e06a43a41977;hpb=2d51c5db4b6405476a7c6ce560b5fff6e3eb2961;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 190b42ce83..1c39e1c060 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1,403 +1,436 @@ -%{ // -*-Fundamental-*- - /* - parser.yy -- Bison/C++ parser for lilypond + parser.yy -- Bison/C++ parser for LilyPond source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys - Jan Nieuwenhuizen + (c) 1997--2006 Han-Wen Nienhuys + Jan Nieuwenhuizen */ -/* - Four shift/reduce problems: +%{ + +#define YYERROR_VERBOSE 1 +#define YYPARSE_PARAM my_lily_parser +#define YYLEX_PARAM my_lily_parser +#define PARSER ((Lily_parser *) my_lily_parser) -1. foo = bar. +#define yyerror PARSER->parser_error - "bar" -> String -> Lyric -> Music -> music-assignment +/* We use custom location type: Input objects */ +#define YYLTYPE Input +#define YYLLOC_DEFAULT(Current,Rhs,N) \ + ((Current).set_location ((Rhs)[1], (Rhs)[N])) - "bar" -> String -> string-assignment +%} + +/* We use SCMs to do strings, because it saves us the trouble of +deleting them. Let's hope that a stack overflow doesnt trigger a move +of the parse stack onto the heap. */ -Similar problem for +%left PREC_TOP +%left ADDLYRICS +%left PREC_BOT - * \markup identifier. - * \markup { } +%expect 1 +/* One shift/reduce problem -2. \repeat +1. \repeat \repeat .. \alternative - \repeat { \repeat .. \alternative } or \repeat { \repeat } \alternative +*/ -) ---hwn +%pure_parser +%locations - */ -/* -TODO: +%{ // -*-Fundamental-*- -* The rules for who is protecting what are very shady. Uniformise - this. +/* +FIXME: -* There are too many lexical modes? + * The rules for who is protecting what are very shady. Uniformise + this. + * There are too many lexical modes? */ -#include -#include -#include +#include "config.hh" +#include +#include +#include +using namespace std; -#include "scm-option.hh" +#include "book.hh" #include "context-def.hh" -#include "lily-guile.hh" -#include "misc.hh" -#include "my-lily-lexer.hh" -#include "paper-def.hh" -#include "midi-def.hh" -#include "main.hh" -#include "file-path.hh" -#include "warn.hh" #include "dimensions.hh" -#include "my-lily-parser.hh" -#include "score.hh" -#include "input-file-results.hh" +#include "file-path.hh" +#include "input-smob.hh" #include "input.hh" +#include "international.hh" +#include "lily-guile.hh" +#include "lily-lexer.hh" +#include "lily-parser.hh" #include "lilypond-input-version.hh" -#include "scm-hash.hh" -#include "ly-module.hh" -#include "music-sequence.hh" -#include "input-smob.hh" -#include "event.hh" -#include "text-item.hh" -#include "music-list.hh" +#include "main.hh" +#include "misc.hh" +#include "music.hh" +#include "music.hh" +#include "output-def.hh" #include "paper-book.hh" +#include "program-option.hh" +#include "scm-hash.hh" +#include "score.hh" +#include "text-interface.hh" +#include "warn.hh" -#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x)) - -Music *property_op_to_music (SCM op); -Music *context_spec_music (SCM type, SCM id, Music * m, SCM ops_); -SCM get_next_unique_context (); - -#define YYERROR_VERBOSE 1 - -My_lily_parser* my_lily_parser; -#define YYPARSE_PARAM my_lily_parser -#define YYLEX_PARAM my_lily_parser -#define THIS\ - ((My_lily_parser *) my_lily_parser) - -#define yyerror THIS->parser_error - -/* - Add symbols to the TAGS field of a music object. -*/ - -void -tag_music (Music*m, SCM tag, Input ip) -{ - SCM tags = m->get_property ("tags"); - if (gh_symbol_p (tag)) - tags = scm_cons (tag, tags); - else if (gh_list_p (tag)) - tags = gh_append2 (tag, tags); - else - ip.warning (_("Tag must be symbol or list of symbols.")); - - m->set_property ("tags", tags); -} - - - -bool -is_regular_identifier (SCM id) -{ - String str = ly_scm2string (id); - char const *s = str.to_str0 () ; - - bool v = true; - while (*s && v) - { - v = v && isalpha (*s); - s++; - } - return v; -} - -SCM -make_simple_markup (SCM a) -{ - static SCM simple; - if (!simple) - simple = scm_c_eval_string ("simple-markup"); - - return scm_list_2 (simple, a); -} - - -bool -is_is_duration (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 = ly_cdr (k)) - { - p->internal_set_property (ly_caar (k), ly_cdar (k)); - } -} +%} -SCM -make_chord_step (int step, int alter) -{ - if (step == 7) - alter += FLAT; - while(step < 0) - step += 7; - Pitch m((step -1) / 7 , (step - 1) % 7, alter); - return m.smobbed_copy (); +%union { + Book *book; + Output_def *outputdef; + SCM scm; + std::string *string; + Music *music; + Score *score; + int i; } +%{ -SCM -make_chord (SCM pitch, SCM dur, SCM modification_list) -{ - static SCM chord_ctor; - if (!chord_ctor) - chord_ctor= scm_c_eval_string ("construct-chord"); - SCM ch= scm_call_3 (chord_ctor, pitch, dur, modification_list); - scm_gc_protect_object (ch); - return ch; -} +#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x)) -/* - Todo: actually also use apply iso. call too ... +/* ES TODO: +- Don't use lily module, create a new module instead. +- delay application of the function */ -bool -ly_input_procedure_p (SCM x) -{ - return gh_procedure_p (x) - || (gh_pair_p (x) && gh_procedure_p (gh_car (x))); -} - -Music* -set_property_music (SCM sym, SCM value) -{ - Music * p = MY_MAKE_MUSIC ("PropertySet"); - p->set_property ("symbol", sym); - p->set_property ("value", value); - return p; -} - -%} - -/* We use SCMs to do strings, because it saves us the trouble of -deleting them. Let's hope that a stack overflow doesnt trigger a move -of the parse stack onto the heap. */ +#define LOWLEVEL_MAKE_SYNTAX(proc, args) \ + scm_apply_0 (proc, args) +/* Syntactic Sugar. */ +#define MAKE_SYNTAX(name, location, ...) \ + LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (PARSER->self_scm (), make_input (location), __VA_ARGS__, SCM_UNDEFINED)); + +SCM get_next_unique_context_id (); +SCM get_next_unique_lyrics_context_id (); + +#undef _ +#if !HAVE_GETTEXT +#define _(x) x +#else +#include +#define _(x) gettext (x) +#endif -%union { - String * string; - Music *music; - Score *score; - Music_output_def * outputdef; - SCM scm; - int i; -} -%{ - -int -yylex (YYSTYPE *s, void * v) -{ - My_lily_parser *pars = (My_lily_parser*) v; - My_lily_lexer * lex = pars->lexer_; - - lex->lexval = (void*) s; - lex->prepare_for_next_token (); - return lex->yylex (); -} +SCM make_music_relative (Pitch start, SCM music); +SCM run_music_function (Lily_parser *, SCM expr); +SCM get_first_context_id (SCM type, Music *m); +SCM make_chord_elements (SCM pitch, SCM dur, SCM modification_list); +SCM make_chord_step (int step, int alter); +SCM make_simple_markup (SCM a); +bool is_duration (int t); +bool is_regular_identifier (SCM id); +bool ly_input_procedure_p (SCM x); +int yylex (YYSTYPE *s, YYLTYPE *loc, void *v); +void set_music_properties (Music *p, SCM a); %} -%pure_parser +/* The third option is an alias that will be used to display the + syntax error. Bison CVS now correctly handles backslash escapes. + + FIXME: Bison needs to translate some of these, eg, STRING. + +*/ + +/* Keyword tokens with plain escaped name. */ +%token ACCEPTS "\\accepts" +%token ADDLYRICS "\\addlyrics" +%token ADDQUOTE "\\addquote" +%token ALIAS "\\alias" +%token ALTERNATIVE "\\alternative" +%token BOOK "\book" +%token CHANGE "\\change" +%token CHORDMODE "\\chordmode" +%token CHORDS "\\chords" +%token CONSISTS "\\consists" +%token CONTEXT "\\context" +%token DEFAULT "\\default" +%token DEFAULTCHILD "\\defaultchild" +%token DENIES "\\denies" +%token DESCRIPTION "\\description" +%token DRUMMODE "\\drummode" +%token DRUMS "\\drums" +%token FIGUREMODE "\\figuremode" +%token FIGURES "\\figures" +%token GROBDESCRIPTIONS "\\grobdescriptions" +%token HEADER "\\header" +%token INVALID "\\invalid" +%token KEY "\\key" +%token LAYOUT "\\layout" +%token LYRICMODE "\\lyricmode" +%token LYRICS "\\lyrics" +%token LYRICSTO "\\lyricsto" +%token MARK "\\mark" +%token MARKUP "\\markup" +%token MIDI "\\midi" +%token NAME "\\name" +%token NOTEMODE "\\notemode" +%token OBJECTID "\\objectid" +%token OCTAVE "\\octave" +%token ONCE "\\once" +%token OVERRIDE "\\override" +%token PAPER "\\paper" +%token PARTIAL "\\partial" +%token RELATIVE "\\relative" +%token REMOVE "\\remove" +%token REPEAT "\\repeat" +%token REST "\\rest" +%token REVERT "\\revert" +%token SCORE "\\score" +%token SEQUENTIAL "\\sequential" +%token SET "\\set" +%token SIMULTANEOUS "\\simultaneous" +%token SKIP "\\skip" +%token TEMPO "\\tempo" +%token TIMES "\\times" +%token TRANSPOSE "\\transpose" +%token TRANSPOSITION "\\transposition" +%token TYPE "\\type" +%token UNSET "\\unset" +%token WITH "\\with" + +/* Keyword token exceptions. */ +%token TIME_T "\\time" +%token NEWCONTEXT "\\new" + + +/* Other string tokens. */ + +%token CHORD_BASS "/+" +%token CHORD_CARET "^" +%token CHORD_COLON ":" +%token CHORD_MINUS "-" +%token CHORD_SLASH "/" +%token DOUBLE_ANGLE_CLOSE ">>" +%token DOUBLE_ANGLE_OPEN "<<" +%token E_BACKSLASH "\\" +%token E_ANGLE_CLOSE "\\>" +%token E_CHAR "\\C[haracter]" +%token E_CLOSE "\\)" +%token E_EXCLAMATION "\\!" +%token E_BRACKET_OPEN "\\[" +%token E_OPEN "\\(" +%token E_BRACKET_CLOSE "\\]" +%token E_ANGLE_OPEN "\\<" +%token E_PLUS "\\+" +%token E_TILDE "\\~" +%token EXTENDER "__" +/* +If we give names, Bison complains. +*/ +%token FIGURE_CLOSE /* "\\>" */ +%token FIGURE_OPEN /* "\\<" */ +%token FIGURE_SPACE "_" +%token HYPHEN "--" -%token ACCEPTS -%token ADDLYRICS -%token ADDQUOTE -%token NEWADDLYRICS -%token ALIAS -%token ALTERNATIVE -%token APPLY -%token APPLYCONTEXT -%token APPLYOUTPUT -%token AUTOCHANGE -%token BAR -%token BREATHE -%token CHANGE -%token CHORDMODIFIERS -%token CHORDS -%token LESSLESS -%token MOREMORE -%token CLEF -%token COMMANDSPANREQUEST -%token CONSISTS -%token CONSISTSEND -%token CONTEXT -%token DEFAULT -%token DENIES -%token DESCRIPTION -%token EXTENDER -%token FIGURES FIGURE_OPEN FIGURE_CLOSE -%token FIGURE_BRACKET_CLOSE FIGURE_BRACKET_OPEN -%token GRACE -%token ACCIACCATURA -%token APPOGGIATURA -%token GROBDESCRIPTIONS -%token HEADER -%token HYPHEN -%token INVALID -%token KEY -%token LYRICS -%token MARK -%token MIDI +%token CHORDMODIFIERS +%token LYRIC_MARKUP %token MULTI_MEASURE_REST -%token NAME -%token NEWCONTEXT -%token NOTES -%token OCTAVE -%token ONCE -%token OVERRIDE SET REVERT -%token PAPER -%token PARTCOMBINE -%token PARTIAL -%token QUOTE -%token RELATIVE -%token REMOVE -%token REPEAT -%token REST %token SCM_T -%token SCORE -%token SEQUENTIAL -%token SIMULTANEOUS -%token SKIP -%token SPANREQUEST -%token TAG -%token TEMPO -%token TIMES -%token TIME_T -%token TRANSPOSE -%token TRANSPOSITION -%token TYPE -%token UNSET -%token WITH - -/* escaped */ -%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE -%token E_LEFTSQUARE E_RIGHTSQUARE E_TILDE -%token E_BACKSLASH + + +%token DIGIT %token E_UNSIGNED -%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET CHORD_SLASH -%token FIGURE_SPACE - -%type exclamations questions dots optional_rest -%type bass_mod -%type grace_head -%type oct_check -%type context_mod_list -%type lyric_element -%type bass_number br_bass_figure bass_figure figure_list figure_spec -%token DIGIT -%token NOTENAME_PITCH -%token TONICNAME_PITCH -%token CHORDMODIFIER_PITCH -%token DURATION_IDENTIFIER -%token FRACTION -%token IDENTIFIER -%token DRUMS -%token DRUM_PITCH -%token CHORD_MODIFIER -%token SCORE_IDENTIFIER -%token MUSIC_OUTPUT_DEF_IDENTIFIER -%token NUMBER_IDENTIFIER -%token EVENT_IDENTIFIER -%token MUSIC_IDENTIFIER CONTEXT_DEF_IDENTIFIER -%token STRING_IDENTIFIER SCM_IDENTIFIER -%token RESTNAME -%token STRING -%token SCM_T -%token UNSIGNED -%token REAL - -%token MARKUP -%token MARKUP_HEAD_MARKUP0 +%token UNSIGNED + +%token BOOK_IDENTIFIER +%token CHORDMODIFIER_PITCH +%token CHORD_MODIFIER +%token CONTEXT_DEF_IDENTIFIER +%token DRUM_PITCH +%token DURATION_IDENTIFIER +%token EVENT_IDENTIFIER +%token FRACTION +%token LYRICS_STRING +%token LYRIC_MARKUP_IDENTIFIER %token MARKUP_HEAD_EMPTY +%token MARKUP_HEAD_LIST0 +%token MARKUP_HEAD_MARKUP0 %token MARKUP_HEAD_MARKUP0_MARKUP1 %token MARKUP_HEAD_SCM0 %token MARKUP_HEAD_SCM0_MARKUP1 -%token MARKUP_HEAD_SCM0_SCM1 -%token MARKUP_HEAD_SCM0_SCM1_SCM2 +%token MARKUP_HEAD_SCM0_SCM1 %token MARKUP_HEAD_SCM0_SCM1_MARKUP2 - -%token MARKUP_IDENTIFIER MARKUP_HEAD_LIST0 -%type markup markup_line markup_list markup_list_body full_markup - +%token MARKUP_HEAD_SCM0_SCM1_SCM2 +%token MARKUP_IDENTIFIER +%token MUSIC_FUNCTION +%token MUSIC_FUNCTION_MARKUP +%token MUSIC_FUNCTION_MARKUP_MARKUP +%token MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC +%token MUSIC_FUNCTION_MARKUP_MUSIC +%token MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC +%token MUSIC_FUNCTION_MUSIC +%token MUSIC_FUNCTION_MUSIC_MUSIC +%token MUSIC_FUNCTION_SCM +%token MUSIC_FUNCTION_SCM_MUSIC +%token MUSIC_FUNCTION_SCM_MUSIC_MUSIC +%token MUSIC_FUNCTION_SCM_SCM_MUSIC_MUSIC +%token MUSIC_FUNCTION_SCM_SCM +%token MUSIC_FUNCTION_SCM_SCM_MUSIC +%token MUSIC_FUNCTION_SCM_SCM_SCM +%token MUSIC_FUNCTION_SCM_SCM_SCM_MUSIC +%token MUSIC_FUNCTION_SCM_SCM_SCM_SCM_MUSIC +%token MUSIC_IDENTIFIER +%token NOTENAME_PITCH +%token NUMBER_IDENTIFIER +%token OUTPUT_DEF_IDENTIFIER +%token REAL +%token RESTNAME +%token SCM_IDENTIFIER +%token SCM_T +%token SCORE_IDENTIFIER +%token STRING +%token STRING_IDENTIFIER +%token TONICNAME_PITCH + + +%type book_block +%type book_body + +%type bare_unsigned +%type figured_bass_alteration +%type dots +%type exclamations +%type optional_rest +%type questions +%type script_dir +%type sub_quotes +%type sup_quotes +%type tremolo_type + +/* Music */ +%type composite_music +%type grouped_music_list +%type music +%type prefix_composite_music +%type repeated_music +%type sequential_music +%type simple_music +%type simultaneous_music +%type chord_body +%type chord_body_element +%type command_element +%type command_event +%type context_change +%type direction_less_event +%type direction_reqd_event +%type event_chord +%type gen_text_def +%type music_property_def +%type note_chord_element +%type post_event +%type re_rhythmed_music +%type relative_music +%type simple_element +%type simple_music_property_def +%type string_number_event +%type tempo_event +%type toplevel_music + +%type output_def_body +%type output_def_head +%type output_def_head_with_mode_switch %type output_def -%type lilypond_header lilypond_header_body -%type open_event close_event -%type sub_quotes sup_quotes -%type simple_element event_chord command_element Simple_music Composite_music -%type Repeated_music -%type Alternative_music -%type tremolo_type -%type bare_int bare_unsigned -%type script_dir -%type identifier_init - -%type note_chord_element chord_body chord_body_element -%type chord_body_elements -%type steno_duration optional_notemode_duration multiplied_duration - -%type post_events -%type gen_text_def direction_less_event direction_reqd_event -%type steno_pitch pitch absolute_pitch pitch_also_in_chords -%type steno_tonic_pitch -%type duration_length fraction - -%type new_chord step_number chord_items chord_item chord_separator step_numbers - -%type embedded_scm scalar -%type Music Sequential_music Simultaneous_music -%type relative_music re_rhythmed_music -%type music_property_def context_change -%type context_prop_spec -%type Music_list -%type property_operation context_mod context_def_mod optional_context_mod -%type music_output_def_body music_output_def_head -%type post_event tagged_post_event -%type command_req -%type string_number_event -%type string bare_number number_expression number_term number_factor -%type score_block score_body - -%type context_def_spec_block context_def_spec_body -%type tempo_event -%type script_abbreviation - +%type paper_block + +%type alternative_music +%type generic_prefix_music_scm +%type music_list +%type absolute_pitch +%type assignment_id +%type bare_number +%type music_function_event +%type music_function_chord_body +%type music_function_musicless_prefix +%type bass_figure +%type figured_bass_modification +%type br_bass_figure +%type bass_number +%type chord_body_elements +%type chord_item +%type chord_items +%type chord_separator +%type context_def_mod +%type context_def_spec_block +%type context_def_spec_body +%type context_mod +%type context_mod_list +%type context_prop_spec +%type direction_less_char +%type duration_length +%type embedded_scm +%type figure_list +%type figure_spec +%type fraction +%type full_markup +%type identifier_init +%type lilypond_header +%type lilypond_header_body +%type lyric_element +%type lyric_markup +%type markup +%type markup_braced_list +%type markup_braced_list_body +%type markup_composed_list +%type markup_head_1_item +%type markup_head_1_list +%type markup_list +%type markup_top +%type mode_changing_head +%type mode_changing_head_with_context +%type multiplied_duration +%type new_chord +%type new_lyrics +%type number_expression +%type number_factor +%type number_term +%type object_id_setting +%type octave_check +%type optional_context_mod +%type optional_id +%type optional_notemode_duration +%type pitch +%type pitch_also_in_chords +%type post_events +%type property_operation +%type scalar +%type script_abbreviation +%type simple_chord_elements +%type simple_markup +%type simple_string +%type steno_duration +%type steno_pitch +%type steno_tonic_pitch +%type step_number +%type step_numbers +%type string +%type function_scm_argument + +%type score_block +%type score_body %left '-' '+' @@ -410,111 +443,112 @@ prec levels in different prods */ %% lilypond: /* empty */ - | lilypond toplevel_expression {} - | lilypond assignment { } + | lilypond toplevel_expression { + } + | lilypond assignment { + } | lilypond error { - THIS->error_level_ = 1; + PARSER->error_level_ = 1; } | lilypond INVALID { - THIS->error_level_ = 1; + PARSER->error_level_ = 1; } ; + +object_id_setting: + OBJECTID STRING { $$ = $2; } + ; + toplevel_expression: lilypond_header { - THIS->input_file_->header_ = $1; + PARSER->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1); } - | add_quote { + | book_block { + Book *book = $1; + SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-book-handler"); + scm_call_2 (proc, PARSER->self_scm (), book->self_scm ()); + book->unprotect (); } | score_block { - Score * sc = $1; - - SCM head = ly_module_p (sc->header_) ? sc->header_ : THIS->input_file_->header_.to_SCM (); - - Path p = split_path (THIS->output_basename_); - int *c = &THIS->input_file_->score_count_; - if (*c) - { - p.base += "-" + to_string (*c); - } - - (*c)++; - SCM outname = scm_makfrom0str (p.to_string ().to_str0()); - - for (int i=0; i < sc->defs_.size (); i++) - default_rendering (sc->music_, sc->defs_[i]->self_scm (), head, outname); - - if (sc->defs_.is_empty ()) - { - Music_output_def *id = - unsmob_music_output_def (THIS->lexer_->lookup_identifier - ("$defaultpaper")); - - id = id ? id->clone () : new Paper_def; - - default_rendering (sc->music_, id->self_scm (), head, outname); - - scm_gc_unprotect_object (id->self_scm ()); - } - scm_gc_unprotect_object (sc->self_scm ()); + Score *score = $1; + + SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-score-handler"); + scm_call_2 (proc, PARSER->self_scm (), score->self_scm ()); + score->unprotect (); + } + | toplevel_music { + Music *music = unsmob_music ($1); + SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-music-handler"); + scm_call_2 (proc, PARSER->self_scm (), music->self_scm ()); + } + | full_markup { + SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-text-handler"); + scm_call_2 (proc, PARSER->self_scm (), $1); } | output_def { SCM id = SCM_EOL; - if (dynamic_cast ($1)) - id = scm_makfrom0str ("$defaultpaper"); - else if (dynamic_cast ($1)) - id = scm_makfrom0str ("$defaultmidi"); - THIS->lexer_->set_identifier (id, $1->self_scm ()); - scm_gc_unprotect_object ($1->self_scm ()); + Output_def * od = $1; + + if ($1->c_variable ("is-paper") == SCM_BOOL_T) + id = ly_symbol2scm ("$defaultpaper"); + else if ($1->c_variable ("is-midi") == SCM_BOOL_T) + id = ly_symbol2scm ("$defaultmidi"); + else if ($1->c_variable ("is-layout") == SCM_BOOL_T) + id = ly_symbol2scm ("$defaultlayout"); + + PARSER->lexer_->set_identifier (id, od->self_scm ()); + od->unprotect(); } ; +toplevel_music: + composite_music { + } + ; embedded_scm: SCM_T - | SCM_IDENTIFIER + | SCM_IDENTIFIER ; - - lilypond_header_body: { - $$ = ly_make_anonymous_module (); - THIS->lexer_->add_scope ($$); + $$ = get_header(PARSER); + PARSER->lexer_->add_scope ($$); } - | lilypond_header_body assignment { + | lilypond_header_body assignment { } ; lilypond_header: HEADER '{' lilypond_header_body '}' { - $$ = THIS->lexer_->remove_scope (); + $$ = PARSER->lexer_->remove_scope (); } ; - /* DECLARATIONS */ -assignment: - STRING { - THIS->push_spot (); - } - /* cont */ '=' identifier_init { - - /* - Should find generic way of associating input with objects. - */ - Input ip = THIS->pop_spot (); +assignment_id: + STRING { $$ = $1; } + | LYRICS_STRING { $$ = $1; } + ; +assignment: + assignment_id '=' identifier_init { if (! is_regular_identifier ($1)) { - ip.warning (_ ("Identifier should have alphabetic characters only")); +#if 0 + /* no longer valid with dashes in \paper{} block. */ + @1.warning (_ ("identifier should have alphabetic characters only")); +#endif } - THIS->lexer_->set_identifier ($1, $4); + + PARSER->lexer_->set_identifier ($1, $3); /* TODO: devise standard for protection in parser. @@ -531,35 +565,40 @@ all objects can be unprotected as soon as they're here. identifier_init: score_block { $$ = $1->self_scm (); - scm_gc_unprotect_object ($$); + $1->unprotect (); } - | full_markup { - $$ = $1; + | book_block { + $$ = $1->self_scm (); + $1->unprotect (); } | output_def { $$ = $1->self_scm (); - scm_gc_unprotect_object ($$); + $1->unprotect (); } | context_def_spec_block { $$ = $1; } - | Music { - $$ = $1->self_scm (); - scm_gc_unprotect_object ($$); + | music { + $$ = $1; } | post_event { - $$ = $1->self_scm (); - scm_gc_unprotect_object ($$); + $$ = $1; } | number_expression { - $$ = $1; + $$ = $1; } | string { $$ = $1; } - | embedded_scm { + | embedded_scm { $$ = $1; } + | full_markup { + $$ = $1; + } + | DIGIT { + $$ = scm_from_int ($1); + } ; context_def_spec_block: @@ -572,21 +611,21 @@ context_def_spec_block: context_def_spec_body: /**/ { $$ = Context_def::make_scm (); - unsmob_context_def ($$)->set_spot (THIS->here_input ()); + unsmob_context_def ($$)->set_spot (@$); } - | CONTEXT_DEF_IDENTIFIER { + | CONTEXT_DEF_IDENTIFIER { $$ = $1; - unsmob_context_def ($$)->set_spot (THIS->here_input ()); + unsmob_context_def ($$)->set_spot (@$); } | context_def_spec_body GROBDESCRIPTIONS embedded_scm { Context_def*td = unsmob_context_def ($$); - for (SCM p = $3; gh_pair_p (p); p = ly_cdr (p)) { - SCM tag = gh_caar (p); + for (SCM p = $3; scm_is_pair (p); p = scm_cdr (p)) { + SCM tag = scm_caar (p); /* TODO: should make new tag "grob-definition" ? */ td->add_context_mod (scm_list_3 (ly_symbol2scm ("assign"), - tag, gh_cons (ly_cdar (p), SCM_EOL))); + tag, scm_cons (scm_cdar (p), SCM_EOL))); } } | context_def_spec_body context_mod { @@ -594,131 +633,188 @@ context_def_spec_body: } ; -/* - SCORE -*/ -score_block: - SCORE { - THIS->push_spot (); + + +book_block: + BOOK '{' book_body '}' { + $$ = $3; } - /*cont*/ '{' score_body '}' { - THIS->pop_spot (); - $$ = $4; + ; +/* FIXME: + * Use 'handlers' like for toplevel-* stuff? + * grok \layout and \midi? */ +book_body: + { + $$ = new Book; + $$->set_spot (@$); + $$->paper_ = dynamic_cast (unsmob_output_def (PARSER->lexer_->lookup_identifier ("$defaultpaper"))->clone ()); + $$->paper_->unprotect (); + $$->header_ = PARSER->lexer_->lookup_identifier ("$defaultheader"); + } + | BOOK_IDENTIFIER { + $$ = unsmob_book ($1); + $$->set_spot (@$); + } + | book_body paper_block { + $$->paper_ = $2; + $2->unprotect (); + } + | book_body score_block { + SCM s = $2->self_scm (); + $$->add_score (s); + $2->unprotect(); + } + | book_body full_markup { + $$->add_score ($2); + } + | book_body lilypond_header { + $$->header_ = $2; + } + | book_body error { + $$->paper_ = 0; + $$->scores_ = SCM_EOL; + } + | book_body object_id_setting { + $$->user_key_ = ly_scm2string ($2); } ; -score_body: - Music { - $$ = new Score; - - $$->set_spot (THIS->here_input ()); - SCM m = $1->self_scm (); - scm_gc_unprotect_object (m); +score_block: + SCORE '{' score_body '}' { + $$ = $3; + } + ; - /* - guh. - */ - SCM check_funcs = scm_c_eval_string ("toplevel-music-functions"); - for (; gh_pair_p (check_funcs); check_funcs = gh_cdr (check_funcs)) - m = gh_call1 (gh_car (check_funcs), m); - $$->music_ = m; +score_body: + music { + SCM m = $1; + SCM scorify = ly_lily_module_constant ("scorify-music"); + SCM score = scm_call_2 (scorify, m, PARSER->self_scm ()); + // pass ownernship to C++ again. + $$ = unsmob_score (score); + $$->protect (); + $$->set_spot (@$); } | SCORE_IDENTIFIER { - $$ = new Score ( *unsmob_score ($1)); - $$->set_spot (THIS->here_input ()); + $$ = unsmob_score ($1); + $$->set_spot (@$); + } + | score_body object_id_setting { + $$->user_key_ = ly_scm2string ($2); } | score_body lilypond_header { $$->header_ = $2; } | score_body output_def { - $$->defs_.push ($2); - scm_gc_unprotect_object ($2->self_scm ()); + if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T) + { + PARSER->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead")); + + } + else + { + $$->add_output_def ($2); + } + $2->unprotect (); } | score_body error { - + $$->error_found_ = true; } ; /* - MIDI + OUTPUT DEF */ -output_def: - music_output_def_body '}' { + +paper_block: + output_def { $$ = $1; - THIS-> lexer_-> remove_scope (); + if ($$->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T) + { + PARSER->parser_error (@1, _ ("need \\paper for paper block")); + $$ = get_paper (PARSER); + } } ; -music_output_def_head: - MIDI { - Music_output_def *id = unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultmidi")); +output_def: + output_def_body '}' { + $$ = $1; - Midi_def* p =0; - if (id) - p = dynamic_cast (id->clone ()); - else - p = new Midi_def; + PARSER->lexer_->remove_scope (); + PARSER->lexer_->pop_state (); + } + ; +output_def_head: + PAPER { + $$ = get_paper (PARSER); + $$->input_origin_ = @$; + PARSER->lexer_->add_scope ($$->scope_); + } + | MIDI { + Output_def *p = get_midi (PARSER); $$ = p; - THIS->lexer_->add_scope (p->scope_); + PARSER->lexer_->add_scope (p->scope_); } - | PAPER { - Music_output_def *id = unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper")); - Paper_def *p = 0; - if (id) - p = dynamic_cast (id->clone ()); - else - p = new Paper_def; + | LAYOUT { + Output_def *p = get_layout (PARSER); - THIS->lexer_->add_scope (p->scope_); + PARSER->lexer_->add_scope (p->scope_); $$ = p; } ; +output_def_head_with_mode_switch: + output_def_head { + PARSER->lexer_->push_initial_state (); + $$ = $1; + } + ; -music_output_def_body: - music_output_def_head '{' { - +output_def_body: + output_def_head_with_mode_switch '{' { + $$ = $1; + $$->input_origin_.set_spot (@$); } - | music_output_def_head '{' MUSIC_OUTPUT_DEF_IDENTIFIER { - scm_gc_unprotect_object ($1->self_scm ()); - Music_output_def * o = unsmob_music_output_def ($3); + | output_def_head_with_mode_switch '{' OUTPUT_DEF_IDENTIFIER { + $1->unprotect (); + Output_def *o = unsmob_output_def ($3); + o->input_origin_.set_spot (@$); $$ = o; - THIS->lexer_->remove_scope (); - THIS->lexer_->add_scope (o->scope_); + PARSER->lexer_->remove_scope (); + PARSER->lexer_->add_scope (o->scope_); } - | music_output_def_body assignment { + | output_def_body assignment { } - | music_output_def_body context_def_spec_block { - $$->assign_context_def ($2); + | output_def_body context_def_spec_block { + assign_context_def ($$, $2); } - | music_output_def_body tempo_event { + | output_def_body tempo_event { /* junk this ? there already is tempo stuff in music. */ - int m = gh_scm2int ( $2->get_property ("metronome-count")); - Duration *d = unsmob_duration ($2->get_property ("tempo-unit")); - Midi_def * md = dynamic_cast ($$); - if (md) - md->set_tempo (d->get_length (), m); - scm_gc_unprotect_object ($2->self_scm ()); + int m = scm_to_int (unsmob_music($2)->get_property ("metronome-count")); + Duration *d = unsmob_duration (unsmob_music($2)->get_property ("tempo-unit")); + set_tempo ($$, d->get_length (), m); } - | music_output_def_body error { + | output_def_body error { } ; tempo_event: TEMPO steno_duration '=' bare_unsigned { - $$ = MY_MAKE_MUSIC ("MetronomeChangeEvent"); - $$->set_property ("tempo-unit", $2); - $$->set_property ("metronome-count", gh_int2scm ( $4)); + Music *m = MY_MAKE_MUSIC ("MetronomeChangeEvent"); + m->set_property ("tempo-unit", $2); + m->set_property ("metronome-count", scm_from_int ( $4)); + $$ = m->unprotect (); } ; @@ -727,434 +823,349 @@ The representation of a list is the (LIST . LAST-CONS) - to have efficient append. -*/ -Music_list: + to have efficient append. */ + +music_list: /* empty */ { $$ = scm_cons (SCM_EOL, SCM_EOL); } - | Music_list Music { + | music_list music { SCM s = $$; - SCM c = scm_cons ($2->self_scm (), SCM_EOL); - scm_gc_unprotect_object ($2->self_scm ()); /* UGH */ - if (gh_pair_p (ly_cdr (s))) - gh_set_cdr_x (ly_cdr (s), c); /* append */ + SCM c = scm_cons ($2, SCM_EOL); + + if (scm_is_pair (scm_cdr (s))) + scm_set_cdr_x (scm_cdr (s), c); /* append */ else - gh_set_car_x (s, c); /* set first cons */ - gh_set_cdr_x (s, c) ; /* remember last cell */ + scm_set_car_x (s, c); /* set first cons */ + scm_set_cdr_x (s, c); /* remember last cell */ } - | Music_list error { + | music_list embedded_scm { + } - ; + | music_list error { + Music *m = MY_MAKE_MUSIC("Music"); + // ugh. code dup + m->set_property ("error-found", SCM_BOOL_T); + SCM s = $$; + SCM c = scm_cons (m->self_scm (), SCM_EOL); + m->unprotect (); /* UGH */ + if (scm_is_pair (scm_cdr (s))) + scm_set_cdr_x (scm_cdr (s), c); /* append */ + else + scm_set_car_x (s, c); /* set first cons */ + scm_set_cdr_x (s, c); /* remember last cell */ + } + ; -Music: - Simple_music - | Composite_music +music: + simple_music + | composite_music ; -Alternative_music: +alternative_music: /* empty */ { $$ = SCM_EOL; } - | ALTERNATIVE '{' Music_list '}' { - $$ = $3; + | ALTERNATIVE '{' music_list '}' { + $$ = scm_car ($3); } ; -Repeated_music: - REPEAT string bare_unsigned Music Alternative_music - { - 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); - } - - static SCM proc; - if (!proc) - proc = scm_c_eval_string ("make-repeated-music"); - - SCM mus = scm_call_1 (proc, $2); - scm_gc_protect_object (mus); // UGH. - Music *r =unsmob_music (mus); - if (beg) - { - r-> set_property ("element", beg->self_scm ()); - scm_gc_unprotect_object (beg->self_scm ()); - } - r->set_property ("repeat-count", gh_int2scm (times >? 1)); - - r-> set_property ("elements",alts); - if (gh_equal_p ($2, scm_makfrom0str ("tremolo"))) { - /* - we can not get durations and other stuff correct down the line, so we have to - add to the duration log here. - */ - static SCM func; - - if (!func) - func = scm_primitive_eval (ly_symbol2scm ("shift-duration-log")); - - int dots = ($3 % 3) ? 0 : 1; - int shift = -intlog2 ((dots) ? ($3*2/3) : $3); - - Sequential_music * seq = dynamic_cast ($4); - - if (seq) { - int list_len =scm_ilength (seq->music_list ()); - if (list_len != 2) - seq->origin ()->warning ("Chord tremolo must have 2 elements."); - shift -= 1; - r->compress (Moment (Rational (1,list_len))); - } - gh_call3 (func, r->self_scm (), gh_int2scm (shift),gh_int2scm (dots)); - - } - r->set_spot (*$4->origin ()); - - $$ = r; +repeated_music: + REPEAT simple_string bare_unsigned music alternative_music + { + $$ = MAKE_SYNTAX ("repeat", @$, $2, scm_int2num ($3), $4, $5); } ; -Sequential_music: - SEQUENTIAL '{' Music_list '}' { - $$ = MY_MAKE_MUSIC ("SequentialMusic"); - $$->set_property ("elements", ly_car ($3)); - $$->set_spot (THIS->here_input ()); +sequential_music: + SEQUENTIAL '{' music_list '}' { + $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($3)); } - | '{' Music_list '}' { - $$ = MY_MAKE_MUSIC ("SequentialMusic"); - $$->set_property ("elements", ly_car ($2)); - $$->set_spot (THIS->here_input ()); + | '{' music_list '}' { + $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($2)); } ; -Simultaneous_music: - SIMULTANEOUS '{' Music_list '}'{ - $$ = MY_MAKE_MUSIC ("SimultaneousMusic"); - $$->set_property ("elements", ly_car ($3)); - $$->set_spot (THIS->here_input ()); - +simultaneous_music: + SIMULTANEOUS '{' music_list '}'{ + $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($3)); } - | simul_open Music_list simul_close { - $$ = MY_MAKE_MUSIC ("SimultaneousMusic"); - $$->set_property ("elements", ly_car ($2)); - $$->set_spot (THIS->here_input ()); + | simul_open music_list simul_close { + $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($2)); } ; -Simple_music: - event_chord { $$ = $1; } - | APPLYOUTPUT embedded_scm { - if (!ly_input_procedure_p ($2)) - THIS->parser_error (_ ("\\applycontext takes function argument")); - $$ = MY_MAKE_MUSIC ("ApplyOutputEvent"); - $$->set_property ("procedure", $2); - $$->set_spot (THIS->here_input ()); - } - | APPLYCONTEXT embedded_scm { - if (!ly_input_procedure_p ($2)) - THIS->parser_error (_ ("\\applycontext takes function argument")); - $$ = MY_MAKE_MUSIC ("ApplyContext"); - $$->set_property ("procedure", $2); - $$->set_spot (THIS->here_input ()); - } - | MUSIC_IDENTIFIER { - $$ = unsmob_music ($1); - } +simple_music: + event_chord + | MUSIC_IDENTIFIER | music_property_def | context_change ; - optional_context_mod: /**/ { $$ = SCM_EOL; } - | WITH '{' context_mod_list '}' { $$ = $3; } - ; - -grace_head: - GRACE { $$ = scm_makfrom0str ("Grace"); } - | ACCIACCATURA { $$ = scm_makfrom0str ("Acciaccatura"); } - | APPOGGIATURA { $$ = scm_makfrom0str ("Appoggiatura"); } + | WITH { PARSER->lexer_->push_initial_state (); } + '{' context_mod_list '}' + { + PARSER->lexer_->pop_state (); + $$ = $4; + } ; context_mod_list: /* */ { $$ = SCM_EOL; } | context_mod_list context_mod { - $$ = gh_cons ($2, $1); + $$ = scm_cons ($2, $1); } ; -Composite_music: - AUTOCHANGE Music { - static SCM proc ; - if (!proc) - proc = scm_c_eval_string ("make-autochange-music"); - - SCM res = scm_call_1 (proc, $2->self_scm ()); - scm_gc_unprotect_object ($2->self_scm ()); - $$ = unsmob_music (res); - scm_gc_protect_object (res); - $$->set_spot (THIS->here_input ()); - } - | PARTCOMBINE Music Music { - static SCM proc; - if (!proc) - proc = scm_c_eval_string ("make-part-combine-music"); - - SCM res = scm_call_1 (proc, gh_list ($2->self_scm (), - $3->self_scm (), SCM_UNDEFINED)); - scm_gc_unprotect_object ($3->self_scm ()); - scm_gc_unprotect_object ($2->self_scm ()); - $$ = unsmob_music (res); - scm_gc_protect_object (res); - $$->set_spot (THIS->here_input ()); - } - | grace_head Music { -#if 1 - /* - The other version is for easier debugging of - Sequential_music_iterator in combination with grace notes. - */ +composite_music: + prefix_composite_music { $$ = $1; } + | grouped_music_list { $$ = $1; } + ; -/* +grouped_music_list: + simultaneous_music { $$ = $1; } + | sequential_music { $$ = $1; } + ; -TODO: should distinguish between both grace types in the -basic music objects too, since the meaning is different. +function_scm_argument: + embedded_scm + | simple_string + ; +/* +TODO: use code generation for this */ - - String start_str = "start" + ly_scm2string ($1) + "Music"; - String stop_str = "stop" + ly_scm2string ($1) + "Music"; - - SCM start = THIS->lexer_->lookup_identifier (start_str); - SCM stop = THIS->lexer_->lookup_identifier (stop_str); - - Music *startm = unsmob_music (start); - Music *stopm = unsmob_music (stop); - - SCM ms = SCM_EOL; - if (stopm) { - stopm = stopm->clone (); - ms = scm_cons (stopm->self_scm (), ms); - scm_gc_unprotect_object (stopm->self_scm ()); - } - ms = scm_cons ($2->self_scm (), ms); - scm_gc_unprotect_object ($2->self_scm ()); - if (startm) { - startm = startm->clone (); - ms = scm_cons (startm->self_scm () , ms); - scm_gc_unprotect_object (startm->self_scm ()); - } - - Music* seq = MY_MAKE_MUSIC ("SequentialMusic"); - seq->set_property ("elements", ms); - - - $$ = MY_MAKE_MUSIC ("GraceMusic"); - $$->set_property ("element", seq->self_scm ()); - scm_gc_unprotect_object (seq->self_scm ()); -#else - $$ = MY_MAKE_MUSIC ("GraceMusic"); - $$->set_property ("element", $2->self_scm ()); - scm_gc_unprotect_object ($2->self_scm ()); -#endif +generic_prefix_music_scm: + MUSIC_FUNCTION { + $$ = scm_list_2 ($1, make_input (@$)); } - | CONTEXT string '=' string optional_context_mod Music { - $$ = context_spec_music ($2, $4, $6, $5); - + | MUSIC_FUNCTION_SCM function_scm_argument { + $$ = scm_list_3 ($1, make_input (@$), $2); } - | CONTEXT STRING optional_context_mod Music { - $$ = context_spec_music ($2, SCM_UNDEFINED, $4, $3); + | MUSIC_FUNCTION_MARKUP full_markup { + $$ = scm_list_3 ($1, make_input (@$), $2); } - | NEWCONTEXT string optional_context_mod Music { - $$ = context_spec_music ($2, get_next_unique_context (), - $4, $3); + | music_function_musicless_prefix music { + $$ = ly_append2 ($1, scm_list_1 ($2)); } - - | TIMES { - THIS->push_spot (); + | MUSIC_FUNCTION_SCM_SCM function_scm_argument function_scm_argument { + $$ = scm_list_4 ($1, make_input (@$), $2, $3); + } + | MUSIC_FUNCTION_SCM_SCM_SCM function_scm_argument function_scm_argument function_scm_argument { + $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4); + } + | MUSIC_FUNCTION_MARKUP_MUSIC full_markup music { + $$ = scm_list_4 ($1, make_input (@$), $2, $3); + } + | MUSIC_FUNCTION_MARKUP_MARKUP full_markup full_markup { + $$ = scm_list_4 ($1, make_input (@$), $2, $3); + } + | MUSIC_FUNCTION_MUSIC_MUSIC music music { + $$ = scm_list_4 ($1, make_input (@$), $2, $3); + } + | MUSIC_FUNCTION_SCM_MUSIC_MUSIC function_scm_argument music music { + $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4); + } + | MUSIC_FUNCTION_SCM_SCM_MUSIC_MUSIC function_scm_argument function_scm_argument music music { + $$ = scm_list_n ($1, make_input (@$), $2, $3, $4, $5, SCM_UNDEFINED); } - /* CONTINUED */ - fraction Music + | MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC full_markup music music { + $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4); + } + ; - { - int n = gh_scm2int (ly_car ($3)); int d = gh_scm2int (ly_cdr ($3)); - Music *mp = $4; +optional_id: + /**/ { $$ = SCM_EOL; } + | '=' simple_string { + $$ = $2; + } + ; - $$= MY_MAKE_MUSIC ("TimeScaledMusic"); - $$->set_spot (THIS->pop_spot ()); - $$->set_property ("element", mp->self_scm ()); - scm_gc_unprotect_object (mp->self_scm ()); - $$->set_property ("numerator", gh_int2scm (n)); - $$->set_property ("denominator", gh_int2scm (d)); - $$->compress (Moment (Rational (n,d))); +prefix_composite_music: + generic_prefix_music_scm { + $$ = run_music_function (PARSER, $1); + } + | CONTEXT simple_string optional_id optional_context_mod music { + $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_F); + } + | NEWCONTEXT simple_string optional_id optional_context_mod music { + $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_T); + } + | TIMES fraction music { + $$ = MAKE_SYNTAX ("time-scaled-music", @$, $2, $3); } - | Repeated_music { $$ = $1; } - | Simultaneous_music { $$ = $1; } - | Sequential_music { $$ = $1; } - | TRANSPOSE pitch_also_in_chords pitch_also_in_chords Music { - $$ = MY_MAKE_MUSIC ("TransposedMusic"); - Music *p = $4; + | repeated_music { $$ = $1; } + | TRANSPOSE pitch_also_in_chords pitch_also_in_chords music { Pitch from = *unsmob_pitch ($2); Pitch to = *unsmob_pitch ($3); - - p->transpose (interval (from, to)); - $$->set_property ("element", p->self_scm ()); - scm_gc_unprotect_object (p->self_scm ()); + SCM pitch = pitch_interval (from, to).smobbed_copy (); + $$ = MAKE_SYNTAX ("transpose-music", @$, pitch, $4); } - | APPLY embedded_scm Music { - if (!ly_input_procedure_p ($2)) - { - THIS->parser_error (_ ("\\apply takes function argument")); - $$ = $3; - } - else - { - SCM ret = gh_call1 ($2, $3->self_scm ()); - Music *m = unsmob_music (ret); - if (!m) { - THIS->parser_error ("\\apply must return a Music"); - m = MY_MAKE_MUSIC ("Music"); - } - $$ = m; - } - } - | NOTES + | mode_changing_head grouped_music_list { + if ($1 == ly_symbol2scm ("chords")) { - SCM nn = THIS->lexer_->lookup_identifier ("pitchnames"); - THIS->lexer_->push_note_state (alist_to_hashq (nn)); - } - Music - { $$ = $3; - THIS->lexer_->pop_state (); + $$ = MAKE_SYNTAX ("unrelativable-music", @$, $2); } - | DRUMS + else { - SCM nn = THIS->lexer_->lookup_identifier ("drumPitchNames"); - THIS->lexer_->push_note_state (alist_to_hashq (nn)); + $$ = $2; + } + PARSER->lexer_->pop_state (); } - Music - { $$ = $3; - THIS->lexer_->pop_state (); + | mode_changing_head_with_context optional_context_mod grouped_music_list { + $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, $3, $2, SCM_BOOL_T); + if ($1 == ly_symbol2scm ("ChordNames")) + { + $$ = MAKE_SYNTAX ("unrelativable-music", @$, $$); } - | FIGURES - { THIS->lexer_->push_figuredbass_state (); } - Music + PARSER->lexer_->pop_state (); + } + | relative_music { $$ = $1; } + | re_rhythmed_music { $$ = $1; } + ; + +mode_changing_head: + NOTEMODE { + SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames"); + PARSER->lexer_->push_note_state (alist_to_hashq (nn)); + + $$ = ly_symbol2scm ("notes"); + } + | DRUMMODE { - Music * chm = MY_MAKE_MUSIC ("UntransposableMusic"); - chm->set_property ("element", $3->self_scm ()); - $$ = chm; - scm_gc_unprotect_object ($3->self_scm ()); + SCM nn = PARSER->lexer_->lookup_identifier ("drumPitchNames"); + PARSER->lexer_->push_note_state (alist_to_hashq (nn)); - THIS->lexer_->pop_state (); + $$ = ly_symbol2scm ("drums"); } - | CHORDS { - SCM nn = THIS->lexer_->lookup_identifier ("chordmodifiers"); - THIS->lexer_->chordmodifier_tab_ = alist_to_hashq (nn); - nn = THIS->lexer_->lookup_identifier ("pitchnames"); - THIS->lexer_->push_chord_state (alist_to_hashq (nn)); + | FIGUREMODE { + PARSER->lexer_->push_figuredbass_state (); - } Music { - Music * chm = MY_MAKE_MUSIC ("UnrelativableMusic"); - chm->set_property ("element", $3->self_scm ()); - scm_gc_unprotect_object ($3->self_scm ()); - $$ = chm; + $$ = ly_symbol2scm ("figures"); + } + | CHORDMODE { + SCM nn = PARSER->lexer_->lookup_identifier ("chordmodifiers"); + PARSER->lexer_->chordmodifier_tab_ = alist_to_hashq (nn); + nn = PARSER->lexer_->lookup_identifier ("pitchnames"); + PARSER->lexer_->push_chord_state (alist_to_hashq (nn)); + $$ = ly_symbol2scm ("chords"); - THIS->lexer_->pop_state (); } - | LYRICS - { THIS->lexer_->push_lyric_state (); } - Music - { - $$ = $3; - THIS->lexer_->pop_state (); + | LYRICMODE + { PARSER->lexer_->push_lyric_state (); + $$ = ly_symbol2scm ("lyrics"); } - | relative_music { $$ = $1; } - | re_rhythmed_music { $$ = $1; } - | TAG embedded_scm Music { - tag_music ($3, $2, THIS->here_input ()); - $$ = $3; + ; + +mode_changing_head_with_context: + DRUMS { + SCM nn = PARSER->lexer_->lookup_identifier ("drumPitchNames"); + PARSER->lexer_->push_note_state (alist_to_hashq (nn)); + + $$ = ly_symbol2scm ("DrumStaff"); + } + | FIGURES { + PARSER->lexer_->push_figuredbass_state (); + + $$ = ly_symbol2scm ("FiguredBass"); + } + | CHORDS { + SCM nn = PARSER->lexer_->lookup_identifier ("chordmodifiers"); + PARSER->lexer_->chordmodifier_tab_ = alist_to_hashq (nn); + nn = PARSER->lexer_->lookup_identifier ("pitchnames"); + PARSER->lexer_->push_chord_state (alist_to_hashq (nn)); + $$ = ly_symbol2scm ("ChordNames"); + } + | LYRICS + { PARSER->lexer_->push_lyric_state (); + $$ = ly_symbol2scm ("Lyrics"); } ; -relative_music: - RELATIVE absolute_pitch Music { - Music * p = $3; - Pitch pit = *unsmob_pitch ($2); - $$ = MY_MAKE_MUSIC ("RelativeOctaveMusic"); - $$->set_property ("element", p->self_scm ()); - scm_gc_unprotect_object (p->self_scm ()); +relative_music: + RELATIVE absolute_pitch music { + Pitch start = *unsmob_pitch ($2); + $$ = make_music_relative (start, $3); + } + | RELATIVE composite_music { + Pitch middle_c (0, 0, 0); + $$ = make_music_relative (middle_c, $2); + } + ; +new_lyrics: + ADDLYRICS { PARSER->lexer_->push_lyric_state (); } + /*cont */ + grouped_music_list { + /* Can also use music at the expensive of two S/Rs similar to + \repeat \alternative */ + PARSER->lexer_->pop_state (); - Pitch retpitch = p->to_relative_octave (pit); - if (lily_1_8_relative) - $$->set_property ("last-pitch", retpitch.smobbed_copy ()); + $$ = scm_cons ($3, SCM_EOL); + } + | new_lyrics ADDLYRICS { + PARSER->lexer_->push_lyric_state (); + } grouped_music_list { + PARSER->lexer_->pop_state (); + $$ = scm_cons ($4, $1); } ; re_rhythmed_music: - ADDLYRICS Music Music { - Music*l =MY_MAKE_MUSIC ("LyricCombineMusic"); - l->set_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; + grouped_music_list new_lyrics { + $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL)); } - | NEWADDLYRICS string Music { - Music*l =MY_MAKE_MUSIC ("NewLyricCombineMusic"); - l->set_property ("element", $3->self_scm ()); - scm_gc_unprotect_object ($3->self_scm ()); - $$ = l; - l->set_property ("associated-context", $2); + | LYRICSTO simple_string { + PARSER->lexer_->push_lyric_state (); + } music { + PARSER->lexer_->pop_state (); + $$ = MAKE_SYNTAX ("lyric-combine", @$, $2, $4); } ; context_change: CHANGE STRING '=' STRING { - Music*t= MY_MAKE_MUSIC ("ContextChange"); - t-> set_property ("change-to-type", scm_string_to_symbol ($2)); - t-> set_property ("change-to-id", $4); - - $$ = t; - $$->set_spot (THIS->here_input ()); + $$ = MAKE_SYNTAX ("context-change", @$, scm_string_to_symbol ($2), $4); } ; property_operation: - STRING '=' scalar { + STRING '=' scalar { $$ = scm_list_3 (ly_symbol2scm ("assign"), scm_string_to_symbol ($1), $3); } - | UNSET STRING { + | UNSET simple_string { $$ = scm_list_2 (ly_symbol2scm ("unset"), scm_string_to_symbol ($2)); } - | OVERRIDE STRING embedded_scm '=' embedded_scm { + | OVERRIDE simple_string embedded_scm '=' embedded_scm { $$ = scm_list_4 (ly_symbol2scm ("push"), - scm_string_to_symbol ($2), $3, $5); + scm_string_to_symbol ($2), $5, $3); } - | REVERT STRING embedded_scm { + | OVERRIDE simple_string embedded_scm embedded_scm '=' embedded_scm { + $$ = scm_list_5 (ly_symbol2scm ("push"), + scm_string_to_symbol ($2), $6, $4, $3); + } + | REVERT simple_string embedded_scm { $$ = scm_list_3 (ly_symbol2scm ("pop"), scm_string_to_symbol ($2), $3); } ; context_def_mod: - CONSISTSEND { $$ = ly_symbol2scm ("consists-end"); } - | CONSISTS { $$ = ly_symbol2scm ("consists"); } + CONSISTS { $$ = ly_symbol2scm ("consists"); } | REMOVE { $$ = ly_symbol2scm ("remove"); } | ACCEPTS { $$ = ly_symbol2scm ("accepts"); } + | DEFAULTCHILD { $$ = ly_symbol2scm ("default-child"); } | DENIES { $$ = ly_symbol2scm ("denies"); } | ALIAS { $$ = ly_symbol2scm ("alias"); } @@ -1171,92 +1182,122 @@ context_mod: ; context_prop_spec: - STRING { - $$ = scm_list_2 (ly_symbol2scm ("Bottom"), scm_string_to_symbol ($1)); + simple_string { + if (!is_regular_identifier ($1)) + { + @$.error (_("Grob name should be alphanumeric")); + } + + $$ = scm_list_2 (ly_symbol2scm ("Bottom"), + scm_string_to_symbol ($1)); } - | STRING '.' STRING { - $$ = scm_list_2 (scm_string_to_symbol ($1), scm_string_to_symbol ($3)); + | simple_string '.' simple_string { + $$ = scm_list_2 (scm_string_to_symbol ($1), + scm_string_to_symbol ($3)); } ; -music_property_def: +simple_music_property_def: OVERRIDE context_prop_spec embedded_scm '=' scalar { - $$ = property_op_to_music (scm_list_4 ( - ly_symbol2scm ("poppush"), - gh_cadr ($2), - $3, $5)); - $$= context_spec_music (gh_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + $$ = scm_list_5 (scm_car ($2), + ly_symbol2scm ("OverrideProperty"), + scm_cadr ($2), + $5, $3); + } + | OVERRIDE context_prop_spec embedded_scm embedded_scm '=' scalar { + $$ = scm_list_n (scm_car ($2), + ly_symbol2scm ("OverrideProperty"), + scm_cadr ($2), + $6, $4, $3, SCM_UNDEFINED); } | REVERT context_prop_spec embedded_scm { - $$ = property_op_to_music (scm_list_3 ( - ly_symbol2scm ("pop"), - gh_cadr ($2), - $3)); - - $$= context_spec_music (gh_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + $$ = scm_list_4 (scm_car ($2), + ly_symbol2scm ("RevertProperty"), + scm_cadr ($2), + $3); } | SET context_prop_spec '=' scalar { - $$ = property_op_to_music (scm_list_3 ( - ly_symbol2scm ("assign"), - gh_cadr ($2), - $4)); - $$= context_spec_music (gh_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + $$ = scm_list_4 (scm_car ($2), + ly_symbol2scm ("PropertySet"), + scm_cadr ($2), + $4); } | UNSET context_prop_spec { - $$ = property_op_to_music (scm_list_2 ( - ly_symbol2scm ("unset"), - gh_cadr ($2))); - $$= context_spec_music (gh_car ($2), SCM_UNDEFINED, $$, SCM_EOL); - } - | ONCE music_property_def { - SCM e = $2->get_property ("element"); - unsmob_music (e)->set_property ("once", SCM_BOOL_T); - $$ = $2; - + $$ = scm_list_3 (scm_car ($2), + ly_symbol2scm ("PropertyUnset"), + scm_cadr ($2)); } ; +music_property_def: + simple_music_property_def { + $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons (PARSER->self_scm (), scm_cons2 (make_input (@$), SCM_BOOL_F, $1))); + } + | ONCE simple_music_property_def { + $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons (PARSER->self_scm (), scm_cons2 (make_input (@$), SCM_BOOL_T, $2))); + } + ; +string: + STRING { + $$ = $1; + } + | STRING_IDENTIFIER { + $$ = $1; + } + | string '+' string { + $$ = scm_string_append (scm_list_2 ($1, $3)); + } + ; -scalar: - string { $$ = $1; } - | bare_int { $$ = gh_int2scm ($1); } - | embedded_scm { $$ = $1; } - | full_markup { $$ = $1; } - | DIGIT { $$ = gh_int2scm ($1); } - ; - -/* -This is a trick: - -Adding pre_events to the simple_element -makes the choice between - - string: STRING - -and - - simple_element: STRING - -a single shift/reduction conflict. - -nevertheless, this is not very clean, and we should find a different -solution. +simple_string: STRING { + $$ = $1; + } + | LYRICS_STRING { + $$ = $1; + } + | STRING_IDENTIFIER { + $$ = $1; + } + ; -*/ -pre_events: { - THIS->push_spot (); +scalar: string { + $$ = $1; + } + | LYRICS_STRING { + $$ = $1; + } + | bare_number { + $$ = $1; + } + | embedded_scm { + $$ = $1; + } + | full_markup { + $$ = $1; + } + | DIGIT { + $$ = scm_from_int ($1); } ; event_chord: - pre_events simple_element post_events { - SCM elts = $2-> get_property ("elements"); - - elts = gh_append2 (elts, scm_reverse_x ($3, SCM_EOL)); - - $2->set_property ("elements", elts); - $$ = $2; + /* TODO: Create a special case that avoids the creation of + EventChords around simple_elements that have no post_events? + */ + simple_chord_elements post_events { + SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL)); + + Input i; + /* why is this giving wrong start location? -ns + * i = @$; */ + i.set_location (@1, @2); + $$ = MAKE_SYNTAX ("event-chord", i, elts); + } + | MULTI_MEASURE_REST optional_notemode_duration post_events { + Input i; + i.set_location (@1, @3); + $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2, $3); } | command_element | note_chord_element @@ -1266,16 +1307,18 @@ event_chord: note_chord_element: chord_body optional_notemode_duration post_events { + Music *m = unsmob_music ($1); SCM dur = unsmob_duration ($2)->smobbed_copy (); - SCM es = $1->get_property ("elements"); + SCM es = m->get_property ("elements"); SCM postevs = scm_reverse_x ($3, SCM_EOL); + + for (SCM s = es; scm_is_pair (s); s = scm_cdr (s)) + unsmob_music (scm_car (s))->set_property ("duration", dur); + es = ly_append2 (es, postevs); - for (SCM s = es; gh_pair_p (s); s = gh_cdr (s)) - unsmob_music (gh_car (s))->set_property ("duration", dur); - es = gh_append2 (es, postevs); - - $1-> set_property ("elements", es); - $$ = $1; + m-> set_property ("elements", es); + m->set_spot (@$); + $$ = m->self_scm (); } ; @@ -1285,277 +1328,240 @@ chord_open: '<' chord_close: '>' ; -simul_open: LESSLESS +simul_open: DOUBLE_ANGLE_OPEN ; -simul_close: MOREMORE +simul_close: DOUBLE_ANGLE_CLOSE ; chord_body: chord_open chord_body_elements chord_close { - $$ = MY_MAKE_MUSIC ("EventChord"); - $$->set_property ("elements", - scm_reverse_x ($2, SCM_EOL)); + $$ = MAKE_SYNTAX ("event-chord", @$, scm_reverse_x ($2, SCM_EOL)); } ; chord_body_elements: /* empty */ { $$ = SCM_EOL; } | chord_body_elements chord_body_element { - $$ = gh_cons ($2->self_scm (), $1); - scm_gc_unprotect_object ($2->self_scm ()); + $$ = scm_cons ($2, $1); } ; chord_body_element: - pitch exclamations questions post_events + pitch exclamations questions octave_check post_events { - Music * n = MY_MAKE_MUSIC ("NoteEvent"); + int q = $3; + int ex = $2; + SCM check = $4; + SCM post = $5; + + Music *n = MY_MAKE_MUSIC ("NoteEvent"); n->set_property ("pitch", $1); - if ($3 % 2) + n->set_spot (@$); + if (q % 2) n->set_property ("cautionary", SCM_BOOL_T); - if ($2 % 2 || $3 % 2) + if (ex % 2 || q % 2) n->set_property ("force-accidental", SCM_BOOL_T); - if (gh_pair_p ($4)) { - SCM arts = scm_reverse_x ($4, SCM_EOL); + if (scm_is_pair (post)) { + SCM arts = scm_reverse_x (post, SCM_EOL); n->set_property ("articulations", arts); } - $$ = n; + if (scm_is_number (check)) + { + int q = scm_to_int (check); + n->set_property ("absolute-octave", scm_from_int (q-1)); + } + + $$ = n->unprotect (); } | DRUM_PITCH post_events { - Music *n = MY_MAKE_MUSIC ("NoteEvent"); - n->set_property ("duration" ,$2); - n->set_property ("drum-type" , $1); - n->set_spot (THIS->here_input ()); + Music *n = MY_MAKE_MUSIC ("NoteEvent"); + n->set_property ("duration", $2); + n->set_property ("drum-type", $1); + n->set_spot (@$); - if (gh_pair_p ($2)) { + if (scm_is_pair ($2)) { SCM arts = scm_reverse_x ($2, SCM_EOL); n->set_property ("articulations", arts); } - $$ = n; + $$ = n->unprotect (); + } + | music_function_chord_body { + $$ = run_music_function (PARSER, $1); } ; -add_quote: - ADDQUOTE string Music { - static SCM adder; - if (!adder) - adder = scm_c_eval_string ("add-quotable"); - - scm_call_2 (adder, $2, $3->self_scm ()); - scm_gc_unprotect_object ($3->self_scm ()); +music_function_chord_body: + MUSIC_FUNCTION { + $$ = scm_list_2 ($1, make_input (@$)); + } + | music_function_musicless_prefix chord_body_element { + $$ = ly_append2 ($1, scm_list_1 ($2)); + } + ; + +music_function_event: + music_function_musicless_prefix post_event { + $$ = ly_append2 ($1, scm_list_1 ($2)); + } + ; + +/* +TODO: use code generation for this +*/ +music_function_musicless_prefix: + MUSIC_FUNCTION_MUSIC { + $$ = scm_list_2 ($1, make_input (@$)); + } + | MUSIC_FUNCTION_SCM_MUSIC function_scm_argument { + $$ = scm_list_3 ($1, make_input (@$), $2); + } + | MUSIC_FUNCTION_SCM_SCM_MUSIC function_scm_argument function_scm_argument { + $$ = scm_list_4 ($1, make_input (@$), $2, $3); + } + | MUSIC_FUNCTION_SCM_SCM_SCM_MUSIC function_scm_argument function_scm_argument function_scm_argument { + $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4); + } + | MUSIC_FUNCTION_SCM_SCM_SCM_SCM_MUSIC function_scm_argument function_scm_argument function_scm_argument function_scm_argument { + $$ = scm_list_n ($1, make_input (@$), $2, $3, $4, $5, SCM_UNDEFINED); } ; -command_element: - command_req { - $$ = MY_MAKE_MUSIC ("EventChord"); - $$->set_property ("elements", scm_cons ($1->self_scm (), SCM_EOL)); - scm_gc_unprotect_object ($1->self_scm ()); - $$-> set_spot (THIS->here_input ()); - $1-> set_spot (THIS->here_input ()); +command_element: + command_event { + $$ = $1; } | SKIP duration_length { - Music * skip = MY_MAKE_MUSIC ("SkipMusic"); - skip->set_property ("duration", $2); - - $$ = skip; - } - | QUOTE STRING duration_length { - SCM tab = THIS->lexer_->lookup_identifier ("musicQuotes"); - SCM evs = SCM_EOL; - if (scm_hash_table_p (tab) == SCM_BOOL_T) - { - SCM key = $2; // use symbol? - evs = scm_hash_ref (tab, key, SCM_BOOL_F); - } - Music * quote = 0; - if (gh_vector_p (evs)) - { - quote = MY_MAKE_MUSIC ("QuoteMusic"); - quote->set_property ("duration", $3); - quote->set_property ("quoted-events", evs); - } else { - THIS->here_input ().warning (_f ("Can\'t find music")); - quote = MY_MAKE_MUSIC ("Event"); - } - quote->set_spot (THIS->here_input ()); - $$ = quote; - } - | OCTAVE { THIS->push_spot (); } - pitch { - Music *l = MY_MAKE_MUSIC ("RelativeOctaveCheck"); - $$ = l; - $$->set_spot (THIS->pop_spot ()); - $$->set_property ("pitch", $3); - } - | E_LEFTSQUARE { - Music *l = MY_MAKE_MUSIC ("LigatureEvent"); - l->set_property ("span-direction", gh_int2scm (START)); - l->set_spot (THIS->here_input ()); - - $$ = MY_MAKE_MUSIC ("EventChord"); - $$->set_property ("elements", scm_cons (l->self_scm (), SCM_EOL)); - scm_gc_unprotect_object (l->self_scm ()); - $$->set_spot (THIS->here_input ()); - } - | E_RIGHTSQUARE { - Music *l = MY_MAKE_MUSIC ("LigatureEvent"); - l->set_property ("span-direction", gh_int2scm (STOP)); - l->set_spot (THIS->here_input ()); - - $$ = MY_MAKE_MUSIC ("EventChord"); - $$->set_property ("elements", scm_cons (l->self_scm (), SCM_EOL)); - $$->set_spot (THIS->here_input ()); - scm_gc_unprotect_object (l->self_scm ()); + $$ = MAKE_SYNTAX ("skip-music", @$, $2); + } + | E_BRACKET_OPEN { + Music *m = MY_MAKE_MUSIC ("LigatureEvent"); + m->set_property ("span-direction", scm_from_int (START)); + m->set_spot (@$); + $$ = m->unprotect(); + } + | E_BRACKET_CLOSE { + Music *m = MY_MAKE_MUSIC ("LigatureEvent"); + m->set_property ("span-direction", scm_from_int (STOP)); + m->set_spot (@$); + $$ = m->unprotect (); } | E_BACKSLASH { - $$ = MY_MAKE_MUSIC ("VoiceSeparator"); - $$->set_spot (THIS->here_input ()); + $$ = MAKE_SYNTAX ("voice-separator", @$, SCM_UNDEFINED); } | '|' { + SCM pipe = PARSER->lexer_->lookup_identifier ("pipeSymbol"); + + Music *m = unsmob_music (pipe); + if (m) + { + m = m->clone (); + m->set_spot (@$); + $$ = m->unprotect (); + } + else + $$ = MAKE_SYNTAX ("bar-check", @$, SCM_UNDEFINED); - $$ = MY_MAKE_MUSIC ("BarCheck"); - $$->set_spot (THIS->here_input ()); } | TRANSPOSITION pitch { - $$ = set_property_music (ly_symbol2scm ("instrumentTransposition"), - $2); - $$->set_spot (THIS-> here_input ()); - $$ = context_spec_music (ly_symbol2scm ("Staff"), SCM_UNDEFINED, - $$ , SCM_EOL); - } - | BAR STRING { - Music *t = set_property_music (ly_symbol2scm ("whichBar"), $2); - - Music *csm = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED, - t, SCM_EOL); - $$ = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED, csm, SCM_EOL); - $$->set_spot (THIS->here_input ()); - t->set_spot (THIS->here_input ()); - } - | PARTIAL duration_length { + Pitch middle_c; + Pitch sounds_as_c = pitch_interval (*unsmob_pitch ($2), middle_c); + $$ = MAKE_SYNTAX ("property-operation", @$, SCM_BOOL_F, ly_symbol2scm ("Staff"), ly_symbol2scm ("PropertySet"), ly_symbol2scm ("instrumentTransposition"), sounds_as_c.smobbed_copy ()); + } + | PARTIAL duration_length { Moment m = - unsmob_duration ($2)->get_length (); - Music * p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ()); - p->set_spot (THIS->here_input ()); - p = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED, - p, SCM_EOL); - p = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED, - p, SCM_EOL); - $$ =p ; - } - | CLEF STRING { - static SCM proc ; - if (!proc) - proc = scm_c_eval_string ("make-clef-set"); - - SCM result = scm_call_1 (proc, $2); - scm_gc_protect_object (result); - $$ = unsmob_music (result); + $$ = MAKE_SYNTAX ("property-operation", @$, SCM_BOOL_F, ly_symbol2scm ("Timing"), ly_symbol2scm ("PropertySet"), ly_symbol2scm ("measurePosition"), m.smobbed_copy ()); + $$ = MAKE_SYNTAX ("context-specification", @$, ly_symbol2scm ("Score"), SCM_BOOL_F, $$, SCM_EOL, SCM_BOOL_F); } + | TIME_T fraction { - static SCM proc; - if (!proc) - proc = scm_c_eval_string ("make-time-signature-set"); + SCM proc = ly_lily_module_constant ("make-time-signature-set"); - SCM result = scm_apply_2 (proc, gh_car ($2), gh_cdr ($2), SCM_EOL); - scm_gc_protect_object (result); - $$ = unsmob_music (result); + $$ = scm_apply_2 (proc, scm_car ($2), scm_cdr ($2), SCM_EOL); } | MARK scalar { - static SCM proc; - if (!proc) - proc = scm_c_eval_string ("make-mark-set"); + SCM proc = ly_lily_module_constant ("make-mark-set"); - SCM result = scm_call_1 (proc, $2); - scm_gc_protect_object (result); - $$ = unsmob_music (result); + $$ = scm_call_1 (proc, $2); } ; -command_req: - BREATHE { - $$ = MY_MAKE_MUSIC ("BreathingSignEvent"); - } - | E_TILDE { - $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent"); +command_event: + E_TILDE { + $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent")->unprotect (); } | MARK DEFAULT { - Music * m = MY_MAKE_MUSIC ("MarkEvent"); - $$ = m; + Music *m = MY_MAKE_MUSIC ("MarkEvent"); + $$ = m->unprotect (); } | tempo_event { $$ = $1; } | KEY DEFAULT { - Music *key= MY_MAKE_MUSIC ("KeyChangeEvent"); - $$ = key; + Music *key = MY_MAKE_MUSIC ("KeyChangeEvent"); + $$ = key->unprotect (); } | KEY NOTENAME_PITCH SCM_IDENTIFIER { - Music *key= MY_MAKE_MUSIC ("KeyChangeEvent"); + Music *key = MY_MAKE_MUSIC ("KeyChangeEvent"); if (scm_ilength ($3) > 0) { key->set_property ("pitch-alist", $3); - key->set_property ("tonic", Pitch (0,0,0).smobbed_copy ()); - ((Music*)key)->transpose (* unsmob_pitch ($2)); + key->set_property ("tonic", Pitch (0, 0, 0).smobbed_copy ()); + key->transpose (* unsmob_pitch ($2)); } else { - THIS->parser_error (_("Second argument must be pitch list.")); + PARSER->parser_error (@3, _ ("second argument must be pitch list")); } - $$ = key; + $$ = key->unprotect (); } ; + post_events: /* empty */ { $$ = SCM_EOL; } | post_events post_event { - $2->set_spot (THIS->here_input ()); - $$ = gh_cons ($2->self_scm (), $$); - scm_gc_unprotect_object ($2->self_scm ()); - } - | post_events tagged_post_event { - $2 -> set_spot (THIS->here_input ()); - $$ = scm_cons ($2->self_scm (), $$); - scm_gc_unprotect_object ($2->self_scm ()); + unsmob_music ($2)->set_spot (@2); + $$ = scm_cons ($2, $$); } ; - - -tagged_post_event: - '-' TAG embedded_scm post_event { - tag_music ($4, $3, THIS->here_input ()); - $$ = $4; - } - ; - + post_event: direction_less_event { $$ = $1; } + | '-' music_function_event { + $$ = run_music_function (PARSER, $2); + } | HYPHEN { - if (!THIS->lexer_->is_lyric_state ()) - THIS->parser_error (_ ("Have to be in Lyric mode for lyrics")); - $$ = MY_MAKE_MUSIC ("HyphenEvent"); + if (!PARSER->lexer_->is_lyric_state ()) + PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics")); + $$ = MY_MAKE_MUSIC ("HyphenEvent")->unprotect (); } | EXTENDER { - if (!THIS->lexer_->is_lyric_state ()) - THIS->parser_error (_ ("Have to be in Lyric mode for lyrics")); - $$ = MY_MAKE_MUSIC ("ExtenderEvent"); + if (!PARSER->lexer_->is_lyric_state ()) + PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics")); + $$ = MY_MAKE_MUSIC ("ExtenderEvent")->unprotect (); } | script_dir direction_reqd_event { if ($1) - $2->set_property ("direction", gh_int2scm ($1)); + { + Music *m = unsmob_music ($2); + m->set_property ("direction", scm_from_int ($1)); + } $$ = $2; } | script_dir direction_less_event { if ($1) - $2->set_property ("direction", gh_int2scm ($1)); + { + Music *m = unsmob_music ($2); + m->set_property ("direction", scm_from_int ($1)); + } $$ = $2; } | string_number_event @@ -1563,83 +1569,91 @@ post_event: string_number_event: E_UNSIGNED { - Music * s = MY_MAKE_MUSIC ("StringNumberEvent"); - s->set_property ("string-number", gh_int2scm ($1)); - s->set_spot (THIS->here_input ()); - $$ = s; + Music *s = MY_MAKE_MUSIC ("StringNumberEvent"); + s->set_property ("string-number", scm_from_int ($1)); + s->set_spot (@$); + $$ = s->unprotect (); } ; - -direction_less_event: +direction_less_char: '[' { - - -/* - -TODO: should take all these defs out of the parser, adn make use -configurable, i.e. - - -(set-articulation '~ "trill") - -*/ - Music * m = MY_MAKE_MUSIC ("BeamEvent"); - m->set_spot (THIS->here_input ()); - m->set_property ("span-direction" , gh_int2scm (START)); - $$ = m; + $$ = ly_symbol2scm ("bracketOpenSymbol"); } | ']' { - Music * m = MY_MAKE_MUSIC ("BeamEvent"); - m->set_spot (THIS->here_input ()); - m->set_property ("span-direction" , gh_int2scm (STOP)); - $$ = m; + $$ = ly_symbol2scm ("bracketCloseSymbol"); } - | '~' { - Music * m = MY_MAKE_MUSIC ("TieEvent"); - m->set_spot (THIS->here_input ()); - $$ = m; + | '~' { + $$ = ly_symbol2scm ("tildeSymbol"); } - | close_event { - $$ = $1; - dynamic_cast ($$)->set_property ("span-direction", - gh_int2scm (START)); + | '(' { + $$ = ly_symbol2scm ("parenthesisOpenSymbol"); } - | open_event { - $$ = $1; - dynamic_cast ($$)->set_property ("span-direction", - gh_int2scm (STOP)); + | ')' { + $$ = ly_symbol2scm ("parenthesisCloseSymbol"); + } + | E_EXCLAMATION { + $$ = ly_symbol2scm ("escapedExclamationSymbol"); + } + | E_OPEN { + $$ = ly_symbol2scm ("escapedParenthesisOpenSymbol"); + } + | E_CLOSE { + $$ = ly_symbol2scm ("escapedParenthesisCloseSymbol"); + } + | E_ANGLE_CLOSE { + $$ = ly_symbol2scm ("escapedBiggerSymbol"); + } + | E_ANGLE_OPEN { + $$ = ly_symbol2scm ("escapedSmallerSymbol"); + } + ; + +direction_less_event: + direction_less_char { + SCM predefd = PARSER->lexer_->lookup_identifier_symbol ($1); + Music *m = 0; + if (unsmob_music (predefd)) + { + m = unsmob_music (predefd)->clone (); + } + else + { + m = MY_MAKE_MUSIC ("Music"); + } + m->set_spot (@$); + $$ = m->unprotect (); } | EVENT_IDENTIFIER { - $$ = unsmob_music ($1); + $$ = $1; } | tremolo_type { - Music * a = MY_MAKE_MUSIC ("TremoloEvent"); - a->set_spot (THIS->here_input ()); - a->set_property ("tremolo-type", gh_int2scm ($1)); - $$ = a; + Music *a = MY_MAKE_MUSIC ("TremoloEvent"); + a->set_spot (@$); + a->set_property ("tremolo-type", scm_from_int ($1)); + $$ = a->unprotect (); } ; direction_reqd_event: gen_text_def { - $$ = $1; + $$ = $1; } | script_abbreviation { - SCM s = THIS->lexer_->lookup_identifier ("dash" + ly_scm2string ($1)); + SCM s = PARSER->lexer_->lookup_identifier ("dash" + ly_scm2string ($1)); Music *a = MY_MAKE_MUSIC ("ArticulationEvent"); - if (gh_string_p (s)) + if (scm_is_string (s)) a->set_property ("articulation-type", s); - else THIS->parser_error (_ ("Expecting string as script definition")); - $$ = a; + else PARSER->parser_error (@1, _ ("expecting string as script definition")); + $$ = a->unprotect (); } ; -oct_check: +octave_check: /**/ { $$ = SCM_EOL; } - | '=' { $$ = gh_int2scm (0); } - | '=' sub_quotes { $$ = gh_int2scm ($2); } - | '=' sup_quotes { $$ = gh_int2scm ($2); } + | '=' { $$ = scm_from_int (0); } + | '=' sub_quotes { $$ = scm_from_int ($2); } + | '=' sup_quotes { $$ = scm_from_int ($2); } ; sup_quotes: @@ -1656,7 +1670,7 @@ sub_quotes: $$ = 1; } | sub_quotes ',' { - $$ ++ ; + $$++; } ; @@ -1708,70 +1722,25 @@ pitch_also_in_chords: | steno_tonic_pitch ; -close_event: - '(' { - Music * s= MY_MAKE_MUSIC ("SlurEvent"); - $$ = s; - s->set_spot (THIS->here_input ()); - } - | E_OPEN { - Music * s= MY_MAKE_MUSIC ("PhrasingSlurEvent"); - $$ = s; - s->set_spot (THIS->here_input ()); - } - | E_SMALLER { - Music *s =MY_MAKE_MUSIC ("CrescendoEvent"); - $$ = s; - s->set_spot (THIS->here_input ()); - } - | E_BIGGER { - Music *s =MY_MAKE_MUSIC ("DecrescendoEvent"); - $$ = s; - s->set_spot (THIS->here_input ()); - } - ; - - -open_event: - E_EXCLAMATION { - Music *s = MY_MAKE_MUSIC ("CrescendoEvent"); - s->set_spot (THIS->here_input ()); - - $$ = s; - } - | ')' { - Music * s= MY_MAKE_MUSIC ("SlurEvent"); - $$ = s; - s->set_spot (THIS->here_input ()); - - } - | E_CLOSE { - Music * s= MY_MAKE_MUSIC ("PhrasingSlurEvent"); - $$ = s; - s->set_property ("span-type", scm_makfrom0str ( "phrasing-slur")); - s->set_spot (THIS->here_input ()); - } - ; - gen_text_def: full_markup { Music *t = MY_MAKE_MUSIC ("TextScriptEvent"); t->set_property ("text", $1); - t->set_spot (THIS->here_input ()); - $$ = t; + t->set_spot (@$); + $$ = t->unprotect (); } | string { Music *t = MY_MAKE_MUSIC ("TextScriptEvent"); - t->set_property ("text", make_simple_markup ($1)); - t->set_spot (THIS->here_input ()); - $$ = t; - + t->set_property ("text", + make_simple_markup ($1)); + t->set_spot (@$); + $$ = t->unprotect (); } | DIGIT { - Music * t = MY_MAKE_MUSIC ("FingerEvent"); - t->set_property ("digit", gh_int2scm ($1)); - t->set_spot (THIS->here_input ()); - $$ = t; + Music *t = MY_MAKE_MUSIC ("FingerEvent"); + t->set_property ("digit", scm_from_int ($1)); + t->set_spot (@$); + $$ = t->unprotect (); } ; @@ -1820,40 +1789,32 @@ duration_length: optional_notemode_duration: { - Duration dd = THIS->default_duration_; + Duration dd = PARSER->default_duration_; $$ = dd.smobbed_copy (); - - THIS->beam_check ($$); } | multiplied_duration { $$ = $1; - THIS->default_duration_ = *unsmob_duration ($$); - - THIS->beam_check ($$); + PARSER->default_duration_ = *unsmob_duration ($$); } ; steno_duration: bare_unsigned dots { - int l = 0; - if (!is_is_duration ($1)) - THIS->parser_error (_f ("not a duration: %d", $1)); + int len = 0; + if (!is_duration ($1)) + PARSER->parser_error (@1, _f ("not a duration: %d", $1)); else - l = intlog2 ($1); + len = intlog2 ($1); - $$ = Duration (l, $2).smobbed_copy (); + $$ = Duration (len, $2).smobbed_copy (); } | DURATION_IDENTIFIER dots { - Duration *d =unsmob_duration ($1); - Duration k (d->duration_log (),d->dot_count () + $2); - + Duration *d = unsmob_duration ($1); + Duration k (d->duration_log (), d->dot_count () + $2); *d = k; $$ = $1; } - ; - - - + ; multiplied_duration: steno_duration { @@ -1863,7 +1824,7 @@ multiplied_duration: $$ = unsmob_duration ($$)->compressed ( $3) .smobbed_copy (); } | multiplied_duration '*' FRACTION { - Rational m (gh_scm2int (ly_car ($3)), gh_scm2int (ly_cdr ($3))); + Rational m (scm_to_int (scm_car ($3)), scm_to_int (scm_cdr ($3))); $$ = unsmob_duration ($$)->compressed (m).smobbed_copy (); } @@ -1872,7 +1833,7 @@ multiplied_duration: fraction: FRACTION { $$ = $1; } | UNSIGNED '/' UNSIGNED { - $$ = scm_cons (gh_int2scm ($1), gh_int2scm ($3)); + $$ = scm_cons (scm_from_int ($1), scm_from_int ($3)); } ; @@ -1885,36 +1846,31 @@ dots: } ; - -tremolo_type: +tremolo_type: ':' { - $$ =0; + $$ = 0; } | ':' bare_unsigned { - if (!is_is_duration ($2)) - THIS->parser_error (_f ("not a duration: %d", $2)); + if (!is_duration ($2)) + PARSER->parser_error (@2, _f ("not a duration: %d", $2)); $$ = $2; } ; - - -/***************************************************************** - BASS FIGURES -*****************************************************************/ bass_number: DIGIT { - $$ = scm_number_to_string (gh_int2scm ($1), gh_int2scm (10)); + $$ = scm_from_int ($1); } | UNSIGNED { - $$ = scm_number_to_string (gh_int2scm ($1), gh_int2scm (10)); + $$ = scm_from_int ($1); } - | STRING { $$ = $1; } + | STRING { $$ = $1; } + | full_markup { $$ = $1; } ; -bass_mod: +figured_bass_alteration: '-' { $$ = -2; } - | '+' { $$ = 2; } + | '+' { $$ = 2; } | '!' { $$ = 0; } ; @@ -1922,40 +1878,73 @@ bass_figure: FIGURE_SPACE { Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent"); $$ = bfr->self_scm (); - scm_gc_unprotect_object ($$); + bfr->unprotect (); + bfr->set_spot (@1); } | bass_number { Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent"); $$ = bfr->self_scm (); - bfr->set_property ("figure", $1); + if (scm_is_number ($1)) + bfr->set_property ("figure", $1); + else if (Text_interface::is_markup ($1)) + bfr->set_property ("text", $1); - scm_gc_unprotect_object ($$); + bfr->unprotect (); + bfr->set_spot (@1); + } + | bass_figure ']' { + $$ = $1; + unsmob_music ($1)->set_property ("bracket-stop", SCM_BOOL_T); } - | bass_figure bass_mod { + | bass_figure figured_bass_alteration { Music *m = unsmob_music ($1); if ($2) { - SCM salter =m->get_property ("alteration"); - int alter = gh_number_p ( salter) ? gh_scm2int (salter) : 0; + SCM salter = m->get_property ("alteration"); + int alter = scm_is_number (salter) ? scm_to_int (salter) : 0; m->set_property ("alteration", - gh_int2scm (alter + $2)); + scm_from_int (alter + $2)); } else { - m->set_property ("alteration", gh_int2scm (0)); + m->set_property ("alteration", scm_from_int (0)); } } + | bass_figure figured_bass_modification { + Music *m = unsmob_music ($1); + if ($2 == ly_symbol2scm ("plus")) + { + m->set_property ("augmented", SCM_BOOL_T); + } + else if ($2 == ly_symbol2scm ("slash")) + { + m->set_property ("diminished", SCM_BOOL_T); + } + else if ($2 == ly_symbol2scm ("exclamation")) + { + m->set_property ("no-continuation", SCM_BOOL_T); + } + } ; -br_bass_figure: - '[' bass_figure { - $$ = $2; - unsmob_music ($$)->set_property ("bracket-start", SCM_BOOL_T); + +figured_bass_modification: + E_PLUS { + $$ = ly_symbol2scm ("plus"); } - | bass_figure { - $$ = $1; + | E_EXCLAMATION { + $$ = ly_symbol2scm ("exclamation"); + } + | '/' { + $$ = ly_symbol2scm ("slash"); } - | br_bass_figure ']' { + ; + +br_bass_figure: + bass_figure { $$ = $1; - unsmob_music ($1)->set_property ("bracket-stop", SCM_BOOL_T); + } + | '[' bass_figure { + $$ = $2; + unsmob_music ($$)->set_property ("bracket-start", SCM_BOOL_T); } ; @@ -1964,16 +1953,13 @@ figure_list: $$ = SCM_EOL; } | figure_list br_bass_figure { - $$ = scm_cons ($2, $1); + $$ = scm_cons ($2, $1); } ; figure_spec: FIGURE_OPEN figure_list FIGURE_CLOSE { - Music * m = MY_MAKE_MUSIC ("EventChord"); - $2 = scm_reverse_x ($2, SCM_EOL); - m->set_property ("elements", $2); - $$ = m->self_scm (); + $$ = scm_reverse_x ($2, SCM_EOL); } ; @@ -1984,25 +1970,23 @@ optional_rest: ; simple_element: - pitch exclamations questions oct_check optional_notemode_duration optional_rest { - - Input i = THIS->pop_spot (); - if (!THIS->lexer_->is_note_state ()) - THIS->parser_error (_ ("Have to be in Note mode for notes")); + pitch exclamations questions octave_check optional_notemode_duration optional_rest { + if (!PARSER->lexer_->is_note_state ()) + PARSER->parser_error (@1, _ ("have to be in Note mode for notes")); Music *n = 0; if ($6) - n = MY_MAKE_MUSIC ("RestEvent"); + n = MY_MAKE_MUSIC ("RestEvent"); else - n = MY_MAKE_MUSIC ("NoteEvent"); + n = MY_MAKE_MUSIC ("NoteEvent"); n->set_property ("pitch", $1); n->set_property ("duration", $5); - if (gh_number_p ($4)) + if (scm_is_number ($4)) { - int q = gh_scm2int ($4); - n->set_property ("absolute-octave", gh_int2scm (q-1)); + int q = scm_to_int ($4); + n->set_property ("absolute-octave", scm_from_int (q-1)); } if ($3 % 2) @@ -2010,44 +1994,19 @@ simple_element: if ($2 % 2 || $3 % 2) n->set_property ("force-accidental", SCM_BOOL_T); - Music *v = MY_MAKE_MUSIC ("EventChord"); - v->set_property ("elements", scm_list_1 (n->self_scm ())); - scm_gc_unprotect_object (n->self_scm ()); - - v->set_spot (i); - n->set_spot (i); - $$ = v; + n->set_spot (@$); + $$ = n->unprotect (); } | DRUM_PITCH optional_notemode_duration { - Input i = THIS->pop_spot (); - - Music *n = MY_MAKE_MUSIC ("NoteEvent"); - n->set_property ("duration" ,$2); - n->set_property ("drum-type" , $1); - - Music *v = MY_MAKE_MUSIC ("EventChord"); - v->set_property ("elements", scm_list_1 (n->self_scm ())); - scm_gc_unprotect_object (n->self_scm ()); - v->set_spot (i); - n->set_spot (i); - $$ = v; - + Music *n = MY_MAKE_MUSIC ("NoteEvent"); + n->set_property ("duration", $2); + n->set_property ("drum-type", $1); + + $$ = n->unprotect (); } - | figure_spec optional_notemode_duration { - Music * m = unsmob_music ($1); - Input i = THIS->pop_spot (); - m->set_spot (i); - for (SCM s = m->get_property ("elements"); gh_pair_p (s); s = ly_cdr (s)) - { - unsmob_music (ly_car (s))->set_property ("duration", $2); - } - $$ = m; - } | RESTNAME optional_notemode_duration { - - Input i = THIS->pop_spot (); - Music * ev = 0; - if (ly_scm2string ($1) =="s") { + Music *ev = 0; + if (ly_scm2string ($1) == "s") { /* Space */ ev = MY_MAKE_MUSIC ("SkipEvent"); } @@ -2055,64 +2014,56 @@ simple_element: ev = MY_MAKE_MUSIC ("RestEvent"); } - ev->set_property ("duration" ,$2); - ev->set_spot (i); - Music * velt = MY_MAKE_MUSIC ("EventChord"); - velt->set_property ("elements", scm_list_1 (ev->self_scm ())); - velt->set_spot (i); - - scm_gc_unprotect_object (ev->self_scm ()); - - $$ = velt; - } - | MULTI_MEASURE_REST optional_notemode_duration { - THIS->pop_spot (); - - static SCM proc ; - if (!proc) - proc = scm_c_eval_string ("make-multi-measure-rest"); - - SCM mus = scm_call_2 (proc, $2, - make_input (THIS->here_input ())); - scm_gc_protect_object (mus); - $$ = unsmob_music (mus); + ev->set_property ("duration", $2); + ev->set_spot (@$); + $$ = ev->unprotect (); } - | lyric_element optional_notemode_duration { - Input i = THIS->pop_spot (); - if (!THIS->lexer_->is_lyric_state ()) - THIS->parser_error (_ ("Have to be in Lyric mode for lyrics")); - - Music * lreq = MY_MAKE_MUSIC ("LyricEvent"); - lreq->set_property ("text", $1); - lreq->set_property ("duration",$2); - lreq->set_spot (i); - Music * velt = MY_MAKE_MUSIC ("EventChord"); - velt->set_property ("elements", scm_list_1 (lreq->self_scm ())); + if (!PARSER->lexer_->is_lyric_state ()) + PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics")); - $$= velt; + Music *levent = MY_MAKE_MUSIC ("LyricEvent"); + levent->set_property ("text", $1); + levent->set_property ("duration",$2); + levent->set_spot (@$); + $$= levent->unprotect (); } - | new_chord { - THIS->pop_spot (); + ; - if (!THIS->lexer_->is_chord_state ()) - THIS->parser_error (_ ("Have to be in Chord mode for chords")); - $$ = unsmob_music ($1); +simple_chord_elements: + simple_element { + $$ = scm_list_1 ($1); + } + | new_chord { + if (!PARSER->lexer_->is_chord_state ()) + PARSER->parser_error (@1, _ ("have to be in Chord mode for chords")); + $$ = $1; } + | figure_spec optional_notemode_duration { + for (SCM s = $1; scm_is_pair (s); s = scm_cdr (s)) + { + unsmob_music (scm_car (s))->set_property ("duration", $2); + } + $$ = $1; + } ; lyric_element: - full_markup { $$ = $1; } - | STRING { $$ = $1 ; } + lyric_markup { + $$ = $1; + } + | LYRICS_STRING { + $$ = $1; + } ; new_chord: steno_tonic_pitch optional_notemode_duration { - $$ = make_chord ($1, $2, SCM_EOL); + $$ = make_chord_elements ($1, $2, SCM_EOL); } | steno_tonic_pitch optional_notemode_duration chord_separator chord_items { SCM its = scm_reverse_x ($4, SCM_EOL); - $$ = make_chord ($1, $2, gh_cons ($3, its)); + $$ = make_chord_elements ($1, $2, scm_cons ($3, its)); } ; @@ -2121,7 +2072,7 @@ chord_items: $$ = SCM_EOL; } | chord_items chord_item { - $$ = gh_cons ($2, $$); + $$ = scm_cons ($2, $$); } ; @@ -2130,13 +2081,13 @@ chord_separator: $$ = ly_symbol2scm ("chord-colon"); } | CHORD_CARET { - $$ = ly_symbol2scm ("chord-caret"); + $$ = ly_symbol2scm ("chord-caret"); } | CHORD_SLASH steno_tonic_pitch { - $$ = scm_list_2 (ly_symbol2scm ("chord-slash"), $2); + $$ = scm_list_2 (ly_symbol2scm ("chord-slash"), $2); } | CHORD_BASS steno_tonic_pitch { - $$ = scm_list_2 (ly_symbol2scm ("chord-bass"), $2); + $$ = scm_list_2 (ly_symbol2scm ("chord-bass"), $2); } ; @@ -2153,23 +2104,23 @@ chord_item: ; step_numbers: - step_number { $$ = gh_cons ($1, SCM_EOL); } + step_number { $$ = scm_cons ($1, SCM_EOL); } | step_numbers '.' step_number { - $$ = gh_cons ($3, $$); + $$ = scm_cons ($3, $$); } ; step_number: bare_unsigned { $$ = make_chord_step ($1, 0); - } + } | bare_unsigned '+' { $$ = make_chord_step ($1, SHARP); } | bare_unsigned CHORD_MINUS { $$ = make_chord_step ($1, FLAT); } - ; + ; /* UTILITIES @@ -2184,7 +2135,7 @@ number_expression: | number_expression '-' number_term { $$ = scm_difference ($1, $3); } - | number_term + | number_term ; number_term: @@ -2209,7 +2160,7 @@ number_factor: bare_number: UNSIGNED { - $$ = gh_int2scm ($1); + $$ = scm_from_int ($1); } | REAL { $$ = $1; @@ -2218,10 +2169,10 @@ bare_number: $$ = $1; } | REAL NUMBER_IDENTIFIER { - $$ = gh_double2scm (gh_scm2double ($1) * gh_scm2double ($2)); + $$ = scm_from_double (scm_to_double ($1) *scm_to_double ($2)); } | UNSIGNED NUMBER_IDENTIFIER { - $$ = gh_double2scm ($1 * gh_scm2double ($2)); + $$ = scm_from_double ($1 *scm_to_double ($2)); } ; @@ -2235,37 +2186,6 @@ bare_unsigned: } ; -bare_int: - bare_number { - if (scm_integer_p ($1) == SCM_BOOL_T) - { - int k = gh_scm2int ($1); - $$ = k; - } else - { - THIS->parser_error (_ ("need integer number arg")); - $$ = 0; - } - } - | '-' bare_int { - $$ = -$2; - } - ; - - -string: - STRING { - $$ = $1; - } - | STRING_IDENTIFIER { - $$ = $1; - } - | string '+' string { - $$ = scm_string_append (scm_list_2 ($1, $3)); - } - ; - - exclamations: { $$ = 0; } | exclamations '!' { $$ ++; } @@ -2276,131 +2196,168 @@ questions: | questions '?' { $$ ++; } ; +/* +This should be done more dynamically if possible. +*/ +lyric_markup: + LYRIC_MARKUP_IDENTIFIER { + $$ = $1; + } + | LYRIC_MARKUP + { PARSER->lexer_->push_markup_state (); } + markup_top { + $$ = $3; + PARSER->lexer_->pop_state (); + } + ; full_markup: MARKUP_IDENTIFIER { $$ = $1; - } - | MARKUP - { THIS->lexer_->push_markup_state (); } - markup - { $$ = $3; - THIS->lexer_->pop_state (); - } + } + | MARKUP + { PARSER->lexer_->push_markup_state (); } + markup_top { + $$ = $3; + PARSER->lexer_->pop_state (); + } + ; + +markup_top: + markup_list { + $$ = scm_list_2 (ly_lily_module_constant ("line-markup"), $1); + } + | markup_head_1_list simple_markup { + $$ = scm_car (scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, scm_list_1 ($2))); + } + | simple_markup { + $$ = $1; + } ; +markup_list: + markup_composed_list { + $$ = $1; + } + | markup_braced_list { + $$ = $1; + } + ; -/* -This should be done more dynamically if possible. -*/ -markup: - STRING { - $$ = make_simple_markup ($1); +markup_composed_list: + markup_head_1_list markup_braced_list { + $$ = scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, $2); + } - | MARKUP_HEAD_EMPTY { + ; + +markup_braced_list: + '{' markup_braced_list_body '}' { + $$ = scm_reverse_x ($2, SCM_EOL); + } + ; + +markup_braced_list_body: + /* empty */ { $$ = SCM_EOL; } + | markup_braced_list_body markup { + $$ = scm_cons ($2, $1); + } + | markup_braced_list_body markup_list { + $$ = scm_append_x (scm_list_2 (scm_reverse_x ($2, SCM_EOL), $1)); + } + ; + +markup_head_1_item: + MARKUP_HEAD_MARKUP0 { $$ = scm_list_1 ($1); } - | MARKUP_HEAD_MARKUP0 markup { + | MARKUP_HEAD_SCM0_MARKUP1 embedded_scm { $$ = scm_list_2 ($1, $2); } - | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup { + | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm { $$ = scm_list_3 ($1, $2, $3); } - | MARKUP_HEAD_SCM0_MARKUP1 SCM_T markup { - $$ = scm_list_3 ($1, $2, $3); + ; + +markup_head_1_list: + markup_head_1_item { + $$ = scm_list_1 ($1); + } + | markup_head_1_list markup_head_1_item { + $$ = scm_cons ($2, $1); + } + ; + +simple_markup: + STRING { + $$ = make_simple_markup ($1); + } + | MARKUP_IDENTIFIER { + $$ = $1; } - | markup_line { + | LYRIC_MARKUP_IDENTIFIER { $$ = $1; } - | MARKUP_HEAD_LIST0 markup_list { - $$ = scm_list_2 ($1,$2); + | STRING_IDENTIFIER { + $$ = $1; + } + | SCORE { + SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames"); + PARSER->lexer_->push_note_state (alist_to_hashq (nn)); + } '{' score_body '}' { + Score * sc = $4; + $$ = scm_list_2 (ly_lily_module_constant ("score-markup"), sc->self_scm ()); + sc->unprotect (); + PARSER->lexer_->pop_state (); } | MARKUP_HEAD_SCM0 embedded_scm { $$ = scm_list_2 ($1, $2); } - | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm markup { - $$ = scm_list_4 ($1, $2, $3, $4); - } | MARKUP_HEAD_SCM0_SCM1_SCM2 embedded_scm embedded_scm embedded_scm { $$ = scm_list_4 ($1, $2, $3, $4); } | MARKUP_HEAD_SCM0_SCM1 embedded_scm embedded_scm { $$ = scm_list_3 ($1, $2, $3); } - | MARKUP_IDENTIFIER { - $$ = $1; + | MARKUP_HEAD_EMPTY { + $$ = scm_list_1 ($1); } - | STRING_IDENTIFIER { - $$ = $1; + | MARKUP_HEAD_LIST0 markup_list { + $$ = scm_list_2 ($1,$2); + } + | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup { + $$ = scm_list_3 ($1, $2, $3); } ; - -markup_list: - chord_open markup_list_body chord_close { $$ = scm_reverse_x ($2, SCM_EOL); } - ; - -markup_line: - '{' markup_list_body '}' { - static SCM line ; - if (!line) - line = scm_c_eval_string ("line-markup"); - $$ = scm_list_2 (line, scm_reverse_x ($2, SCM_EOL)); +markup: + markup_head_1_list simple_markup { + SCM mapper = ly_lily_module_constant ("map-markup-command-list"); + $$ = scm_car (scm_call_2 (mapper, $1, scm_list_1 ($2))); } - ; - -markup_list_body: - /**/ { $$ = SCM_EOL; } - | markup_list_body markup { - $$ = gh_cons ($2, $1) ; + | simple_markup { + $$ = $1; } ; - %% void -My_lily_parser::set_yydebug (bool ) +Lily_parser::set_yydebug (bool ) { #if 0 yydebug = 1; #endif } -extern My_lily_parser * current_parser; - void -My_lily_parser::do_yyparse () +Lily_parser::do_yyparse () { - current_parser = this;; yyparse ((void*)this); } -/* -Should make this optional? It will also complain when you do - - [s4] - -which is entirely legitimate. - -Or we can scrap it. Barchecks should detect wrong durations, and -skipTypesetting speeds it up a lot. -*/ - -void -My_lily_parser::beam_check (SCM dur) -{ - Duration *d = unsmob_duration (dur); - if (unsmob_music (last_beam_start_) && d->duration_log () <= 2) - { - Music * m = unsmob_music (last_beam_start_); - m->origin ()->warning (_("Suspect duration found following this beam")); - } - last_beam_start_ = SCM_EOL; -} - @@ -2411,128 +2368,193 @@ otherwise, we have to import music classes into the lexer. */ int -My_lily_lexer::try_special_identifiers (SCM * destination, SCM sid) +Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) { - if (gh_string_p (sid)) { + if (scm_is_string (sid)) { *destination = sid; return STRING_IDENTIFIER; - } else if (gh_number_p (sid)) { + } else if (unsmob_book (sid)) { + *destination = unsmob_book (sid)->clone ()->self_scm (); + return BOOK_IDENTIFIER; + } else if (scm_is_number (sid)) { *destination = sid; return NUMBER_IDENTIFIER; } else if (unsmob_context_def (sid)) { *destination = unsmob_context_def (sid)->clone_scm (); return CONTEXT_DEF_IDENTIFIER; } else if (unsmob_score (sid)) { - Score *sc = new Score (*unsmob_score (sid)); - *destination =sc->self_scm (); + Score *score = new Score (*unsmob_score (sid)); + *destination = score->self_scm (); return SCORE_IDENTIFIER; - } else if (Music * mus =unsmob_music (sid)) { + } else if (Music *mus = unsmob_music (sid)) { mus = mus->clone (); *destination = mus->self_scm (); unsmob_music (*destination)-> set_property ("origin", make_input (last_input_)); - return dynamic_cast (mus) - ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER; + + bool is_event = scm_memq (ly_symbol2scm ("event"), mus->get_property ("types")) + != SCM_BOOL_F; + + return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER; } else if (unsmob_duration (sid)) { *destination = unsmob_duration (sid)->smobbed_copy (); return DURATION_IDENTIFIER; - } else if (unsmob_music_output_def (sid)) { - Music_output_def *p = unsmob_music_output_def (sid); + } else if (unsmob_output_def (sid)) { + Output_def *p = unsmob_output_def (sid); p = p->clone (); *destination = p->self_scm (); - return MUSIC_OUTPUT_DEF_IDENTIFIER; - } else if (Text_item::markup_p (sid)) { + return OUTPUT_DEF_IDENTIFIER; + } else if (Text_interface::is_markup (sid)) { *destination = sid; + if (is_lyric_state ()) + return LYRIC_MARKUP_IDENTIFIER; return MARKUP_IDENTIFIER; } return -1; } -Music * -property_op_to_music (SCM op) +SCM +get_next_unique_context_id () { - Music * m = 0; - SCM tag = gh_car (op); - SCM symbol = gh_cadr (op); - SCM args = gh_cddr (op); - SCM grob_val = SCM_UNDEFINED; - SCM grob_sym = SCM_UNDEFINED; - SCM val = SCM_UNDEFINED; - - if (tag == ly_symbol2scm ("assign")) - { - m = MY_MAKE_MUSIC ("PropertySet"); - val = gh_car (args); - } - else if (tag == ly_symbol2scm ("unset")) - m = MY_MAKE_MUSIC ("PropertyUnset"); - else if (tag == ly_symbol2scm ("poppush") - || tag == ly_symbol2scm ("push")) - { - m = MY_MAKE_MUSIC ("OverrideProperty"); - grob_sym = gh_car (args); - grob_val = gh_cadr (args); - } - else if (tag == ly_symbol2scm ("pop")) { - m = MY_MAKE_MUSIC ("RevertProperty"); - grob_sym = gh_car (args); - } + return scm_makfrom0str ("$uniqueContextId"); +} - m->set_property ("symbol", symbol); - if (val != SCM_UNDEFINED) - m->set_property ("value", val); - if (grob_val != SCM_UNDEFINED) - m->set_property ("grob-value", grob_val); +SCM +get_next_unique_lyrics_context_id () +{ + static int new_context_count; + char s[128]; + snprintf (s, sizeof (s)-1, "uniqueContext%d", new_context_count++); + return scm_makfrom0str (s); +} + + +SCM +run_music_function (Lily_parser *parser, SCM expr) +{ + SCM func = scm_car (expr); + Input *loc = unsmob_input (scm_cadr (expr)); + SCM args = scm_cddr (expr); + SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature")); + + SCM type_check_proc = ly_lily_module_constant ("type-check-list"); + + if (!to_boolean (scm_call_3 (type_check_proc, scm_cadr (expr), sig, args))) + { + parser->error_level_ = 1; + return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("void-music"), scm_list_2 (parser->self_scm (), make_input (*loc))); + } + + SCM syntax_args = scm_list_4 (parser->self_scm (), make_input (*loc), func, args); + return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("music-function"), syntax_args); +} + +bool +is_regular_identifier (SCM id) +{ + string str = ly_scm2string (id); + char const *s = str.c_str (); + + bool v = true; +#if 0 + isalpha (*s); + s++; +#endif + while (*s && v) + { + v = v && isalnum (*s); + s++; + } + return v; +} - if (grob_sym != SCM_UNDEFINED) - { - bool itc = internal_type_checking_global_b; - /* UGH. - */ - bool autobeam = gh_equal_p (symbol, ly_symbol2scm ("autoBeamSettings")); - if (autobeam) - internal_type_checking_global_b = false; - m->set_property ("grob-property", grob_sym); - if (autobeam) - internal_type_checking_global_b = itc; - } - if (op == ly_symbol2scm ("poppush")) - m->set_property ("pop-first", SCM_BOOL_T); +SCM +get_first_context_id (SCM type, Music *m) +{ + SCM id = m->get_property ("context-id"); + if (SCM_BOOL_T == scm_equal_p (m->get_property ("context-type"), type) + && scm_is_string (m->get_property ("context-id")) + && scm_c_string_length (id) > 0) + { + return id; + } + return SCM_EOL; +} +SCM +make_simple_markup (SCM a) +{ + return a; +} - return m; +bool +is_duration (int t) +{ + return t && t == 1 << intlog2 (t); } -Music* -context_spec_music (SCM type, SCM id, Music * m, SCM ops) +void +set_music_properties (Music *p, SCM a) { - Music * csm = MY_MAKE_MUSIC ("ContextSpeccedMusic"); + for (SCM k = a; scm_is_pair (k); k = scm_cdr (k)) + p->internal_set_property (scm_caar (k), scm_cdar (k)); +} - csm->set_property ("element", m->self_scm ()); - scm_gc_unprotect_object (m->self_scm ()); - csm->set_property ("context-type", - gh_symbol_p (type) ? type : scm_string_to_symbol (type)); - csm->set_property ("property-operations", ops); +SCM +make_chord_step (int step, int alter) +{ + if (step == 7) + alter += FLAT; - if (gh_string_p (id)) - csm->set_property ("context-id", id); - return csm; + while (step < 0) + step += 7; + Pitch m ((step -1) / 7, (step - 1) % 7, alter); + return m.smobbed_copy (); } SCM -get_next_unique_context () +make_chord_elements (SCM pitch, SCM dur, SCM modification_list) { - static int new_context_count; + SCM chord_ctor = ly_lily_module_constant ("construct-chord-elements"); + return scm_call_3 (chord_ctor, pitch, dur, modification_list); +} - char s[1024]; - snprintf (s, 1024, "uniqueContext%d", new_context_count ++); - - return scm_makfrom0str (s); + +/* Todo: actually also use apply iso. call too ... */ +bool +ly_input_procedure_p (SCM x) +{ + return ly_is_procedure (x) + || (scm_is_pair (x) && ly_is_procedure (scm_car (x))); +} + +SCM +make_music_relative (Pitch start, SCM music) +{ + Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic"); + relative->set_property ("element", music); + + Music *m = unsmob_music (music); + Pitch last = m->to_relative_octave (start); + if (lily_1_8_relative) + m->set_property ("last-pitch", last.smobbed_copy ()); + return relative->unprotect (); } +int +yylex (YYSTYPE *s, YYLTYPE *loc, void *v) +{ + Lily_parser *pars = (Lily_parser*) v; + Lily_lexer *lex = pars->lexer_; + + lex->lexval = (void*) s; + lex->lexloc = loc; + lex->prepare_for_next_token (); + return lex->yylex (); +}