X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=e2bbcd7d4d45796518338eeb7ffcb78a6cf4b4db;hb=d929a664c85112ffecaa16c5e114d6f75cf002e2;hp=c2e714d3e6890b388c3cce8b31162467ff47205f;hpb=700206cab83f93e39f9895e2e8ca94cc42b067bf;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index c2e714d3e6..e2bbcd7d4d 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1,60 +1,15 @@ -%{ // -*-Fundamental-*- - /* parser.yy -- Bison/C++ parser for LilyPond source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys Jan Nieuwenhuizen */ -/* - -TODO: - -* The rules for who is protecting what are very shady. Uniformise - this. - -* There are too many lexical modes? - -*/ - -#include -#include -#include - - -#include "book.hh" -#include "context-def.hh" -#include "dimensions.hh" -#include "event.hh" -#include "file-path.hh" -#include "input-smob.hh" -#include "input.hh" -#include "lily-guile.hh" -#include "lilypond-input-version.hh" -#include "main.hh" -#include "misc.hh" -#include "lily-lexer.hh" -#include "lily-parser.hh" -#include "paper-book.hh" -#include "output-def.hh" -#include "scm-hash.hh" -#include "scm-option.hh" -#include "score.hh" -#include "text-item.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_id (); -SCM get_next_unique_lyrics_context_id (); +%{ #define YYERROR_VERBOSE 1 - #define YYPARSE_PARAM my_lily_parser #define YYLEX_PARAM my_lily_parser #define THIS\ @@ -68,292 +23,246 @@ SCM get_next_unique_lyrics_context_id (); ((Current).set_location ((Rhs)[1], (Rhs)[N])) -/* 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 (scm_is_symbol (tag)) - tags = scm_cons (tag, tags); - else if (ly_c_list_p (tag)) - tags = ly_append2 (tag, tags); - else - ip.warning (_ ("Tag must be symbol or list of symbols.")); +/* 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. */ - m->set_property ("tags", tags); -} +%left PREC_TOP +%left ADDLYRICS +%left PREC_BOT -bool -is_regular_identifier (SCM id) -{ - String str = ly_scm2string (id); - char const *s = str.to_str0 (); +%expect 1 - bool v = true; -#if 0 - isalpha (*s); - s++; -#endif - while (*s && v) - { - v = v && isalnum (*s); - s++; - } - return v; -} +/* One shift/reduce problem +1. \repeat + \repeat .. \alternative -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; -} + \repeat { \repeat .. \alternative } -SCM -make_simple_markup (SCM a) -{ - SCM simple = ly_lily_module_constant ("simple-markup"); - return scm_list_2 (simple, a); -} +or -bool -is_duration (int t) -{ - return t && t == 1 << intlog2 (t); -} + \repeat { \repeat } \alternative +*/ -void -set_music_properties (Music *p, SCM a) -{ - for (SCM k = a; scm_is_pair (k); k = scm_cdr (k)) - p->internal_set_property (scm_caar (k), scm_cdar (k)); -} -SCM -make_chord_step (int step, int alter) -{ - if (step == 7) - alter += FLAT; +%pure_parser +%locations - while (step < 0) - step += 7; - Pitch m ((step -1) / 7, (step - 1) % 7, alter); - return m.smobbed_copy (); -} -SCM -make_chord (SCM pitch, SCM dur, SCM modification_list) -{ - SCM chord_ctor = ly_lily_module_constant ("construct-chord"); - SCM ch = scm_call_3 (chord_ctor, pitch, dur, modification_list); - scm_gc_protect_object (ch); - return ch; -} +%{ // -*-Fundamental-*- -/* Todo: actually also use apply iso. call too ... */ -bool -ly_input_procedure_p (SCM x) -{ - return ly_c_procedure_p (x) - || (scm_is_pair (x) && ly_c_procedure_p (scm_car (x))); -} +/* +FIXME: -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; -} + * The rules for who is protecting what are very shady. Uniformise + this. -Music* -make_music_relative (Pitch start, Music *music) -{ - Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic"); - relative->set_property ("element", music->self_scm ()); - - Pitch last = music->to_relative_octave (start); - if (lily_1_8_relative) - music->set_property ("last-pitch", last.smobbed_copy ()); - return relative; -} + * There are too many lexical modes? +*/ -Music* -make_lyric_combine_music (SCM name, Music *music) -{ - Music *combine = MY_MAKE_MUSIC ("NewLyricCombineMusic"); - combine->set_property ("element", music->self_scm ()); - combine->set_property ("associated-context", name); - return combine; -} +#include "config.hh" -%} +#include +#include +#include +using namespace std; -/* 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. */ +#include "book.hh" +#include "context-def.hh" +#include "dimensions.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 "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" + +%} -%left ADDLYRICS %union { Book *book; Output_def *outputdef; SCM scm; - String *string; + std::string *string; Music *music; Score *score; int i; } + %{ -int -yylex (YYSTYPE *s, YYLTYPE *l, void *v) -{ - Lily_parser *pars = (Lily_parser*) v; - Lily_lexer *lex = pars->lexer_; +#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x)) - lex->lexval = (void*) s; - lex->lexloc = l; - lex->prepare_for_next_token (); - return lex->yylex (); -} +Music *property_op_to_music (SCM op); +Music *context_spec_music (SCM type, SCM id, Music *m, SCM ops, bool create_new); +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 -%} -%expect 1 -/* One shift/reduce problem +Music *make_lyric_combine_music (SCM name, Music *music); +Music *make_music_relative (Pitch start, Music *music); +Music *run_music_function (Lily_parser *, SCM expr); +Music *set_property_music (SCM sym, SCM value); +SCM get_first_context_id (SCM type, Music *m); +SCM make_chord (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); -1. \repeat - \repeat .. \alternative - - \repeat { \repeat .. \alternative } +%} -or +/* 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 "__" - \repeat { \repeat } \alternative +/* +If we give names, Bison complains. */ +%token FIGURE_CLOSE /* "\\>" */ +%token FIGURE_OPEN /* "\\<" */ +%token FIGURE_SPACE "_" +%token HYPHEN "--" - -%pure_parser -%locations - -%token ACCEPTS -%token ADDQUOTE -%token LYRICSTO -%token ALIAS -%token ALTERNATIVE -%token BAR -%token BOOK -%token CHANGE %token CHORDMODIFIERS -%token CHORDS -%token CHORDMODE -%token DOUBLE_ANGLE_OPEN -%token DOUBLE_ANGLE_CLOSE -%token CLEF -%token COMMANDSPANREQUEST -%token CONSISTS -%token CONTEXT -%token DEFAULT -%token DENIES -%token DESCRIPTION -%token EXTENDER -%token FIGURES -%token FIGUREMODE -%token FIGURE_OPEN FIGURE_CLOSE -%token FIGURE_BRACKET_CLOSE FIGURE_BRACKET_OPEN -%token GROBDESCRIPTIONS -%token HEADER -%token HYPHEN -%token INVALID -%token KEY -%token LAYOUT -%token LYRICS %token LYRIC_MARKUP -%token LYRICMODE -%token MARK -%token MIDI %token MULTI_MEASURE_REST -%token NAME -%token NEWCONTEXT -%token NOTEMODE -%token OBJECTID -%token OCTAVE -%token ONCE -%token OVERRIDE SET REVERT -%token PAPER -%token PARTIAL -%token QUOTE -%token RELATIVE -%token REMOVE -%token REPEAT -%token REST %token SCM_T -%token SCORE -%token SEQUENTIAL -%token ADDLYRICS -%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 -%token MARKUP - -/* escaped */ -/* FIXME: this sucks. The user will get to see these names: - syntax error, unexpected E_CHAR: - \ - %% - */ - -%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE -%token E_LEFTSQUARE E_RIGHTSQUARE E_TILDE -%token E_BACKSLASH -%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET CHORD_SLASH -%token FIGURE_SPACE - -%token DIGIT -%token UNSIGNED + + +%token DIGIT %token E_UNSIGNED -%token IDENTIFIER -%token CHORDMODIFIER_PITCH -%token DRUM_PITCH -%token DURATION_IDENTIFIER -%token EVENT_IDENTIFIER -%token MUSIC_IDENTIFIER CONTEXT_DEF_IDENTIFIER -%token NOTENAME_PITCH -%token NUMBER_IDENTIFIER -%token OUTPUT_DEF_IDENTIFIER -%token RESTNAME +%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 SCM_T -%token SCORE_IDENTIFIER -%token STRING -%token STRING_IDENTIFIER SCM_IDENTIFIER -%token TONICNAME_PITCH -%token CHORD_MODIFIER -%token FRACTION -%token REAL +%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 @@ -361,87 +270,158 @@ or %token MARKUP_HEAD_SCM0_SCM1 %token MARKUP_HEAD_SCM0_SCM1_MARKUP2 %token MARKUP_HEAD_SCM0_SCM1_SCM2 -%token LYRIC_MARKUP_IDENTIFIER MARKUP_IDENTIFIER MARKUP_HEAD_LIST0 +%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_SCM %token MUSIC_FUNCTION_SCM_MUSIC %token MUSIC_FUNCTION_SCM_MUSIC_MUSIC +%token MUSIC_FUNCTION_SCM_SCM %token MUSIC_FUNCTION_SCM_SCM_MUSIC -%token MUSIC_FUNCTION_MARKUP -%token MUSIC_FUNCTION_MARKUP_MARKUP -%token MUSIC_FUNCTION_MARKUP_MUSIC -%token MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC -%token MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC - -%token DRUMS -%token DRUMMODE - - -%type book_block book_body -%type bare_int bare_unsigned -%type exclamations questions dots optional_rest -%type script_dir -%type sub_quotes sup_quotes -%type tremolo_type -%type bass_mod - -%type Composite_music Simple_music Prefix_composite_music Generic_prefix_music -%type Grouped_music_list -%type Music Sequential_music Simultaneous_music -%type Repeated_music -%type command_req -%type gen_text_def direction_less_event direction_reqd_event -%type music_property_def context_change -%type note_chord_element chord_body chord_body_element -%type post_event tagged_post_event -%type relative_music re_rhythmed_music -%type simple_element event_chord command_element -%type string_number_event -%type toplevel_music -%type tempo_event - -%type output_def_body output_def_head -%type output_def paper_block - -%type assignment_id -%type Music_list -%type chord_body_elements -%type chord_item chord_items chord_separator new_chord -%type context_def_spec_block context_def_spec_body -%type context_mod context_def_mod optional_context_mod -%type context_prop_spec -%type direction_less_char -%type duration_length fraction -%type embedded_scm scalar -%type identifier_init -%type lilypond_header lilypond_header_body -%type new_lyrics -%type post_events -%type property_operation -%type script_abbreviation -%type simple_string -%type steno_pitch pitch absolute_pitch pitch_also_in_chords -%type steno_tonic_pitch -%type step_number step_numbers -%type string bare_number number_expression number_term number_factor -%type bass_number br_bass_figure bass_figure figure_list figure_spec -%type context_mod_list -%type octave_check -%type steno_duration optional_notemode_duration multiplied_duration -%type Generic_prefix_music_scm -%type lyric_element -%type Alternative_music -%type full_markup lyric_markup -%type markup_list markup_composed_list markup_braced_list markup_braced_list_body -%type markup_head_1_item markup_head_1_list markup simple_markup markup_top -%type mode_changing_head -%type mode_changing_head_with_context -%type object_id_setting - -%type score_block score_body +%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 + +%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 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 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_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 '-' '+' @@ -473,29 +453,26 @@ object_id_setting: toplevel_expression: lilypond_header { - THIS->lexer_->set_identifier (ly_symbol2scm ("$globalheader"), $1); - } - | add_quote { - + THIS->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1); } | book_block { Book *book = $1; SCM proc = THIS->lexer_->lookup_identifier ("toplevel-book-handler"); scm_call_2 (proc, THIS->self_scm (), book->self_scm ()); - scm_gc_unprotect_object (book->self_scm ()); + book->unprotect (); } | score_block { Score *score = $1; SCM proc = THIS->lexer_->lookup_identifier ("toplevel-score-handler"); scm_call_2 (proc, THIS->self_scm (), score->self_scm ()); - scm_gc_unprotect_object (score->self_scm ()); + score->unprotect (); } | toplevel_music { Music *music = $1; SCM proc = THIS->lexer_->lookup_identifier ("toplevel-music-handler"); scm_call_2 (proc, THIS->self_scm (), music->self_scm ()); - scm_gc_unprotect_object (music->self_scm ()); + music->unprotect (); } | full_markup { SCM proc = THIS->lexer_->lookup_identifier ("toplevel-text-handler"); @@ -513,7 +490,7 @@ toplevel_expression: id = ly_symbol2scm ("$defaultlayout"); THIS->lexer_->set_identifier (id, od->self_scm ()); - scm_gc_unprotect_object (od->self_scm ()); + od->unprotect(); } ; @@ -530,7 +507,7 @@ embedded_scm: lilypond_header_body: { - $$ = ly_make_anonymous_module (be_safe_global); + $$ = get_header(THIS); THIS->lexer_->add_scope ($$); } | lilypond_header_body assignment { @@ -556,9 +533,13 @@ assignment: assignment_id '=' identifier_init { if (! is_regular_identifier ($1)) { - @1.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, $3); /* @@ -576,22 +557,26 @@ all objects can be unprotected as soon as they're here. identifier_init: score_block { $$ = $1->self_scm (); - scm_gc_unprotect_object ($$); + $1->unprotect (); + } + | 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 ($$); + $1->unprotect(); } | post_event { $$ = $1->self_scm (); - scm_gc_unprotect_object ($$); + $1->unprotect(); } | number_expression { $$ = $1; @@ -606,7 +591,7 @@ identifier_init: $$ = $1; } | DIGIT { - $$ = scm_int2num ($1); + $$ = scm_from_int ($1); } ; @@ -658,17 +643,21 @@ book_body: $$ = new Book; $$->set_spot (@$); $$->paper_ = dynamic_cast (unsmob_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"))->clone ()); - scm_gc_unprotect_object ($$->paper_->self_scm ()); - $$->header_ = THIS->lexer_->lookup_identifier ("$globalheader"); + $$->paper_->unprotect (); + $$->header_ = THIS->lexer_->lookup_identifier ("$defaultheader"); + } + | BOOK_IDENTIFIER { + $$ = unsmob_book ($1); + $$->set_spot (@$); } | book_body paper_block { $$->paper_ = $2; - scm_gc_unprotect_object ($2->self_scm ()); + $2->unprotect (); } | book_body score_block { SCM s = $2->self_scm (); $$->add_score (s); - scm_gc_unprotect_object (s); + $2->unprotect(); } | book_body full_markup { $$->add_score ($2); @@ -692,36 +681,38 @@ score_block: ; score_body: - /**/ { - $$ = new Score; + Music { + SCM m = $1->self_scm (); + $1->unprotect(); + SCM scorify = ly_lily_module_constant ("scorify-music"); + SCM score = scm_call_2 (scorify, m, THIS->self_scm ()); + + // pass ownernship to C++ again. + $$ = unsmob_score (score); + $$->protect (); $$->set_spot (@$); } | SCORE_IDENTIFIER { - $$ = new Score ( *unsmob_score ($1)); + $$ = unsmob_score ($1); $$->set_spot (@$); } | score_body object_id_setting { $$->user_key_ = ly_scm2string ($2); } - | score_body Music { - SCM m = $2->self_scm (); - scm_gc_unprotect_object (m); - $$->set_music (m, THIS->self_scm ()); - } | score_body lilypond_header { $$->header_ = $2; } | score_body output_def { if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T) { - THIS->parser_error (@2, _("\\paper cannot be in \\score. Use \\layout instead")); + THIS->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead")); } else { - $$->defs_.push ($2); + $$->add_output_def ($2); } - scm_gc_unprotect_object ($2->self_scm ()); + $2->unprotect (); } | score_body error { $$->error_found_ = true; @@ -738,7 +729,7 @@ paper_block: $$ = $1; if ($$->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T) { - THIS->parser_error (@1, _("Need \\paper for paper block.")); + THIS->parser_error (@1, _ ("need \\paper for paper block")); $$ = get_paper (THIS); } } @@ -773,21 +764,25 @@ output_def_head: } ; +output_def_head_with_mode_switch: + output_def_head { + THIS->lexer_->push_initial_state (); + $$ = $1; + } + ; output_def_body: - output_def_head '{' { + output_def_head_with_mode_switch '{' { $$ = $1; $$->input_origin_.set_spot (@$); - THIS->lexer_->push_initial_state (); } - | output_def_head '{' OUTPUT_DEF_IDENTIFIER { - scm_gc_unprotect_object ($1->self_scm ()); + | 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_); - THIS->lexer_->push_initial_state (); } | output_def_body assignment { @@ -803,7 +798,7 @@ output_def_body: int m = scm_to_int ($2->get_property ("metronome-count")); Duration *d = unsmob_duration ($2->get_property ("tempo-unit")); set_tempo ($$, d->get_length (), m); - scm_gc_unprotect_object ($2->self_scm ()); + $2->unprotect (); } | output_def_body error { @@ -814,7 +809,7 @@ tempo_event: TEMPO steno_duration '=' bare_unsigned { $$ = MY_MAKE_MUSIC ("MetronomeChangeEvent"); $$->set_property ("tempo-unit", $2); - $$->set_property ("metronome-count", scm_int2num ( $4)); + $$->set_property ("metronome-count", scm_from_int ( $4)); } ; @@ -832,7 +827,7 @@ Music_list: | Music_list Music { SCM s = $$; SCM c = scm_cons ($2->self_scm (), SCM_EOL); - scm_gc_unprotect_object ($2->self_scm ()); /* UGH */ + $2->unprotect (); /* UGH */ if (scm_is_pair (scm_cdr (s))) scm_set_cdr_x (scm_cdr (s), c); /* append */ @@ -849,7 +844,7 @@ Music_list: m->set_property ("error-found", SCM_BOOL_T); SCM s = $$; SCM c = scm_cons (m->self_scm (), SCM_EOL); - scm_gc_unprotect_object (m->self_scm ()); /* UGH */ + m->unprotect (); /* UGH */ if (scm_is_pair (scm_cdr (s))) scm_set_cdr_x (scm_cdr (s), c); /* append */ @@ -877,13 +872,15 @@ Alternative_music: Repeated_music: REPEAT simple_string bare_unsigned Music Alternative_music { + /*TODO: move to Scheme.*/ Music *beg = $4; int times = $3; SCM alts = scm_is_pair ($5) ? scm_car ($5) : SCM_EOL; if (times < scm_ilength (alts)) { unsmob_music (scm_car (alts)) ->origin ()->warning ( - _ ("More alternatives than repeats. Junking excess alternatives.")); + _ ("more alternatives than repeats")); + warning ("junking excess alternatives"); alts = ly_truncate_list (times, alts); } @@ -891,25 +888,24 @@ Repeated_music: SCM proc = ly_lily_module_constant ("make-repeated-music"); SCM mus = scm_call_1 (proc, $2); - scm_gc_protect_object (mus); // UGH. Music *r = unsmob_music (mus); + r->protect (); if (beg) { r-> set_property ("element", beg->self_scm ()); - scm_gc_unprotect_object (beg->self_scm ()); + beg->unprotect (); } - r->set_property ("repeat-count", scm_int2num (times >? 1)); + r->set_property ("repeat-count", scm_from_int (max (times, 1))); r-> set_property ("elements",alts); - if (ly_c_equal_p ($2, scm_makfrom0str ("tremolo"))) { + if (ly_is_equal ($2, scm_makfrom0str ("tremolo"))) { /* TODO: move this code to Scheme. */ - /* - we can not get durations and other stuff correct down the line, so we have to - add to the duration log here. - */ + /* we cannot get durations and other stuff + correct down the line, + so we have to add to the duration log here. */ SCM func = ly_lily_module_constant ("shift-duration-log"); int dots = ($3 % 3) ? 0 : 1; @@ -920,11 +916,11 @@ Repeated_music: { int list_len = scm_ilength ($4->get_property ("elements")); if (list_len != 2) - $4->origin ()->warning ("Chord tremolo must have 2 elements."); + $4->origin ()->warning (_f ("expect 2 elements for Chord tremolo, found %d", list_len)); shift -= 1; r->compress (Moment (Rational (1, list_len))); } - scm_call_3 (func, r->self_scm (), scm_int2num (shift), scm_int2num (dots)); + scm_call_3 (func, r->self_scm (), scm_from_int (shift), scm_from_int (dots)); } r->set_spot (*$4->origin ()); @@ -969,7 +965,6 @@ Simple_music: | context_change ; - optional_context_mod: /**/ { $$ = SCM_EOL; } | WITH { THIS->lexer_->push_initial_state (); } @@ -987,7 +982,6 @@ context_mod_list: } ; - Composite_music: Prefix_composite_music { $$ = $1; } | Grouped_music_list { $$ = $1; } @@ -998,120 +992,90 @@ Grouped_music_list: | Sequential_music { $$ = $1; } ; +function_scm_argument: + embedded_scm + | simple_string + ; + +/* +TODO: use code generation for this +*/ Generic_prefix_music_scm: MUSIC_FUNCTION { $$ = scm_list_2 ($1, make_input (@$)); } - | MUSIC_FUNCTION_SCM embedded_scm { + | MUSIC_FUNCTION_SCM function_scm_argument { $$ = scm_list_3 ($1, make_input (@$), $2); } | MUSIC_FUNCTION_MARKUP full_markup { $$ = scm_list_3 ($1, make_input (@$), $2); } - | MUSIC_FUNCTION_MUSIC Music { - $$ = scm_list_3 ($1, make_input (@$), $2->self_scm ()); - scm_gc_unprotect_object ($2->self_scm ()); - } - | MUSIC_FUNCTION_SCM_MUSIC embedded_scm Music { - $$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ()); - scm_gc_unprotect_object ($3->self_scm ()); + | music_function_musicless_prefix Music { + $$ = ly_append2 ($1, scm_list_1 ($2->self_scm ())); + $2->unprotect (); } - | MUSIC_FUNCTION_SCM_SCM embedded_scm embedded_scm { + | MUSIC_FUNCTION_SCM_SCM function_scm_argument function_scm_argument { $$ = scm_list_4 ($1, make_input (@$), $2, $3); } - | MUSIC_FUNCTION_SCM_SCM_MUSIC embedded_scm embedded_scm Music { - $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4->self_scm ()); + | 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->self_scm ()); - scm_gc_unprotect_object ($3->self_scm ()); + $3->unprotect (); } | 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->self_scm (), $3->self_scm ()); - scm_gc_unprotect_object ($2->self_scm ()); - scm_gc_unprotect_object ($3->self_scm ()); + $2->unprotect (); + $3->unprotect (); } - | MUSIC_FUNCTION_SCM_MUSIC_MUSIC embedded_scm Music Music { + | MUSIC_FUNCTION_SCM_MUSIC_MUSIC function_scm_argument Music Music { $$ = scm_list_5 ($1, make_input (@$), $2, $3->self_scm (), $4->self_scm ()); - scm_gc_unprotect_object ($4->self_scm ()); - scm_gc_unprotect_object ($3->self_scm ()); + $4->unprotect (); + $3->unprotect (); } | MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC full_markup Music Music { $$ = scm_list_5 ($1, make_input (@$), $2, $3->self_scm (), $4->self_scm ()); - scm_gc_unprotect_object ($3->self_scm ()); - scm_gc_unprotect_object ($4->self_scm ()); + $3->unprotect (); + $4->unprotect (); } ; -Generic_prefix_music: - Generic_prefix_music_scm { - SCM func = scm_car ($1); - Input *loc = unsmob_input (scm_cadr ($1)); - SCM args = scm_cddr ($1); - SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature")); - - SCM type_check_proc = ly_lily_module_constant ("type-check-list"); - bool ok = true; - - if (!to_boolean (scm_call_3 (type_check_proc, scm_cadr ($1), sig, args))) - { - THIS->error_level_ = 1; - ok = false; - } - - SCM m = SCM_EOL; - if (ok) - m = scm_apply_0 (func, scm_cons (THIS->self_scm(), - scm_cdr ($1))); - - if (unsmob_music (m)) - { - $$ = unsmob_music (m); - scm_gc_protect_object (m); - } - else - { - if (ok) - loc->error (_ ("Music head function should return Music object.")); - $$ = MY_MAKE_MUSIC ("Music"); - } - $$->set_spot (*loc); +optional_id: + /**/ { $$ = SCM_EOL; } + | '=' simple_string { + $$ = $2; } - ; + ; Prefix_composite_music: - Generic_prefix_music { - $$ = $1; - } - | CONTEXT simple_string '=' simple_string optional_context_mod Music { - $$ = context_spec_music ($2, $4, $6, $5); - + Generic_prefix_music_scm { + $$ = run_music_function (THIS, $1); } - | CONTEXT simple_string optional_context_mod Music { - $$ = context_spec_music ($2, SCM_UNDEFINED, $4, $3); + | CONTEXT simple_string optional_id optional_context_mod Music { + $$ = context_spec_music ($2, $3, $5, $4, false); } - | NEWCONTEXT simple_string optional_context_mod Music { - $$ = context_spec_music ($2, get_next_unique_context_id (), $4, - $3); + | NEWCONTEXT simple_string optional_id optional_context_mod Music { + $$ = context_spec_music ($2, $3, $5, $4, true); } | TIMES fraction Music - { - int n = scm_to_int (scm_car ($2)); int d = scm_to_int (scm_cdr ($2)); + int n = scm_to_int (scm_car ($2)); + int d = scm_to_int (scm_cdr ($2)); Music *mp = $3; $$= MY_MAKE_MUSIC ("TimeScaledMusic"); $$->set_spot (@$); $$->set_property ("element", mp->self_scm ()); - scm_gc_unprotect_object (mp->self_scm ()); - $$->set_property ("numerator", scm_int2num (n)); - $$->set_property ("denominator", scm_int2num (d)); + mp->unprotect(); + $$->set_property ("numerator", scm_from_int (n)); + $$->set_property ("denominator", scm_from_int (d)); $$->compress (Moment (Rational (n,d))); } @@ -1124,7 +1088,7 @@ Prefix_composite_music: p->transpose (pitch_interval (from, to)); $$->set_property ("element", p->self_scm ()); - scm_gc_unprotect_object (p->self_scm ()); + p->unprotect(); } | mode_changing_head Grouped_music_list { if ($1 == ly_symbol2scm ("chords")) @@ -1132,7 +1096,7 @@ Prefix_composite_music: Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic"); chm->set_property ("element", $2->self_scm ()); $$ = chm; - scm_gc_unprotect_object ($2->self_scm ()); + $2->unprotect(); } else { @@ -1141,23 +1105,18 @@ Prefix_composite_music: THIS->lexer_->pop_state (); } | mode_changing_head_with_context optional_context_mod Grouped_music_list { - $$ = context_spec_music ($1, get_next_unique_context_id (), - $3, $2); + $$ = context_spec_music ($1, SCM_UNDEFINED, $3, $2, true); if ($1 == ly_symbol2scm ("ChordNames")) { Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic"); chm->set_property ("element", $$->self_scm ()); - scm_gc_unprotect_object ($$->self_scm ()); + $$->unprotect(); $$ = chm; } THIS->lexer_->pop_state (); } | relative_music { $$ = $1; } | re_rhythmed_music { $$ = $1; } - | TAG embedded_scm Music { - tag_music ($3, $2, @$); - $$ = $3; - } ; mode_changing_head: @@ -1224,14 +1183,14 @@ relative_music: Music *m = $3; Pitch start = *unsmob_pitch ($2); $$ = make_music_relative (start, m); - scm_gc_unprotect_object (m->self_scm ()); + m->unprotect(); } | RELATIVE Composite_music { Music *m = $2; Pitch middle_c (0, 0, 0); $$ = make_music_relative (middle_c, m); - scm_gc_unprotect_object (m->self_scm ()); + m->unprotect(); } ; @@ -1262,7 +1221,7 @@ re_rhythmed_music: name = get_next_unique_lyrics_context_id (); voice = context_spec_music (scm_makfrom0str ("Voice"), name, - voice, SCM_EOL); + voice, SCM_EOL, false); } SCM context = scm_makfrom0str ("Lyrics"); @@ -1274,13 +1233,13 @@ re_rhythmed_music: Music *music = unsmob_music (scm_car (s)); Music *com = make_lyric_combine_music (name, music); Music *csm = context_spec_music (context, - get_next_unique_context_id (), com, SCM_EOL); + SCM_UNDEFINED, com, SCM_EOL, true); lst = scm_cons (csm->self_scm (), lst); } all->set_property ("elements", scm_cons (voice->self_scm (), lst)); $$ = all; - scm_gc_unprotect_object (voice->self_scm ()); + voice->unprotect (); } | LYRICSTO simple_string { THIS->lexer_->push_lyric_state (); @@ -1289,7 +1248,7 @@ re_rhythmed_music: Music *music = $4; SCM name = $2; $$ = make_lyric_combine_music (name, music); - scm_gc_unprotect_object (music->self_scm ()); + music->unprotect(); } ; @@ -1315,7 +1274,11 @@ property_operation: } | 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); + } + | 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"), @@ -1328,6 +1291,7 @@ context_def_mod: | REMOVE { $$ = ly_symbol2scm ("remove"); } | ACCEPTS { $$ = ly_symbol2scm ("accepts"); } + | DEFAULTCHILD { $$ = ly_symbol2scm ("default-child"); } | DENIES { $$ = ly_symbol2scm ("denies"); } | ALIAS { $$ = ly_symbol2scm ("alias"); } @@ -1362,10 +1326,17 @@ context_prop_spec: music_property_def: OVERRIDE context_prop_spec embedded_scm '=' scalar { $$ = property_op_to_music (scm_list_4 ( - ly_symbol2scm ("poppush"), + ly_symbol2scm ("push"), + scm_cadr ($2), + $5, $3)); + $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false); + } + | OVERRIDE context_prop_spec embedded_scm embedded_scm '=' scalar { + $$ = property_op_to_music (scm_list_5 ( + ly_symbol2scm ("push"), scm_cadr ($2), - $3, $5)); - $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + $6, $4, $3)); + $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false); } | REVERT context_prop_spec embedded_scm { $$ = property_op_to_music (scm_list_3 ( @@ -1373,20 +1344,20 @@ music_property_def: scm_cadr ($2), $3)); - $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false); } | SET context_prop_spec '=' scalar { $$ = property_op_to_music (scm_list_3 ( ly_symbol2scm ("assign"), scm_cadr ($2), $4)); - $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false); } | UNSET context_prop_spec { $$ = property_op_to_music (scm_list_2 ( ly_symbol2scm ("unset"), scm_cadr ($2))); - $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL); + $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false); } | ONCE music_property_def { SCM e = $2->get_property ("element"); @@ -1415,6 +1386,9 @@ simple_string: STRING { | LYRICS_STRING { $$ = $1; } + | STRING_IDENTIFIER { + $$ = $1; + } ; scalar: string { @@ -1423,8 +1397,8 @@ scalar: string { | LYRICS_STRING { $$ = $1; } - | bare_int { - $$ = scm_int2num ($1); + | bare_number { + $$ = $1; } | embedded_scm { $$ = $1; @@ -1433,7 +1407,7 @@ scalar: string { $$ = $1; } | DIGIT { - $$ = scm_int2num ($1); + $$ = scm_from_int ($1); } ; @@ -1521,7 +1495,7 @@ chord_body_elements: /* empty */ { $$ = SCM_EOL; } | chord_body_elements chord_body_element { $$ = scm_cons ($2->self_scm (), $1); - scm_gc_unprotect_object ($2->self_scm ()); + $2->unprotect (); } ; @@ -1548,7 +1522,7 @@ chord_body_element: if (scm_is_number (check)) { int q = scm_to_int (check); - n->set_property ("absolute-octave", scm_int2num (q-1)); + n->set_property ("absolute-octave", scm_from_int (q-1)); } @@ -1566,22 +1540,56 @@ chord_body_element: } $$ = n; } + | music_function_chord_body { + $$ = run_music_function (THIS, $1); + $$->set_spot (@$); + } ; -add_quote: - ADDQUOTE string Music { - SCM adder = ly_lily_module_constant ("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->self_scm ())); + $2->unprotect (); + } + ; + +music_function_event: + music_function_musicless_prefix post_event { + $$ = ly_append2 ($1, scm_list_1 ($2->self_scm ())); + $2->unprotect (); + } + ; + +/* +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 { + command_event { $$ = MY_MAKE_MUSIC ("EventChord"); $$->set_property ("elements", scm_cons ($1->self_scm (), SCM_EOL)); - scm_gc_unprotect_object ($1->self_scm ()); + $1->unprotect(); $$-> set_spot (@$); $1-> set_spot (@$); @@ -1592,31 +1600,25 @@ command_element: skip->set_spot (@$); $$ = skip; } - | OCTAVE pitch { - Music *m = MY_MAKE_MUSIC ("RelativeOctaveCheck"); - $$ = m; - $$->set_spot (@$); - $$->set_property ("pitch", $2); - } - | E_LEFTSQUARE { + | E_BRACKET_OPEN { Music *m = MY_MAKE_MUSIC ("LigatureEvent"); - m->set_property ("span-direction", scm_int2num (START)); + m->set_property ("span-direction", scm_from_int (START)); m->set_spot (@$); $$ = MY_MAKE_MUSIC ("EventChord"); $$->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL)); - scm_gc_unprotect_object (m->self_scm ()); + m->unprotect(); $$->set_spot (@$); } - | E_RIGHTSQUARE { + | E_BRACKET_CLOSE { Music *m = MY_MAKE_MUSIC ("LigatureEvent"); - m->set_property ("span-direction", scm_int2num (STOP)); + m->set_property ("span-direction", scm_from_int (STOP)); m->set_spot (@$); $$ = MY_MAKE_MUSIC ("EventChord"); $$->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL)); $$->set_spot (@$); - scm_gc_unprotect_object (m->self_scm ()); + m->unprotect (); } | E_BACKSLASH { $$ = MY_MAKE_MUSIC ("VoiceSeparator"); @@ -1639,51 +1641,36 @@ command_element: sounds_as_c.smobbed_copy()); $$->set_spot (@$); $$ = 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 (@$); - t->set_spot (@$); + $$, SCM_EOL, false); } | PARTIAL duration_length { Moment m = - unsmob_duration ($2)->get_length (); Music *p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ()); p->set_spot (@$); p = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED, - p, SCM_EOL); + p, SCM_EOL, false); p = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED, - p, SCM_EOL); + p, SCM_EOL, false); $$ = p; } - | CLEF STRING { - SCM proc = ly_lily_module_constant ("make-clef-set"); - SCM result = scm_call_1 (proc, $2); - scm_gc_protect_object (result); - $$ = unsmob_music (result); - } | TIME_T fraction { SCM proc = ly_lily_module_constant ("make-time-signature-set"); SCM result = scm_apply_2 (proc, scm_car ($2), scm_cdr ($2), SCM_EOL); - scm_gc_protect_object (result); $$ = unsmob_music (result); + $$->protect (); } | MARK scalar { SCM proc = ly_lily_module_constant ("make-mark-set"); SCM result = scm_call_1 (proc, $2); - scm_gc_protect_object (result); $$ = unsmob_music (result); + $$->protect (); } ; -command_req: +command_event: E_TILDE { $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent"); } @@ -1704,10 +1691,10 @@ command_req: if (scm_ilength ($3) > 0) { key->set_property ("pitch-alist", $3); - key->set_property ("tonic", Pitch (0,0,0).smobbed_copy ()); + key->set_property ("tonic", Pitch (0, 0, 0).smobbed_copy ()); key->transpose (* unsmob_pitch ($2)); } else { - THIS->parser_error (@3, _ ("Second argument must be pitch list.")); + THIS->parser_error (@3, _ ("second argument must be pitch list")); } $$ = key; @@ -1722,46 +1709,37 @@ post_events: | post_events post_event { $2->set_spot (@2); $$ = scm_cons ($2->self_scm (), $$); - scm_gc_unprotect_object ($2->self_scm ()); - } - | post_events tagged_post_event { - $2 -> set_spot (@2); - $$ = scm_cons ($2->self_scm (), $$); - scm_gc_unprotect_object ($2->self_scm ()); - } - ; - - -tagged_post_event: - '-' TAG embedded_scm post_event { - tag_music ($4, $3, @$); - $$ = $4; + $2->unprotect (); } ; - - + post_event: direction_less_event { $$ = $1; } + | '-' music_function_event { + Music *mus = run_music_function (THIS, $2); + mus->set_spot (@1); + $$ = mus; + } | HYPHEN { if (!THIS->lexer_->is_lyric_state ()) - THIS->parser_error (@1, _ ("Have to be in Lyric mode for lyrics")); + THIS->parser_error (@1, _ ("have to be in Lyric mode for lyrics")); $$ = MY_MAKE_MUSIC ("HyphenEvent"); } | EXTENDER { if (!THIS->lexer_->is_lyric_state ()) - THIS->parser_error (@1, _ ("Have to be in Lyric mode for lyrics")); + THIS->parser_error (@1, _ ("have to be in Lyric mode for lyrics")); $$ = MY_MAKE_MUSIC ("ExtenderEvent"); } | script_dir direction_reqd_event { if ($1) - $2->set_property ("direction", scm_int2num ($1)); + $2->set_property ("direction", scm_from_int ($1)); $$ = $2; } | script_dir direction_less_event { if ($1) - $2->set_property ("direction", scm_int2num ($1)); + $2->set_property ("direction", scm_from_int ($1)); $$ = $2; } | string_number_event @@ -1770,7 +1748,7 @@ post_event: string_number_event: E_UNSIGNED { Music *s = MY_MAKE_MUSIC ("StringNumberEvent"); - s->set_property ("string-number", scm_int2num ($1)); + s->set_property ("string-number", scm_from_int ($1)); s->set_spot (@$); $$ = s; } @@ -1801,10 +1779,10 @@ direction_less_char: | E_CLOSE { $$ = ly_symbol2scm ("escapedParenthesisCloseSymbol"); } - | E_BIGGER { + | E_ANGLE_CLOSE { $$ = ly_symbol2scm ("escapedBiggerSymbol"); } - | E_SMALLER { + | E_ANGLE_OPEN { $$ = ly_symbol2scm ("escapedSmallerSymbol"); } ; @@ -1830,7 +1808,7 @@ direction_less_event: | tremolo_type { Music *a = MY_MAKE_MUSIC ("TremoloEvent"); a->set_spot (@$); - a->set_property ("tremolo-type", scm_int2num ($1)); + a->set_property ("tremolo-type", scm_from_int ($1)); $$ = a; } ; @@ -1844,16 +1822,16 @@ direction_reqd_event: Music *a = MY_MAKE_MUSIC ("ArticulationEvent"); if (scm_is_string (s)) a->set_property ("articulation-type", s); - else THIS->parser_error (@1, _ ("Expecting string as script definition")); + else THIS->parser_error (@1, _ ("expecting string as script definition")); $$ = a; } ; octave_check: /**/ { $$ = SCM_EOL; } - | '=' { $$ = scm_int2num (0); } - | '=' sub_quotes { $$ = scm_int2num ($2); } - | '=' sup_quotes { $$ = scm_int2num ($2); } + | '=' { $$ = scm_from_int (0); } + | '=' sub_quotes { $$ = scm_from_int ($2); } + | '=' sup_quotes { $$ = scm_from_int ($2); } ; sup_quotes: @@ -1939,7 +1917,7 @@ gen_text_def: } | DIGIT { Music *t = MY_MAKE_MUSIC ("FingerEvent"); - t->set_property ("digit", scm_int2num ($1)); + t->set_property ("digit", scm_from_int ($1)); t->set_spot (@$); $$ = t; } @@ -1992,14 +1970,10 @@ optional_notemode_duration: { Duration dd = THIS->default_duration_; $$ = dd.smobbed_copy (); - - THIS->beam_check ($$); } | multiplied_duration { $$ = $1; THIS->default_duration_ = *unsmob_duration ($$); - - THIS->beam_check ($$); } ; @@ -2038,7 +2012,7 @@ multiplied_duration: fraction: FRACTION { $$ = $1; } | UNSIGNED '/' UNSIGNED { - $$ = scm_cons (scm_int2num ($1), scm_int2num ($3)); + $$ = scm_cons (scm_from_int ($1), scm_from_int ($3)); } ; @@ -2064,20 +2038,16 @@ tremolo_type: bass_number: DIGIT { - $$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10)); - $$ = scm_list_2 (ly_lily_module_constant ("number-markup"), - $$); + $$ = scm_from_int ($1); } | UNSIGNED { - $$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10)); - $$ = scm_list_2 (ly_lily_module_constant ("number-markup"), - $$); + $$ = scm_from_int ($1); } | STRING { $$ = $1; } | full_markup { $$ = $1; } ; -bass_mod: +figured_bass_alteration: '-' { $$ = -2; } | '+' { $$ = 2; } | '!' { $$ = 0; } @@ -2087,40 +2057,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 bass_mod { + | bass_figure ']' { + $$ = $1; + unsmob_music ($1)->set_property ("bracket-stop", SCM_BOOL_T); + } + | bass_figure figured_bass_alteration { Music *m = unsmob_music ($1); if ($2) { SCM salter = m->get_property ("alteration"); int alter = scm_is_number (salter) ? scm_to_int (salter) : 0; m->set_property ("alteration", - scm_int2num (alter + $2)); + scm_from_int (alter + $2)); } else { - m->set_property ("alteration", scm_int2num (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"); } - | br_bass_figure ']' { + | '/' { + $$ = ly_symbol2scm ("slash"); + } + ; + +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); } ; @@ -2151,7 +2154,7 @@ optional_rest: simple_element: pitch exclamations questions octave_check optional_notemode_duration optional_rest { if (!THIS->lexer_->is_note_state ()) - THIS->parser_error (@1, _ ("Have to be in Note mode for notes")); + THIS->parser_error (@1, _ ("have to be in Note mode for notes")); Music *n = 0; if ($6) @@ -2165,7 +2168,7 @@ simple_element: if (scm_is_number ($4)) { int q = scm_to_int ($4); - n->set_property ("absolute-octave", scm_int2num (q-1)); + n->set_property ("absolute-octave", scm_from_int (q-1)); } if ($3 % 2) @@ -2175,7 +2178,7 @@ simple_element: Music *v = MY_MAKE_MUSIC ("EventChord"); v->set_property ("elements", scm_list_1 (n->self_scm ())); - scm_gc_unprotect_object (n->self_scm ()); + n->unprotect (); v->set_spot (@$); n->set_spot (@$); @@ -2188,7 +2191,7 @@ simple_element: Music *v = MY_MAKE_MUSIC ("EventChord"); v->set_property ("elements", scm_list_1 (n->self_scm ())); - scm_gc_unprotect_object (n->self_scm ()); + n->unprotect (); v->set_spot (@$); n->set_spot (@$); $$ = v; @@ -2219,33 +2222,33 @@ simple_element: velt->set_property ("elements", scm_list_1 (ev->self_scm ())); velt->set_spot (@$); - scm_gc_unprotect_object (ev->self_scm ()); + ev->unprotect(); $$ = velt; } | MULTI_MEASURE_REST optional_notemode_duration { SCM proc = ly_lily_module_constant ("make-multi-measure-rest"); SCM mus = scm_call_2 (proc, $2, make_input (@$)); - scm_gc_protect_object (mus); $$ = unsmob_music (mus); + $$->protect (); } | lyric_element optional_notemode_duration { if (!THIS->lexer_->is_lyric_state ()) - THIS->parser_error (@1, _ ("Have to be in Lyric mode for lyrics")); + THIS->parser_error (@1, _ ("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 (@$); + Music *levent = MY_MAKE_MUSIC ("LyricEvent"); + levent->set_property ("text", $1); + levent->set_property ("duration",$2); + levent->set_spot (@$); Music *velt = MY_MAKE_MUSIC ("EventChord"); - velt->set_property ("elements", scm_list_1 (lreq->self_scm ())); + velt->set_property ("elements", scm_list_1 (levent->self_scm ())); $$= velt; } | new_chord { if (!THIS->lexer_->is_chord_state ()) - THIS->parser_error (@1, _ ("Have to be in Chord mode for chords")); + THIS->parser_error (@1, _ ("have to be in Chord mode for chords")); $$ = unsmob_music ($1); } ; @@ -2255,7 +2258,7 @@ lyric_element: $$ = $1; } | LYRICS_STRING { - $$ = make_simple_markup ($1); + $$ = $1; } ; @@ -2362,7 +2365,7 @@ number_factor: bare_number: UNSIGNED { - $$ = scm_int2num ($1); + $$ = scm_from_int ($1); } | REAL { $$ = $1; @@ -2371,10 +2374,10 @@ bare_number: $$ = $1; } | REAL NUMBER_IDENTIFIER { - $$ = scm_make_real (scm_to_double ($1) *scm_to_double ($2)); + $$ = scm_from_double (scm_to_double ($1) *scm_to_double ($2)); } | UNSIGNED NUMBER_IDENTIFIER { - $$ = scm_make_real ($1 *scm_to_double ($2)); + $$ = scm_from_double ($1 *scm_to_double ($2)); } ; @@ -2388,23 +2391,6 @@ bare_unsigned: } ; -bare_int: - bare_number { - if (scm_integer_p ($1) == SCM_BOOL_T) - { - int k = scm_to_int ($1); - $$ = k; - } else - { - THIS->parser_error (@1, _ ("need integer number arg")); - $$ = 0; - } - } - | '-' bare_int { - $$ = -$2; - } - ; - exclamations: { $$ = 0; } | exclamations '!' { $$ ++; } @@ -2478,7 +2464,7 @@ markup_braced_list: ; markup_braced_list_body: - /* empty */ { $$ = scm_list (SCM_EOL); } + /* empty */ { $$ = SCM_EOL; } | markup_braced_list_body markup { $$ = scm_cons ($2, $1); } @@ -2527,7 +2513,7 @@ simple_markup: } '{' score_body '}' { Score * sc = $4; $$ = scm_list_2 (ly_lily_module_constant ("score-markup"), sc->self_scm ()); - scm_gc_unprotect_object (sc->self_scm ()); + sc->unprotect (); THIS->lexer_->pop_state (); } | MARKUP_HEAD_SCM0 embedded_scm { @@ -2552,7 +2538,8 @@ simple_markup: markup: markup_head_1_list simple_markup { - $$ = scm_car (scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, scm_list_1 ($2))); + SCM mapper = ly_lily_module_constant ("map-markup-command-list"); + $$ = scm_car (scm_call_2 (mapper, $1, scm_list_1 ($2))); } | simple_markup { $$ = $1; @@ -2576,29 +2563,6 @@ Lily_parser::do_yyparse () } -/* -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 -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; -} - @@ -2614,6 +2578,9 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) if (scm_is_string (sid)) { *destination = sid; return STRING_IDENTIFIER; + } 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; @@ -2629,8 +2596,11 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) *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; @@ -2640,7 +2610,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) *destination = p->self_scm (); return OUTPUT_DEF_IDENTIFIER; - } else if (Text_interface::markup_p (sid)) { + } else if (Text_interface::is_markup (sid)) { *destination = sid; if (is_lyric_state ()) return LYRIC_MARKUP_IDENTIFIER; @@ -2658,7 +2628,7 @@ property_op_to_music (SCM op) SCM symbol = scm_cadr (op); SCM args = scm_cddr (op); SCM grob_val = SCM_UNDEFINED; - SCM grob_sym = SCM_UNDEFINED; + SCM grob_path = SCM_UNDEFINED; SCM val = SCM_UNDEFINED; if (tag == ly_symbol2scm ("assign")) @@ -2668,16 +2638,16 @@ property_op_to_music (SCM op) } else if (tag == ly_symbol2scm ("unset")) m = MY_MAKE_MUSIC ("PropertyUnset"); - else if (tag == ly_symbol2scm ("poppush") - || tag == ly_symbol2scm ("push")) + else if (tag == ly_symbol2scm ("push")) { m = MY_MAKE_MUSIC ("OverrideProperty"); - grob_sym = scm_car (args); - grob_val = scm_cadr (args); + grob_val = scm_car (args); + grob_path = scm_cdr (args); + m->set_property ("pop-first", SCM_BOOL_T); } else if (tag == ly_symbol2scm ("pop")) { m = MY_MAKE_MUSIC ("RevertProperty"); - grob_sym = scm_car (args); + grob_path = args; } m->set_property ("symbol", symbol); @@ -2686,38 +2656,25 @@ property_op_to_music (SCM op) m->set_property ("value", val); if (grob_val != SCM_UNDEFINED) m->set_property ("grob-value", grob_val); - - if (grob_sym != SCM_UNDEFINED) - { - bool itc = do_internal_type_checking_global; - /* UGH. - */ - bool autobeam = ly_c_equal_p (symbol, ly_symbol2scm ("autoBeamSettings")); - if (autobeam) - do_internal_type_checking_global = false; - m->set_property ("grob-property", grob_sym); - if (autobeam) - do_internal_type_checking_global = itc; - } - - if (tag == ly_symbol2scm ("poppush")) - m->set_property ("pop-first", SCM_BOOL_T); - + if (grob_path != SCM_UNDEFINED) + m->set_property ("grob-property-path", grob_path); return m; } Music* -context_spec_music (SCM type, SCM id, Music *m, SCM ops) +context_spec_music (SCM type, SCM id, Music *m, SCM ops, bool create_new) { Music *csm = MY_MAKE_MUSIC ("ContextSpeccedMusic"); csm->set_property ("element", m->self_scm ()); - scm_gc_unprotect_object (m->self_scm ()); + m->unprotect (); csm->set_property ("context-type", scm_is_symbol (type) ? type : scm_string_to_symbol (type)); csm->set_property ("property-operations", ops); + if (create_new) + csm->set_property ("create-new", SCM_BOOL_T); if (scm_is_string (id)) csm->set_property ("context-id", id); @@ -2736,6 +2693,174 @@ get_next_unique_lyrics_context_id () { static int new_context_count; char s[128]; - snprintf (s, 1024, "uniqueContext%d", new_context_count++); + snprintf (s, sizeof (s)-1, "uniqueContext%d", new_context_count++); return scm_makfrom0str (s); } + + +Music * +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"); + bool ok = true; + + if (!to_boolean (scm_call_3 (type_check_proc, scm_cadr (expr), sig, args))) + { + parser->error_level_ = 1; + ok = false; + } + + SCM m = SCM_EOL; + if (ok) + m = scm_apply_0 (func, scm_cons (parser->self_scm(), + scm_cdr (expr))); + + + Music* retval = 0; + if (unsmob_music (m)) + { + retval = unsmob_music (m); + retval->protect (); + } + else + { + if (ok) + loc->error (_ ("music head function must return Music object")); + retval = MY_MAKE_MUSIC ("Music"); + } + retval->set_spot (*loc); + return retval; +} + +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; +} + + +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; +} + +bool +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->internal_set_property (scm_caar (k), scm_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 (); +} + + +SCM +make_chord (SCM pitch, SCM dur, SCM modification_list) +{ + SCM chord_ctor = ly_lily_module_constant ("construct-chord"); + SCM ch = scm_call_3 (chord_ctor, pitch, dur, modification_list); + + unsmob_music (ch)->protect(); + return ch; +} + + +/* 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))); +} + +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; +} + +Music* +make_music_relative (Pitch start, Music *music) +{ + Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic"); + relative->set_property ("element", music->self_scm ()); + + Pitch last = music->to_relative_octave (start); + if (lily_1_8_relative) + music->set_property ("last-pitch", last.smobbed_copy ()); + return relative; +} + +Music * +make_lyric_combine_music (SCM name, Music *music) +{ + Music *combine = MY_MAKE_MUSIC ("LyricCombineMusic"); + combine->set_property ("element", music->self_scm ()); + combine->set_property ("associated-context", name); + return combine; +} + + +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 (); +}