X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=13f071a2881286008e95e752b23fa638698ed9f9;hb=f92a7cd52fc45a083bbd7bc54130d14b314d9a4b;hp=901ac1a1cb5d8eeaa9c4269c1a65580ea91a99fe;hpb=82efa40ed14c81d619624e2589523ddfd6fb7998;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 901ac1a1cb..13f071a288 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1,8 +1,8 @@ -/* -*- mode: c++; c-file-style: "linux" -*- */ +/* -*- mode: c++; c-file-style: "linux"; indent-tabs-mode: t -*- */ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2012 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -29,24 +29,36 @@ %{ -#define YYDEBUG 1 -#define YYERROR_VERBOSE 1 - #define yyerror Lily_parser::parser_error /* We use custom location type: Input objects */ #define YYLTYPE Input +#define YYSTYPE SCM #define YYLLOC_DEFAULT(Current,Rhs,N) \ ((Current).set_location ((Rhs)[1], (Rhs)[N])) +#define YYPRINT(file, type, value) \ + do { \ + if (scm_is_eq (value, SCM_UNSPECIFIED)) \ + break; \ + char *p = scm_to_locale_string \ + (scm_simple_format (SCM_BOOL_F, \ + scm_from_locale_string ("~S"), \ + scm_list_1 (value))); \ + fputs (p, file); \ + free (p); \ + } while (0) %} %parse-param {Lily_parser *parser} +%parse-param {SCM *retval} %lex-param {Lily_parser *parser} +%error-verbose +%debug /* 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 +deleting them. Let's hope that a stack overflow doesn't trigger a move of the parse stack onto the heap. */ %left PREC_BOT @@ -145,7 +157,7 @@ using namespace std; #include "warn.hh" void -Lily_parser::parser_error (Input const *i, Lily_parser *parser, string s) +Lily_parser::parser_error (Input const *i, Lily_parser *parser, SCM *, string s) { parser->parser_error (*i, s); } @@ -180,15 +192,6 @@ while (0) %} -%union { - Book *book; - Output_def *outputdef; - SCM scm; - std::string *string; - Score *score; - int i; -} - %{ #define MY_MAKE_MUSIC(x, spot) make_music_with_input (ly_symbol2scm (x), spot) @@ -201,7 +204,7 @@ while (0) 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)); + LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (parser->self_scm (), make_input (location) , ##__VA_ARGS__, SCM_UNDEFINED)) #define START_MAKE_SYNTAX(name, ...) \ scm_list_n (ly_lily_module_constant (name) , ##__VA_ARGS__, SCM_UNDEFINED) #define FINISH_MAKE_SYNTAX(start, location, ...) \ @@ -222,14 +225,14 @@ SCM get_next_unique_lyrics_context_id (); static Music *make_music_with_input (SCM name, Input where); SCM check_scheme_arg (Lily_parser *parser, Input loc, SCM arg, SCM args, SCM pred); +SCM make_music_from_simple (Lily_parser *parser, Input loc, SCM pitch); SCM loc_on_music (Input loc, SCM arg); -SCM make_chord_elements (SCM pitch, SCM dur, SCM modification_list); -SCM make_chord_step (int step, Rational alter); +SCM make_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list); +SCM make_chord_step (SCM step, Rational alter); SCM make_simple_markup (SCM a); bool is_duration (int t); bool is_regular_identifier (SCM id); int yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser); -void set_music_properties (Music *p, SCM a); %} @@ -241,6 +244,7 @@ void set_music_properties (Music *p, SCM a); */ /* Keyword tokens with plain escaped name. */ +%token END_OF_FILE 0 "end of input" %token ACCEPTS "\\accepts" %token ADDLYRICS "\\addlyrics" %token ALIAS "\\alias" @@ -327,226 +331,55 @@ If we give names, Bison complains. %token MULTI_MEASURE_REST -%token E_UNSIGNED -%token UNSIGNED +%token E_UNSIGNED +%token UNSIGNED /* Artificial tokens, for more generic function syntax */ -%token EXPECT_MARKUP "markup?" -%token EXPECT_PITCH "ly:pitch?" -%token EXPECT_DURATION "ly:duration?" -%token EXPECT_SCM "scheme?" -%token BACKUP "(backed-up?)" -%token REPARSE "(reparsed?)" -%token EXPECT_MARKUP_LIST "markup-list?" -%token EXPECT_OPTIONAL "optional?" +%token EXPECT_MARKUP "markup?" +%token EXPECT_PITCH "ly:pitch?" +%token EXPECT_DURATION "ly:duration?" +%token EXPECT_SCM "scheme?" +%token BACKUP "(backed-up?)" +%token REPARSE "(reparsed?)" +%token EXPECT_MARKUP_LIST "markup-list?" +%token EXPECT_OPTIONAL "optional?" /* After the last argument. */ -%token EXPECT_NO_MORE_ARGS; +%token EXPECT_NO_MORE_ARGS; /* An artificial token for parsing embedded Lilypond */ -%token EMBEDDED_LILY "#{" - -%token BOOK_IDENTIFIER -%token CHORDMODIFIER_PITCH -%token CHORD_MODIFIER -%token CHORD_REPETITION -%token CONTEXT_DEF_IDENTIFIER -%token CONTEXT_MOD_IDENTIFIER -%token DRUM_PITCH -%token PITCH_IDENTIFIER -%token DURATION_IDENTIFIER -%token EVENT_IDENTIFIER -%token EVENT_FUNCTION -%token FRACTION -%token LYRICS_STRING -%token LYRIC_ELEMENT -%token LYRIC_MARKUP_IDENTIFIER -%token MARKUP_FUNCTION -%token MARKUP_LIST_FUNCTION -%token MARKUP_IDENTIFIER -%token MARKUPLIST_IDENTIFIER -%token MUSIC_FUNCTION -%token MUSIC_IDENTIFIER -%token NOTENAME_PITCH -%token NUMBER_IDENTIFIER -%token OUTPUT_DEF_IDENTIFIER -%token REAL -%token RESTNAME -%token SCM_FUNCTION -%token SCM_IDENTIFIER -%token SCM_TOKEN -%token SCORE_IDENTIFIER -%token STRING -%token STRING_IDENTIFIER -%token TONICNAME_PITCH - - -%type book_block -%type book_body -%type bookpart_block -%type bookpart_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 braced_music_list -%type closed_music -%type music -%type music_bare -%type music_arg -%type complex_music -%type complex_music_prefix -%type mode_changed_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_modification -%type context_change -%type direction_less_event -%type direction_reqd_event -%type embedded_lilypond -%type event_chord -%type fingering -%type gen_text_def -%type music_property_def -%type note_chord_element -%type post_event -%type post_event_nofinger -%type re_rhythmed_music -%type simple_element -%type simple_music_property_def -%type start_symbol -%type string_number_event -%type tempo_event - -%type output_def_body -%type output_def_head -%type output_def_head_with_mode_switch -%type output_def -%type paper_block - -%type music_function_call -%type music_list -%type assignment_id -%type bare_number -%type bare_number_closed -%type unsigned_number -%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 embedded_scm_arg -%type embedded_scm_arg_closed -%type embedded_scm_bare -%type embedded_scm_bare_arg -%type embedded_scm_closed -%type embedded_scm_chord_body -%type event_function_event -%type figure_list -%type figure_spec -%type fraction -%type full_markup -%type full_markup_list -%type function_arglist -%type function_arglist_optional -%type function_arglist_backup -%type function_arglist_nonbackup -%type function_arglist_skip -%type function_arglist_bare -%type function_arglist_closed -%type function_arglist_closed_optional -%type function_arglist_common -%type function_arglist_common_lyric -%type function_arglist_common_minus -%type function_arglist_closed_common -%type function_arglist_keep -%type function_arglist_closed_keep -%type identifier_init -%type lilypond -%type lilypond_header -%type lilypond_header_body -%type lyric_element -%type lyric_element_arg -%type lyric_element_music -%type lyric_markup -%type markup -%type markup_braced_list -%type markup_braced_list_body -%type markup_composed_list -%type markup_command_list -%type markup_command_list_arguments -%type markup_command_basic_arguments -%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 music_function_event -%type music_function_chord_body -%type music_function_chord_body_arglist -%type new_chord -%type new_lyrics -%type number_expression -%type number_factor -%type number_term -%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 property_path property_path_revved -%type scalar -%type scalar_closed -%type scm_function_call -%type scm_function_call_closed -%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 tempo_range - -%type score_block -%type score_body - +%token EMBEDDED_LILY "#{" + +%token BOOK_IDENTIFIER +%token CHORDMODIFIER_PITCH +%token CHORD_MODIFIER +%token CHORD_REPETITION +%token CONTEXT_DEF_IDENTIFIER +%token CONTEXT_MOD_IDENTIFIER +%token DRUM_PITCH +%token PITCH_IDENTIFIER +%token DURATION_IDENTIFIER +%token EVENT_IDENTIFIER +%token EVENT_FUNCTION +%token FRACTION +%token LYRICS_STRING +%token LYRIC_ELEMENT +%token MARKUP_FUNCTION +%token MARKUP_LIST_FUNCTION +%token MARKUP_IDENTIFIER +%token MARKUPLIST_IDENTIFIER +%token MUSIC_FUNCTION +%token MUSIC_IDENTIFIER +%token NOTENAME_PITCH +%token NUMBER_IDENTIFIER +%token OUTPUT_DEF_IDENTIFIER +%token REAL +%token RESTNAME +%token SCM_FUNCTION +%token SCM_IDENTIFIER +%token SCM_TOKEN +%token SCORE_IDENTIFIER +%token STRING +%token TONICNAME_PITCH %left '-' '+' @@ -561,14 +394,14 @@ start_symbol: lilypond | EMBEDDED_LILY { SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_note_state (alist_to_hashq (nn)); + parser->lexer_->push_note_state (nn); } embedded_lilypond { parser->lexer_->pop_state (); - parser->lexer_->set_identifier (ly_symbol2scm ("parseStringResult"), $3); + *retval = $3; } ; -lilypond: /* empty */ { } +lilypond: /* empty */ { $$ = SCM_UNSPECIFIED; } | lilypond toplevel_expression { } | lilypond assignment { @@ -583,32 +416,26 @@ lilypond: /* empty */ { } toplevel_expression: - lilypond_header { - parser->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1); + { + parser->lexer_->add_scope (get_header (parser)); + } lilypond_header { + parser->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $2); } | 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 (); + scm_call_2 (proc, parser->self_scm (), $1); } | bookpart_block { - Book *bookpart = $1; SCM proc = parser->lexer_->lookup_identifier ("toplevel-bookpart-handler"); - scm_call_2 (proc, parser->self_scm (), bookpart->self_scm ()); - bookpart->unprotect (); + scm_call_2 (proc, parser->self_scm (), $1); } | score_block { - Score *score = $1; - SCM proc = parser->lexer_->lookup_identifier ("toplevel-score-handler"); - scm_call_2 (proc, parser->self_scm (), score->self_scm ()); - score->unprotect (); + scm_call_2 (proc, parser->self_scm (), $1); } | composite_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 ()); + scm_call_2 (proc, parser->self_scm (), $1); } | full_markup { SCM proc = parser->lexer_->lookup_identifier ("toplevel-text-handler"); @@ -618,58 +445,63 @@ toplevel_expression: SCM proc = parser->lexer_->lookup_identifier ("toplevel-text-handler"); scm_call_2 (proc, parser->self_scm (), $1); } + | SCM_TOKEN { + // Evaluate and ignore #xxx, as opposed to \xxx + parser->lexer_->eval_scm_token ($1); + } + | embedded_scm_active + { + SCM out = SCM_UNDEFINED; + if (Text_interface::is_markup ($1)) + out = scm_list_1 ($1); + else if (Text_interface::is_markup_list ($1)) + out = $1; + if (scm_is_pair (out)) + { + SCM proc = parser->lexer_->lookup_identifier ("toplevel-text-handler"); + scm_call_2 (proc, parser->self_scm (), out); + } else if (!scm_is_eq ($1, SCM_UNSPECIFIED)) + parser->parser_error (@1, _("bad expression type")); + } | output_def { SCM id = SCM_EOL; - Output_def * od = $1; + Output_def * od = unsmob_output_def ($1); - if ($1->c_variable ("is-paper") == SCM_BOOL_T) + if (od->c_variable ("is-paper") == SCM_BOOL_T) id = ly_symbol2scm ("$defaultpaper"); - else if ($1->c_variable ("is-midi") == SCM_BOOL_T) + else if (od->c_variable ("is-midi") == SCM_BOOL_T) id = ly_symbol2scm ("$defaultmidi"); - else if ($1->c_variable ("is-layout") == SCM_BOOL_T) + else if (od->c_variable ("is-layout") == SCM_BOOL_T) id = ly_symbol2scm ("$defaultlayout"); - parser->lexer_->set_identifier (id, od->self_scm ()); - od->unprotect(); + parser->lexer_->set_identifier (id, $1); } ; embedded_scm_bare: SCM_TOKEN { - $$ = parser->lexer_->eval_scm ($1); + $$ = parser->lexer_->eval_scm_token ($1); } | SCM_IDENTIFIER ; +embedded_scm_active: + SCM_IDENTIFIER + | scm_function_call + ; + embedded_scm_bare_arg: embedded_scm_bare | STRING - | STRING_IDENTIFIER | full_markup | full_markup_list | context_modification | score_block - { - $$ = $1->self_scm (); - $1->unprotect (); - } | context_def_spec_block | book_block - { - $$ = $1->self_scm (); - $1->unprotect (); - } | bookpart_block - { - $$ = $1->self_scm (); - $1->unprotect (); - } | output_def - { - $$ = $1->self_scm (); - $1->unprotect (); - } ; /* The generic version may end in music, or not */ @@ -698,26 +530,32 @@ embedded_lilypond: $$ = MAKE_SYNTAX ("void-music", @$); } | identifier_init - | music music music_list { - $$ = MAKE_SYNTAX ("sequential-music", @$, - scm_cons2 ($1, $2, scm_reverse_x ($3, SCM_EOL))); + | music_embedded music_embedded music_list { + $3 = scm_reverse_x ($3, SCM_EOL); + if (unsmob_music ($2)) + $3 = scm_cons ($2, $3); + if (unsmob_music ($1)) + $3 = scm_cons ($1, $3); + $$ = MAKE_SYNTAX ("sequential-music", @$, $3); } | error { parser->error_level_ = 1; + $$ = SCM_UNSPECIFIED; } | INVALID embedded_lilypond { parser->error_level_ = 1; + $$ = $2; } ; lilypond_header_body: - { - $$ = get_header (parser); - parser->lexer_->add_scope ($$); - } + /* empty */ { $$ = SCM_UNSPECIFIED; } | lilypond_header_body assignment { + } + | lilypond_header_body embedded_scm { + } ; @@ -738,76 +576,30 @@ assignment_id: assignment: assignment_id '=' identifier_init { parser->lexer_->set_identifier ($1, $3); + $$ = SCM_UNSPECIFIED; } | assignment_id property_path '=' identifier_init { SCM path = scm_cons (scm_string_to_symbol ($1), $2); parser->lexer_->set_identifier (path, $4); - ; -/* - TODO: devise standard for protection in parser. - - The parser stack lives on the C-stack, which means that -all objects can be unprotected as soon as they're here. - -*/ + $$ = SCM_UNSPECIFIED; } - | embedded_scm { } ; identifier_init: - score_block { - $$ = $1->self_scm (); - $1->unprotect (); - } - | book_block { - $$ = $1->self_scm (); - $1->unprotect (); - } - | bookpart_block { - $$ = $1->self_scm (); - $1->unprotect (); - } - | output_def { - $$ = $1->self_scm (); - $1->unprotect (); - } - | context_def_spec_block { - $$ = $1; - } - | music { - /* Hack: Create event-chord around standalone events. - Prevents the identifier from being interpreted as a post-event. */ - Music *mus = unsmob_music ($1); - bool is_event = mus && - (scm_memq (ly_symbol2scm ("event"), mus->get_property ("types")) - != SCM_BOOL_F); - if (!is_event) - $$ = $1; - else - $$ = MAKE_SYNTAX ("event-chord", @$, scm_list_1 ($1)); - } - | post_event_nofinger { - $$ = $1; - } - | number_expression { - $$ = $1; - } - | string { - $$ = $1; - } - | embedded_scm { - $$ = $1; - } - | full_markup { - $$ = $1; - } - | full_markup_list { - $$ = $1; - } - | context_modification { - $$ = $1; - } + score_block + | book_block + | bookpart_block + | output_def + | context_def_spec_block + | music_assign + | post_event_nofinger + | number_expression + | FRACTION + | string + | embedded_scm + | full_markup_list + | context_modification ; context_def_spec_block: @@ -817,6 +609,27 @@ context_def_spec_block: } ; +context_mod_arg: + embedded_scm + | composite_music + ; + +context_mod_embedded: + context_mod_arg + { + if (unsmob_music ($1)) { + SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler"); + $1 = scm_call_2 (proc, parser->self_scm (), $1); + } + if (unsmob_context_mod ($1)) + $$ = $1; + else { + parser->parser_error (@1, _ ("not a context mod")); + } + } + ; + + context_def_spec_body: /**/ { $$ = Context_def::make_scm (); @@ -826,18 +639,6 @@ context_def_spec_body: $$ = $1; unsmob_context_def ($$)->origin ()->set_spot (@$); } - | context_def_spec_body embedded_scm { - if (Context_mod *cm = unsmob_context_mod ($2)) { - SCM p = cm->get_mods (); - Context_def*td = unsmob_context_def ($$); - - for (; scm_is_pair (p); p = scm_cdr (p)) { - td->add_context_mod (scm_car (p)); - } - } else { - parser->parser_error (@2, _ ("not a context mod")); - } - } | context_def_spec_body context_mod { unsmob_context_def ($$)->add_context_mod ($2); } @@ -848,6 +649,13 @@ context_def_spec_body: td->add_context_mod (scm_car (m)); } } + | context_def_spec_body context_mod_embedded { + Context_def *td = unsmob_context_def ($$); + SCM new_mods = unsmob_context_mod ($2)->get_mods (); + for (SCM m = new_mods; scm_is_pair (m); m = scm_cdr (m)) { + td->add_context_mod (scm_car (m)); + } + } ; @@ -865,61 +673,71 @@ book_block: * grok \layout and \midi? */ book_body: { - $$ = new Book; + Book *book = new Book; init_papers (parser); - $$->origin ()->set_spot (@$); - $$->paper_ = dynamic_cast (unsmob_output_def (parser->lexer_->lookup_identifier ("$defaultpaper"))->clone ()); - $$->paper_->unprotect (); - push_paper (parser, $$->paper_); - $$->header_ = parser->lexer_->lookup_identifier ("$defaultheader"); - parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $$->self_scm ()); - parser->lexer_->set_identifier (ly_symbol2scm ("book-output-suffix"), SCM_BOOL_F); - parser->lexer_->set_identifier (ly_symbol2scm ("book-filename"), SCM_BOOL_F); + book->origin ()->set_spot (@$); + book->paper_ = dynamic_cast (unsmob_output_def (parser->lexer_->lookup_identifier ("$defaultpaper"))->clone ()); + book->paper_->unprotect (); + push_paper (parser, book->paper_); + book->header_ = get_header (parser); + $$ = book->unprotect (); + parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $$); } | BOOK_IDENTIFIER { - $$ = unsmob_book ($1); - $$->protect (); - $$->origin ()->set_spot (@$); + unsmob_book ($1)->origin ()->set_spot (@$); parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $1); } | book_body paper_block { - $$->paper_ = $2; - $2->unprotect (); - set_paper (parser, $2); + unsmob_book ($1)->paper_ = unsmob_output_def ($2); + set_paper (parser, unsmob_output_def ($2)); } | book_body bookpart_block { - Book *bookpart = $2; SCM proc = parser->lexer_->lookup_identifier ("book-bookpart-handler"); - scm_call_2 (proc, $$->self_scm (), bookpart->self_scm ()); - bookpart->unprotect (); + scm_call_2 (proc, $1, $2); } | book_body score_block { - Score *score = $2; SCM proc = parser->lexer_->lookup_identifier ("book-score-handler"); - scm_call_2 (proc, $$->self_scm (), score->self_scm ()); - score->unprotect (); + scm_call_2 (proc, $1, $2); } | book_body composite_music { - Music *music = unsmob_music ($2); SCM proc = parser->lexer_->lookup_identifier ("book-music-handler"); - scm_call_3 (proc, parser->self_scm (), $$->self_scm (), music->self_scm ()); + scm_call_3 (proc, parser->self_scm (), $1, $2); } | book_body full_markup { SCM proc = parser->lexer_->lookup_identifier ("book-text-handler"); - scm_call_2 (proc, $$->self_scm (), scm_list_1 ($2)); + scm_call_2 (proc, $1, scm_list_1 ($2)); } | book_body full_markup_list { SCM proc = parser->lexer_->lookup_identifier ("book-text-handler"); - scm_call_2 (proc, $$->self_scm (), $2); + scm_call_2 (proc, $1, $2); } - | book_body lilypond_header { - $$->header_ = $2; + | book_body SCM_TOKEN { + // Evaluate and ignore #xxx, as opposed to \xxx + parser->lexer_->eval_scm_token ($2); } - | book_body embedded_scm { } + | book_body embedded_scm_active + { + SCM out = SCM_UNDEFINED; + if (Text_interface::is_markup ($2)) + out = scm_list_1 ($2); + else if (Text_interface::is_markup_list ($2)) + out = $2; + if (scm_is_pair (out)) + { + SCM proc = parser->lexer_->lookup_identifier ("book-text-handler"); + scm_call_2 (proc, $1, out); + } else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) + parser->parser_error (@2, _("bad expression type")); + } + | book_body + { + parser->lexer_->add_scope (unsmob_book ($1)->header_); + } lilypond_header | book_body error { - $$->paper_ = 0; - $$->scores_ = SCM_EOL; - $$->bookparts_ = SCM_EOL; + Book *book = unsmob_book ($1); + book->paper_ = 0; + book->scores_ = SCM_EOL; + book->bookparts_ = SCM_EOL; } ; @@ -932,46 +750,63 @@ bookpart_block: bookpart_body: { - $$ = new Book; - $$->origin ()->set_spot (@$); - parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $$->self_scm ()); + Book *book = new Book; + book->origin ()->set_spot (@$); + $$ = book->unprotect (); + parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $$); } | BOOK_IDENTIFIER { - $$ = unsmob_book ($1); - $$->protect (); - $$->origin ()->set_spot (@$); + unsmob_book ($1)->origin ()->set_spot (@$); parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $1); } | bookpart_body paper_block { - $$->paper_ = $2; - $2->unprotect (); + unsmob_book ($$)->paper_ = unsmob_output_def ($2); } | bookpart_body score_block { - Score *score = $2; SCM proc = parser->lexer_->lookup_identifier ("bookpart-score-handler"); - scm_call_2 (proc, $$->self_scm (), score->self_scm ()); - score->unprotect (); + scm_call_2 (proc, $1, $2); } | bookpart_body composite_music { - Music *music = unsmob_music ($2); SCM proc = parser->lexer_->lookup_identifier ("bookpart-music-handler"); - scm_call_3 (proc, parser->self_scm (), $$->self_scm (), music->self_scm ()); + scm_call_3 (proc, parser->self_scm (), $1, $2); } | bookpart_body full_markup { SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler"); - scm_call_2 (proc, $$->self_scm (), scm_list_1 ($2)); + scm_call_2 (proc, $1, scm_list_1 ($2)); } | bookpart_body full_markup_list { SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler"); - scm_call_2 (proc, $$->self_scm (), $2); + scm_call_2 (proc, $1, $2); } - | bookpart_body lilypond_header { - $$->header_ = $2; + | bookpart_body SCM_TOKEN { + // Evaluate and ignore #xxx, as opposed to \xxx + parser->lexer_->eval_scm_token ($2); } - | bookpart_body embedded_scm { } + | bookpart_body embedded_scm_active + { + SCM out = SCM_UNDEFINED; + if (Text_interface::is_markup ($2)) + out = scm_list_1 ($2); + else if (Text_interface::is_markup_list ($2)) + out = $2; + if (scm_is_pair (out)) + { + SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler"); + scm_call_2 (proc, $1, out); + } else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) + parser->parser_error (@2, _("bad expression type")); + } + | bookpart_body + { + Book *book = unsmob_book ($1); + if (!ly_is_module (book->header_)) + book->header_ = ly_make_module (false); + parser->lexer_->add_scope (book->header_); + } lilypond_header | bookpart_body error { - $$->paper_ = 0; - $$->scores_ = SCM_EOL; + Book *book = unsmob_book ($1); + book->paper_ = 0; + book->scores_ = SCM_EOL; } ; @@ -983,37 +818,35 @@ score_block: score_body: music { - SCM m = $1; SCM scorify = ly_lily_module_constant ("scorify-music"); - SCM score = scm_call_2 (scorify, m, parser->self_scm ()); + $$ = scm_call_2 (scorify, $1, parser->self_scm ()); - // pass ownernship to C++ again. - $$ = unsmob_score (score); - $$->protect (); - $$->origin ()->set_spot (@$); + unsmob_score ($$)->origin ()->set_spot (@$); } | SCORE_IDENTIFIER { - $$ = unsmob_score ($1); - $$->protect (); - $$->origin ()->set_spot (@$); - } - | score_body lilypond_header { - $$->set_header ($2); + unsmob_score ($$)->origin ()->set_spot (@$); } + | score_body + { + Score *score = unsmob_score ($1); + if (!ly_is_module (score->get_header ())) + score->set_header (ly_make_module (false)); + parser->lexer_->add_scope (score->get_header ()); + } lilypond_header | score_body output_def { - if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T) + Output_def *od = unsmob_output_def ($2); + if (od->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); + unsmob_score ($1)->add_output_def (od); } - $2->unprotect (); } | score_body error { - $$->error_found_ = true; + unsmob_score ($$)->error_found_ = true; } ; @@ -1024,12 +857,12 @@ score_body: paper_block: output_def { - $$ = $1; - if ($$->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T) + Output_def *od = unsmob_output_def ($1); + + if (od->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T) { parser->parser_error (@1, _ ("need \\paper for paper block")); - $1->unprotect (); - $$ = get_paper (parser); + $$ = get_paper (parser)->unprotect (); } } ; @@ -1046,20 +879,21 @@ output_def: output_def_head: PAPER { - $$ = get_paper (parser); - $$->input_origin_ = @$; - parser->lexer_->add_scope ($$->scope_); + Output_def *p = get_paper (parser); + p->input_origin_ = @$; + parser->lexer_->add_scope (p->scope_); + $$ = p->unprotect (); } | MIDI { Output_def *p = get_midi (parser); - $$ = p; + $$ = p->unprotect (); parser->lexer_->add_scope (p->scope_); } | LAYOUT { Output_def *p = get_layout (parser); parser->lexer_->add_scope (p->scope_); - $$ = p; + $$ = p->unprotect (); } ; @@ -1070,26 +904,58 @@ output_def_head_with_mode_switch: } ; +// We need this weird nonterminal because both music as well as a +// context definition can start with \context and the difference is +// only apparent after looking at the next token. If it is '{', there +// is still time to escape from notes mode. + +music_or_context_def: + music_arg + { + parser->lexer_->pop_state (); + } + | CONTEXT + { + parser->lexer_->pop_state (); + } '{' context_def_spec_body '}' + { + $$ = $4; + } + ; + output_def_body: output_def_head_with_mode_switch '{' { $$ = $1; - $$->input_origin_.set_spot (@$); + unsmob_output_def ($$)->input_origin_.set_spot (@$); } | output_def_head_with_mode_switch '{' OUTPUT_DEF_IDENTIFIER { - $1->unprotect (); - Output_def *o = unsmob_output_def ($3); o->input_origin_.set_spot (@$); - $$ = o; - $$->protect (); + $$ = o->self_scm (); parser->lexer_->remove_scope (); parser->lexer_->add_scope (o->scope_); } | output_def_body assignment { } - | output_def_body context_def_spec_block { - assign_context_def ($$, $2); + | output_def_body embedded_scm { + + } + | output_def_body + { + SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); + parser->lexer_->push_note_state (nn); + } music_or_context_def + { + if (unsmob_context_def ($3)) + assign_context_def (unsmob_output_def ($1), $3); + else { + + SCM proc = parser->lexer_->lookup_identifier + ("output-def-music-handler"); + scm_call_3 (proc, parser->self_scm (), + $1, $3); + } } | output_def_body error { @@ -1115,11 +981,9 @@ music_list: /* empty */ { $$ = SCM_EOL; } - | music_list music { - $$ = scm_cons ($2, $1); - } - | music_list embedded_scm { - + | music_list music_embedded { + if (unsmob_music ($2)) + $$ = scm_cons ($2, $1); } | music_list error { Music *m = MY_MAKE_MUSIC("Music", @$); @@ -1137,14 +1001,39 @@ braced_music_list: } ; -music: simple_music +music: music_arg | lyric_element_music - | composite_music %prec COMPOSITE + ; + +music_embedded: + music + | embedded_scm + { + if (unsmob_music ($1) + || scm_is_eq ($1, SCM_UNSPECIFIED)) + $$ = $1; + else + { + @$.warning (_ ("Ignoring non-music expression")); + $$ = SCM_UNSPECIFIED; + } + } ; music_arg: + simple_music + { + $$ = make_music_from_simple (parser, @1, $1); + if (!unsmob_music ($$)) + parser->parser_error (@1, _ ("music expected")); + } + | composite_music %prec COMPOSITE + ; + +music_assign: simple_music | composite_music %prec COMPOSITE + | lyric_element_music ; repeated_music: @@ -1229,12 +1118,9 @@ context_mod_list: if (md) unsmob_context_mod ($1)->add_context_mods (md->get_mods ()); } - | context_mod_list embedded_scm { - Context_mod *md = unsmob_context_mod ($2); - if (md) - unsmob_context_mod ($1)->add_context_mods (md->get_mods ()); - else - parser->parser_error (@2, _ ("not a context mod")); + | context_mod_list context_mod_embedded { + unsmob_context_mod ($1)->add_context_mods + (unsmob_context_mod ($2)->get_mods ()); } ; @@ -1250,6 +1136,7 @@ closed_music: { $$ = FINISH_MAKE_SYNTAX ($1, @$, $2); } + | music_function_call_closed ; music_bare: @@ -1284,21 +1171,13 @@ function_arglist_skip: ; -function_arglist_nonbackup: +function_arglist_nonbackup_common: EXPECT_OPTIONAL EXPECT_PITCH function_arglist pitch_also_in_chords { $$ = scm_cons ($4, $3); } | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed duration_length { $$ = scm_cons ($4, $3); } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg_closed - { - $$ = check_scheme_arg (parser, @4, $4, $3, $2); - } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number_closed - { - $$ = check_scheme_arg (parser, @4, $4, $3, $2); - } | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed FRACTION { $$ = check_scheme_arg (parser, @4, $4, $3, $2); @@ -1337,6 +1216,29 @@ function_arglist_nonbackup: } ; +function_arglist_closed_nonbackup: + function_arglist_nonbackup_common + | EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg_closed + { + $$ = check_scheme_arg (parser, @4, $4, $3, $2); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number_closed + { + $$ = check_scheme_arg (parser, @4, $4, $3, $2); + } + ; + +function_arglist_nonbackup: + function_arglist_nonbackup_common + | EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg + { + $$ = check_scheme_arg (parser, @4, $4, $3, $2); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number + { + $$ = check_scheme_arg (parser, @4, $4, $3, $2); + } + ; function_arglist_keep: function_arglist_common @@ -1490,11 +1392,6 @@ function_arglist_backup: $$ = check_scheme_arg (parser, @3, $3, $1, $2); } - | function_arglist_backup REPARSE fraction - { - $$ = check_scheme_arg (parser, @3, - $3, $1, $2); - } ; function_arglist: @@ -1514,7 +1411,7 @@ function_arglist_common: $$ = check_scheme_arg (parser, @3, $3, $2, $1); } - | EXPECT_SCM function_arglist_closed_optional fraction + | EXPECT_SCM function_arglist_closed_optional FRACTION { $$ = check_scheme_arg (parser, @3, $3, $2, $1); @@ -1605,7 +1502,7 @@ function_arglist_common_minus: function_arglist_closed: function_arglist_closed_common - | function_arglist_nonbackup + | function_arglist_closed_nonbackup ; function_arglist_closed_common: @@ -1653,7 +1550,7 @@ function_arglist_closed_common: $$ = check_scheme_arg (parser, @3, $3, $2, $1); } - | EXPECT_SCM function_arglist_closed_optional fraction + | EXPECT_SCM function_arglist_closed_optional FRACTION { $$ = check_scheme_arg (parser, @3, $3, $2, $1); @@ -1801,14 +1698,14 @@ mode_changed_music: mode_changing_head: NOTEMODE { SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_note_state (alist_to_hashq (nn)); + parser->lexer_->push_note_state (nn); $$ = ly_symbol2scm ("notes"); } | DRUMMODE { SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames"); - parser->lexer_->push_note_state (alist_to_hashq (nn)); + parser->lexer_->push_note_state (nn); $$ = ly_symbol2scm ("drums"); } @@ -1821,7 +1718,7 @@ mode_changing_head: 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)); + parser->lexer_->push_chord_state (nn); $$ = ly_symbol2scm ("chords"); } @@ -1834,7 +1731,7 @@ mode_changing_head: mode_changing_head_with_context: DRUMS { SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames"); - parser->lexer_->push_note_state (alist_to_hashq (nn)); + parser->lexer_->push_note_state (nn); $$ = ly_symbol2scm ("DrumStaff"); } @@ -1847,7 +1744,7 @@ mode_changing_head_with_context: 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)); + parser->lexer_->push_chord_state (nn); $$ = ly_symbol2scm ("ChordNames"); } | LYRICS @@ -1947,16 +1844,19 @@ context_mod: | context_def_mod STRING { $$ = scm_list_2 ($1, $2); } - | context_def_mod embedded_scm { - if (ly_symbol2scm ("consists") != $1) - { - $$ = SCM_EOL; - parser->parser_error (@1, _ ("only \\consists takes non-string argument.")); - } - else - { - $$ = scm_list_2 ($1, $2); - } + | context_def_mod embedded_scm + { + if (!scm_is_string ($2) + && ly_symbol2scm ("consists") != $1 + && ly_symbol2scm ("remove") != $1) + { + $$ = SCM_EOL; + parser->parser_error (@1, _ ("only \\consists and \\remove take non-string argument.")); + } + else + { + $$ = scm_list_2 ($1, $2); + } } ; @@ -2013,10 +1913,16 @@ string: STRING { $$ = $1; } - | STRING_IDENTIFIER { - $$ = $1; - } + | full_markup | string '+' string { + if (!scm_is_string ($1)) { + parser->parser_error (@1, (_ ("simple string expected"))); + $1 = scm_string (SCM_EOL); + } + if (!scm_is_string ($3)) { + parser->parser_error (@3, (_ ("simple string expected"))); + $3 = scm_string (SCM_EOL); + } $$ = scm_string_append (scm_list_2 ($1, $3)); } ; @@ -2027,29 +1933,45 @@ simple_string: STRING { | LYRICS_STRING { $$ = $1; } - | STRING_IDENTIFIER { - $$ = $1; + | embedded_scm_bare + { + if (scm_is_string ($1)) { + $$ = $1; + } else { + parser->parser_error (@1, (_ ("simple string expected"))); + $$ = scm_string (SCM_EOL); + } } ; scalar: embedded_scm_arg | bare_number + | FRACTION | lyric_element ; scalar_closed: embedded_scm_arg_closed | bare_number + | FRACTION | lyric_element ; event_chord: - /* TODO: Create a special case that avoids the creation of - EventChords around simple_elements that have no post_events? - */ - simple_chord_elements post_events { + simple_element post_events { + // Let the rhythmic music iterator sort this mess out. + if (scm_is_pair ($2)) { + $$ = make_music_from_simple (parser, @1, $1); + if (unsmob_music ($$)) + unsmob_music ($$)->set_property ("articulations", + scm_reverse_x ($2, SCM_EOL)); + else + parser->parser_error (@1, _("music expected")); + } + } + | simple_chord_elements post_events { SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL)); Input i; @@ -2062,8 +1984,6 @@ event_chord: Input i; i.set_location (@1, @3); $$ = MAKE_SYNTAX ("repetition-chord", i, - parser->lexer_->chord_repetition_.last_chord_, - parser->lexer_->chord_repetition_.repetition_function_, $2, scm_reverse_x ($3, SCM_EOL)); } | MULTI_MEASURE_REST optional_notemode_duration post_events { @@ -2073,13 +1993,7 @@ event_chord: scm_reverse_x ($3, SCM_EOL)); } | command_element - /* note chord elements are memorized into - parser->lexer_->chord_repetition_ so that the chord repetition - mechanism copy them when a chord repetition symbol is found - */ - | note_chord_element { - parser->lexer_->chord_repetition_.last_chord_ = $$; - } + | note_chord_element ; @@ -2111,23 +2025,24 @@ chord_body: chord_body_elements: /* empty */ { $$ = SCM_EOL; } | chord_body_elements chord_body_element { - $$ = scm_cons ($2, $1); + if (!SCM_UNBNDP ($2)) + $$ = scm_cons ($2, $1); } ; chord_body_element: pitch exclamations questions octave_check post_events { - int q = $3; - int ex = $2; + bool q = to_boolean ($3); + bool ex = to_boolean ($2); SCM check = $4; SCM post = $5; Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); n->set_property ("pitch", $1); - if (q % 2) + if (q) n->set_property ("cautionary", SCM_BOOL_T); - if (ex % 2 || q % 2) + if (ex || q) n->set_property ("force-accidental", SCM_BOOL_T); if (scm_is_pair (post)) { @@ -2153,43 +2068,24 @@ chord_body_element: $$ = n->unprotect (); } | music_function_chord_body - ; - -/* We can't accept a music argument, not even a closed one, - * immediately before chord_body_elements, otherwise a function \fun - * with a signature of two music arguments can't be sorted out - * properly in a construct like - * <\fun { c } \fun { c } c> - * The second call could be interpreted either as a chord constituent - * or a music expression. - */ - -music_function_chord_body_arglist: - function_arglist_bare - | EXPECT_SCM music_function_chord_body_arglist embedded_scm_chord_body { - $$ = check_scheme_arg (parser, @3, - $3, $2, $1); - } - ; + Music *m = unsmob_music ($1); -embedded_scm_chord_body: - embedded_scm_bare_arg - | SCM_FUNCTION music_function_chord_body_arglist { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); + while (m && m->is_mus_type ("music-wrapper-music")) { + $$ = m->get_property ("element"); + m = unsmob_music ($$); + } + + if (!(m && m->is_mus_type ("rhythmic-event"))) { + parser->parser_error (@$, _ ("not a rhythmic event")); + $$ = SCM_UNDEFINED; + } } - | bare_number - | fraction - | lyric_element - | chord_body_element ; music_function_chord_body: - MUSIC_FUNCTION music_function_chord_body_arglist { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); - } + music_function_call + | MUSIC_IDENTIFIER ; // Event functions may only take closed arglists, otherwise it would @@ -2197,7 +2093,7 @@ music_function_chord_body: // with the last argument of the event function or with the expression // for which the function call acts itself as event. -music_function_event: +music_function_call_closed: MUSIC_FUNCTION function_arglist_closed { $$ = MAKE_SYNTAX ("music-function", @$, $1, $2); @@ -2268,11 +2164,11 @@ post_event_nofinger: direction_less_event { $$ = $1; } - | script_dir music_function_event { + | script_dir music_function_call_closed { $$ = $2; - if ($1) + if (!SCM_UNBNDP ($1)) { - unsmob_music ($$)->set_property ("direction", scm_from_int ($1)); + unsmob_music ($$)->set_property ("direction", $1); } } | HYPHEN { @@ -2286,22 +2182,21 @@ post_event_nofinger: $$ = MY_MAKE_MUSIC ("ExtenderEvent", @$)->unprotect (); } | script_dir direction_reqd_event { - if ($1) + if (!SCM_UNBNDP ($1)) { Music *m = unsmob_music ($2); - m->set_property ("direction", scm_from_int ($1)); + m->set_property ("direction", $1); } $$ = $2; } | script_dir direction_less_event { - if ($1) + if (!SCM_UNBNDP ($1)) { Music *m = unsmob_music ($2); - m->set_property ("direction", scm_from_int ($1)); + m->set_property ("direction", $1); } $$ = $2; } - | string_number_event | '^' fingering { $$ = $2; @@ -2324,7 +2219,7 @@ post_event: string_number_event: E_UNSIGNED { Music *s = MY_MAKE_MUSIC ("StringNumberEvent", @$); - s->set_property ("string-number", scm_from_int ($1)); + s->set_property ("string-number", $1); $$ = s->unprotect (); } ; @@ -2377,12 +2272,13 @@ direction_less_event: } $$ = m->unprotect (); } + | string_number_event | EVENT_IDENTIFIER { $$ = $1; } | tremolo_type { Music *a = MY_MAKE_MUSIC ("TremoloEvent", @$); - a->set_property ("tremolo-type", scm_from_int ($1)); + a->set_property ("tremolo-type", $1); $$ = a->unprotect (); } | event_function_event @@ -2404,42 +2300,44 @@ direction_reqd_event: octave_check: /**/ { $$ = SCM_EOL; } - | '=' { $$ = scm_from_int (0); } - | '=' sub_quotes { $$ = scm_from_int (-$2); } - | '=' sup_quotes { $$ = scm_from_int ($2); } + | '=' quotes { $$ = $2; } ; +quotes: + /* empty */ + { + $$ = SCM_INUM0; + } + | sub_quotes + | sup_quotes + ; + sup_quotes: '\'' { - $$ = 1; + $$ = scm_from_int (1); } | sup_quotes '\'' { - $$ ++; + $$ = scm_oneplus ($1); } ; sub_quotes: ',' { - $$ = 1; + $$ = scm_from_int (-1); } | sub_quotes ',' { - $$++; + $$ = scm_oneminus ($1); } ; steno_pitch: - NOTENAME_PITCH { - $$ = $1; - } - | NOTENAME_PITCH sup_quotes { - Pitch p = *unsmob_pitch ($1); - p = p.transposed (Pitch ($2,0,0)); - $$ = p.smobbed_copy (); - } - | NOTENAME_PITCH sub_quotes { - Pitch p =* unsmob_pitch ($1); - p = p.transposed (Pitch (-$2,0,0)); - $$ = p.smobbed_copy (); + NOTENAME_PITCH quotes { + if (!scm_is_eq (SCM_INUM0, $2)) + { + Pitch p = *unsmob_pitch ($1); + p = p.transposed (Pitch (scm_to_int ($2),0,0)); + $$ = p.smobbed_copy (); + } } ; @@ -2448,26 +2346,18 @@ ugh. duplication */ steno_tonic_pitch: - TONICNAME_PITCH { - $$ = $1; - } - | TONICNAME_PITCH sup_quotes { - Pitch p = *unsmob_pitch ($1); - p = p.transposed (Pitch ($2,0,0)); - $$ = p.smobbed_copy (); - } - | TONICNAME_PITCH sub_quotes { - Pitch p = *unsmob_pitch ($1); - - p = p.transposed (Pitch (-$2,0,0)); - $$ = p.smobbed_copy (); + TONICNAME_PITCH quotes { + if (!scm_is_eq (SCM_INUM0, $2)) + { + Pitch p = *unsmob_pitch ($1); + p = p.transposed (Pitch (scm_to_int ($2),0,0)); + $$ = p.smobbed_copy (); + } } ; pitch: - steno_pitch { - $$ = $1; - } + steno_pitch | PITCH_IDENTIFIER ; @@ -2482,12 +2372,30 @@ gen_text_def: t->set_property ("text", $1); $$ = t->unprotect (); } - | simple_string { + | STRING { Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$); t->set_property ("text", make_simple_markup ($1)); $$ = t->unprotect (); } + | LYRICS_STRING { + Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$); + t->set_property ("text", + make_simple_markup ($1)); + $$ = t->unprotect (); + } + | embedded_scm_bare + { + Music *m = unsmob_music ($1); + if (m && m->is_mus_type ("post-event")) + $$ = $1; + else if (Text_interface::is_markup ($1)) { + Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$); + t->set_property ("text", $1); + $$ = t->unprotect (); + } else + parser->parser_error (@1, _ ("not an articulation")); + } ; fingering: @@ -2523,9 +2431,9 @@ script_abbreviation: ; script_dir: - '_' { $$ = DOWN; } - | '^' { $$ = UP; } - | '-' { $$ = CENTER; } + '_' { $$ = scm_from_int (DOWN); } + | '^' { $$ = scm_from_int (UP); } + | '-' { $$ = SCM_UNDEFINED; } ; duration_length: @@ -2534,33 +2442,43 @@ duration_length: } ; -optional_notemode_duration: +maybe_notemode_duration: { - Duration dd = parser->default_duration_; - $$ = dd.smobbed_copy (); + $$ = SCM_UNDEFINED; } | multiplied_duration { $$ = $1; parser->default_duration_ = *unsmob_duration ($$); } +; + + +optional_notemode_duration: + maybe_notemode_duration + { + if (SCM_UNBNDP ($$)) + $$ = parser->default_duration_.smobbed_copy (); + } ; steno_duration: - bare_unsigned dots { + UNSIGNED dots { int len = 0; - if (!is_duration ($1)) - parser->parser_error (@1, _f ("not a duration: %d", $1)); + int n = scm_to_int ($1); + if (!is_duration (n)) + parser->parser_error (@1, _f ("not a duration: %d", n)); else - len = intlog2 ($1); + len = intlog2 (n); - $$ = Duration (len, $2).smobbed_copy (); + $$ = Duration (len, scm_to_int ($2)).smobbed_copy (); } | DURATION_IDENTIFIER dots { Duration *d = unsmob_duration ($1); - Duration k (d->duration_log (), d->dot_count () + $2); + Duration k (d->duration_log (), + d->dot_count () + scm_to_int ($2)); k = k.compressed (d->factor ()); - *d = k; - $$ = $1; + scm_remember_upto_here_1 ($1); + $$ = k.smobbed_copy (); } ; @@ -2568,8 +2486,8 @@ multiplied_duration: steno_duration { $$ = $1; } - | multiplied_duration '*' bare_unsigned { - $$ = unsmob_duration ($$)->compressed ( $3) .smobbed_copy (); + | multiplied_duration '*' UNSIGNED { + $$ = unsmob_duration ($$)->compressed (scm_to_int ($3)).smobbed_copy (); } | multiplied_duration '*' FRACTION { Rational m (scm_to_int (scm_car ($3)), scm_to_int (scm_cdr ($3))); @@ -2578,29 +2496,23 @@ multiplied_duration: } ; -fraction: - FRACTION { $$ = $1; } - | UNSIGNED '/' UNSIGNED { - $$ = scm_cons ($1, $3); - } - ; - dots: /* empty */ { - $$ = 0; + $$ = SCM_INUM0; } | dots '.' { - $$ ++; + $$ = scm_oneplus ($1); } ; tremolo_type: ':' { - $$ = 0; + $$ = SCM_INUM0; } - | ':' bare_unsigned { - if (!is_duration ($2)) - parser->parser_error (@2, _f ("not a duration: %d", $2)); + | ':' UNSIGNED { + int n = scm_to_int ($2); + if (!is_duration (n)) + parser->parser_error (@2, _f ("not a duration: %d", n)); $$ = $2; } ; @@ -2609,6 +2521,18 @@ bass_number: UNSIGNED { $$ = $1; } | STRING { $$ = $1; } | full_markup { $$ = $1; } + | embedded_scm_bare + { + // as an integer, it needs to be non-negative, and otherwise + // it needs to be suitable as a markup. + if (scm_is_integer ($1) + ? scm_is_true (scm_negative_p ($1)) + : !Text_interface::is_markup ($1)) + { + parser->parser_error (@1, _ ("bass number expected")); + $$ = SCM_INUM0; + } + } ; figured_bass_alteration: @@ -2712,36 +2636,46 @@ figure_spec: optional_rest: - /**/ { $$ = 0; } - | REST { $$ = 1; } + /**/ { $$ = SCM_BOOL_F; } + | REST { $$ = SCM_BOOL_T; } ; simple_element: - pitch exclamations questions octave_check optional_notemode_duration optional_rest { + pitch exclamations questions octave_check maybe_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", @$); - else - n = MY_MAKE_MUSIC ("NoteEvent", @$); - - n->set_property ("pitch", $1); - n->set_property ("duration", $5); - - if (scm_is_number ($4)) + if (!SCM_UNBNDP ($2) + || !SCM_UNBNDP ($3) + || scm_is_number ($4) + || !SCM_UNBNDP ($5) + || scm_is_true ($6)) { - int q = scm_to_int ($4); - n->set_property ("absolute-octave", scm_from_int (q-1)); + Music *n = 0; + if (scm_is_true ($6)) + n = MY_MAKE_MUSIC ("RestEvent", @$); + else + n = MY_MAKE_MUSIC ("NoteEvent", @$); + + n->set_property ("pitch", $1); + if (SCM_UNBNDP ($5)) + n->set_property ("duration", + parser->default_duration_.smobbed_copy ()); + else + n->set_property ("duration", $5); + + if (scm_is_number ($4)) + { + int q = scm_to_int ($4); + n->set_property ("absolute-octave", scm_from_int (q-1)); + } + + if (to_boolean ($3)) + n->set_property ("cautionary", SCM_BOOL_T); + if (to_boolean ($2) || to_boolean ($3)) + n->set_property ("force-accidental", SCM_BOOL_T); + + $$ = n->unprotect (); } - - if ($3 % 2) - n->set_property ("cautionary", SCM_BOOL_T); - if ($2 % 2 || $3 % 2) - n->set_property ("force-accidental", SCM_BOOL_T); - - $$ = n->unprotect (); } | DRUM_PITCH optional_notemode_duration { Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); @@ -2766,10 +2700,7 @@ simple_element: ; simple_chord_elements: - simple_element { - $$ = scm_list_1 ($1); - } - | new_chord { + new_chord { if (!parser->lexer_->is_chord_state ()) parser->parser_error (@1, _ ("have to be in Chord mode for chords")); $$ = $1; @@ -2795,45 +2726,42 @@ lyric_element: lyric_element_arg: lyric_element | lyric_element multiplied_duration post_events { - SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2); - $$ = MAKE_SYNTAX ("event-chord", @$, - scm_cons (lyric_event, - scm_reverse_x ($3, SCM_EOL))); + $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2); + if (scm_is_pair ($3)) + unsmob_music ($$)->set_property + ("articulations", scm_reverse_x ($3, SCM_EOL)); } | lyric_element post_event post_events { - SCM lyric_event = - MAKE_SYNTAX ("lyric-event", @$, $1, - parser->default_duration_.smobbed_copy ()); - $$ = MAKE_SYNTAX ("event-chord", @$, - scm_cons2 (lyric_event, $2, - scm_reverse_x ($3, SCM_EOL))); - + $$ = MAKE_SYNTAX ("lyric-event", @$, $1, + parser->default_duration_.smobbed_copy ()); + unsmob_music ($$)->set_property + ("articulations", scm_cons ($2, scm_reverse_x ($3, SCM_EOL))); } | LYRIC_ELEMENT optional_notemode_duration post_events { - SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2); - $$ = MAKE_SYNTAX ("event-chord", @$, - scm_cons (lyric_event, - scm_reverse_x ($3, SCM_EOL))); + $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2); + if (scm_is_pair ($3)) + unsmob_music ($$)->set_property + ("articulations", scm_reverse_x ($3, SCM_EOL)); } ; lyric_element_music: lyric_element optional_notemode_duration post_events { - SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2); - $$ = MAKE_SYNTAX ("event-chord", @$, - scm_cons (lyric_event, - scm_reverse_x ($3, SCM_EOL))); + $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2); + if (scm_is_pair ($3)) + unsmob_music ($$)->set_property + ("articulations", scm_reverse_x ($3, SCM_EOL)); } ; new_chord: steno_tonic_pitch optional_notemode_duration { - $$ = make_chord_elements ($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_elements ($1, $2, scm_cons ($3, its)); + $$ = make_chord_elements (@$, $1, $2, scm_cons ($3, its)); } ; @@ -2881,23 +2809,23 @@ step_numbers: ; step_number: - bare_unsigned { + UNSIGNED { $$ = make_chord_step ($1, 0); } - | bare_unsigned '+' { + | UNSIGNED '+' { $$ = make_chord_step ($1, SHARP_ALTERATION); } - | bare_unsigned CHORD_MINUS { + | UNSIGNED CHORD_MINUS { $$ = make_chord_step ($1, FLAT_ALTERATION); } ; tempo_range: - bare_unsigned { - $$ = scm_from_int ($1); + UNSIGNED { + $$ = $1; } - | bare_unsigned '~' bare_unsigned { - $$ = scm_cons (scm_from_int ($1), scm_from_int ($3)); + | UNSIGNED '~' UNSIGNED { + $$ = scm_cons ($1, $3); } ; @@ -2953,25 +2881,31 @@ bare_number_closed: | NUMBER_IDENTIFIER ; -bare_unsigned: - UNSIGNED { - $$ = scm_to_int ($1); - } - ; - unsigned_number: UNSIGNED | NUMBER_IDENTIFIER ; exclamations: - { $$ = 0; } - | exclamations '!' { $$ ++; } + { $$ = SCM_UNDEFINED; } + | exclamations '!' + { + if (SCM_UNBNDP ($1)) + $$ = SCM_BOOL_T; + else + $$ = scm_not ($1); + } ; questions: - { $$ = 0; } - | questions '?' { $$ ++; } + { $$ = SCM_UNDEFINED; } + | questions '?' + { + if (SCM_UNBNDP ($1)) + $$ = SCM_BOOL_T; + else + $$ = scm_not ($1); + } ; /* @@ -2979,10 +2913,7 @@ This should be done more dynamically if possible. */ lyric_markup: - LYRIC_MARKUP_IDENTIFIER { - $$ = $1; - } - | LYRIC_MARKUP + LYRIC_MARKUP { parser->lexer_->push_markup_state (); } markup_top { $$ = $3; @@ -2991,10 +2922,7 @@ lyric_markup: ; full_markup_list: - MARKUPLIST_IDENTIFIER { - $$ = $1; - } - | MARKUPLIST + MARKUPLIST { parser->lexer_->push_markup_state (); } markup_list { $$ = $3; @@ -3003,10 +2931,7 @@ full_markup_list: ; full_markup: - MARKUP_IDENTIFIER { - $$ = $1; - } - | MARKUP + MARKUP { parser->lexer_->push_markup_state (); } markup_top { $$ = $3; @@ -3042,10 +2967,7 @@ markup_scm: markup_list: - MARKUPLIST_IDENTIFIER { - $$ = $1; - } - | markup_composed_list { + markup_composed_list { $$ = $1; } | markup_braced_list { @@ -3127,22 +3049,11 @@ simple_markup: STRING { $$ = make_simple_markup ($1); } - | MARKUP_IDENTIFIER { - $$ = $1; - } - | LYRIC_MARKUP_IDENTIFIER { - $$ = $1; - } - | STRING_IDENTIFIER { - $$ = $1; - } | SCORE { SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_note_state (alist_to_hashq (nn)); + parser->lexer_->push_note_state (nn); } '{' score_body '}' { - Score * sc = $4; - $$ = scm_list_2 (ly_lily_module_constant ("score-markup"), sc->self_scm ()); - sc->unprotect (); + $$ = scm_list_2 (ly_lily_module_constant ("score-markup"), $4); parser->lexer_->pop_state (); } | MARKUP_FUNCTION markup_command_basic_arguments { @@ -3172,10 +3083,12 @@ Lily_parser::set_yydebug (bool x) yydebug = x; } -void +SCM Lily_parser::do_yyparse () { - yyparse (this); + SCM retval = SCM_UNDEFINED; + yyparse (this, &retval); + return retval; } @@ -3191,10 +3104,7 @@ otherwise, we have to import music classes into the lexer. int Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) { - if (scm_is_string (sid)) { - *destination = sid; - return STRING_IDENTIFIER; - } else if (unsmob_book (sid)) { + if (unsmob_book (sid)) { Book *book = unsmob_book (sid)->clone (); *destination = book->self_scm (); book->unprotect (); @@ -3226,9 +3136,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) unsmob_music (*destination)-> set_property ("origin", make_input (last_input_)); - bool is_event = scm_memq (ly_symbol2scm ("event"), mus->get_property ("types")) - != SCM_BOOL_F; - + bool is_event = mus->is_mus_type ("post-event"); mus->unprotect (); return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER; } else if (unsmob_pitch (sid)) { @@ -3244,14 +3152,6 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) *destination = p->self_scm (); p->unprotect (); return OUTPUT_DEF_IDENTIFIER; - } else if (Text_interface::is_markup (sid)) { - *destination = sid; - if (is_lyric_state ()) - return LYRIC_MARKUP_IDENTIFIER; - return MARKUP_IDENTIFIER; - } else if (Text_interface::is_markup_list (sid)) { - *destination = sid; - return MARKUPLIST_IDENTIFIER; } return -1; @@ -3315,6 +3215,36 @@ is_regular_identifier (SCM id) return v; } +SCM +make_music_from_simple (Lily_parser *parser, Input loc, SCM simple) +{ + if (unsmob_music (simple)) + return simple; + if (parser->lexer_->is_note_state ()) { + Music *n = MY_MAKE_MUSIC ("NoteEvent", loc); + n->set_property ("duration", parser->default_duration_.smobbed_copy ()); + if (scm_is_symbol (simple)) + n->set_property ("drum-type", simple); + else if (unsmob_pitch (simple)) + n->set_property ("pitch", simple); + else { + n->unprotect (); + return simple; + } + return n->unprotect (); + } else if (parser->lexer_->is_lyric_state ()) { + if (Text_interface::is_markup (simple)) + return MAKE_SYNTAX ("lyric-event", loc, simple, + parser->default_duration_.smobbed_copy ()); + } else if (parser->lexer_->is_chord_state ()) { + if (unsmob_pitch (simple)) + return make_chord_elements (loc, simple, + parser->default_duration_.smobbed_copy (), + SCM_EOL); + } + return simple; +} + Music * make_music_with_input (SCM name, Input where) { @@ -3335,17 +3265,11 @@ is_duration (int t) return t && t == 1 << intlog2 (t); } -void -set_music_properties (Music *p, SCM a) -{ - for (SCM k = a; scm_is_pair (k); k = scm_cdr (k)) - p->set_property (scm_caar (k), scm_cdar (k)); -} - - SCM -make_chord_step (int step, Rational alter) +make_chord_step (SCM step_scm, Rational alter) { + int step = scm_to_int (step_scm); + if (step == 7) alter += FLAT_ALTERATION; @@ -3357,10 +3281,15 @@ make_chord_step (int step, Rational alter) SCM -make_chord_elements (SCM pitch, SCM dur, SCM modification_list) +make_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list) { SCM chord_ctor = ly_lily_module_constant ("construct-chord-elements"); - return scm_call_3 (chord_ctor, pitch, dur, modification_list); + SCM res = scm_call_3 (chord_ctor, pitch, dur, modification_list); + for (SCM s = res; scm_is_pair (s); s = scm_cdr (s)) + { + unsmob_music (scm_car (s))->set_spot (loc); + } + return res; } int