X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=8dd76671456cebaf4341527c55254fe61844b494;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=2b887d0046b58ef940e2fa3623f54219c5f8c387;hpb=32d230ff2572d364e4d94ccfa2f7643d31fd32a4;p=lilypond.git diff --git a/lily/lexer.ll b/lily/lexer.ll index 2b887d0046..8dd7667145 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -4,7 +4,7 @@ source file of the LilyPond music typesetter - (c) 1996--2006 Han-Wen Nienhuys + (c) 1996--2008 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -41,8 +41,9 @@ using namespace std; #include "interval.hh" #include "lily-guile.hh" #include "lily-lexer.hh" -#include "lilypond-input-version.hh" +#include "lilypond-version.hh" #include "main.hh" +#include "music.hh" #include "music-function.hh" #include "parse-scm.hh" #include "parser.hh" @@ -60,8 +61,8 @@ RH 7 fix (?) void strip_trailing_white (string&); void strip_leading_white (string&); string lyric_fudge (string s); -int music_function_type (SCM); SCM lookup_markup_command (string s); +SCM lookup_markup_list_command (string s); bool is_valid_version (string s); @@ -80,11 +81,6 @@ bool is_valid_version (string s); (*(YYLTYPE*)lexloc) #define YY_USER_ACTION add_lexed_char (YYLeng ()); -/* - -LYRICS ({AA}|{TEX})[^0-9 \t\n\f]* - -*/ SCM scan_fraction (string); @@ -103,6 +99,7 @@ SCM (* scm_parse_error_handler) (void *); %option never-interactive %option warn +%x extratoken %x chords %x figures %x incl @@ -112,20 +109,25 @@ SCM (* scm_parse_error_handler) (void *); %x markup %x notes %x quote +%x sourcefileline %x sourcefilename %x version -A [a-zA-Z] +A [a-zA-Z\200-\377] AA {A}|_ N [0-9] AN {AA}|{N} +ANY_CHAR (.|\n) PUNCT [?!:'`] ACCENT \\[`'"^] -NATIONAL [\001-\006\021-\027\031\036\200-\377] +NATIONAL [\001-\006\021-\027\031\036] TEX {AA}|-|{PUNCT}|{ACCENT}|{NATIONAL} WORD {A}{AN}* DASHED_WORD {A}({AN}|-)* DASHED_KEY_WORD \\{DASHED_WORD} + + + ALPHAWORD {A}+ DIGIT {N} UNSIGNED {N}+ @@ -145,6 +147,7 @@ ESCAPED [nt\\'"] EXTENDER __ HYPHEN -- BOM_UTF8 \357\273\277 + %% @@ -152,7 +155,25 @@ BOM_UTF8 \357\273\277 // windows-suck-suck-suck } -{BOM_UTF8} { +{ANY_CHAR} { + /* Generate a token without swallowing anything */ + + /* First unswallow the eaten character */ + add_lexed_char (-YYLeng ()); + yyless (0); + + /* produce requested token */ + int type = extra_token_types_.back (); + extra_token_types_.pop_back (); + if (extra_token_types_.empty ()) + yy_pop_state (); + + return type; +} + + /* Use the trailing context feature. Otherwise, the BOM will not be + found if the file starts with an identifier definition. */ +{BOM_UTF8}/.* { if (this->lexloc->line_number () != 1 || this->lexloc->column_number () != 0) { LexerError (_ ("stray UTF-8 BOM encountered").c_str ()); @@ -179,12 +200,21 @@ BOM_UTF8 \357\273\277 } } +{ + \" { + start_quote (); + } +} + \\version{WHITE}* { yy_push_state (version); } \\sourcefilename{WHITE}* { yy_push_state (sourcefilename); } +\\sourcefileline{WHITE}* { + yy_push_state (sourcefileline); +} \"[^"]*\" { /* got the version number */ string s (YYText () + 1); s = s.substr (0, s.rfind ('\"')); @@ -209,9 +239,18 @@ BOM_UTF8 \357\273\277 progress_indication ("\n"); scm_module_define (scm_car (scopes_), ly_symbol2scm ("input-file-name"), - scm_makfrom0str (s.c_str ())); + ly_string2scm (s)); + +} + +{INT} { + int i; + sscanf (YYText (), "%d", &i); + yy_pop_state (); + this->here_input ().get_source_file ()->set_line (here_input ().start (), i); } + . { LexerError (_ ("quoted string expected after \\version").c_str ()); yy_pop_state (); @@ -220,6 +259,10 @@ BOM_UTF8 \357\273\277 LexerError (_ ("quoted string expected after \\sourcefilename").c_str ()); yy_pop_state (); } +. { + LexerError (_ ("integer expected after \\sourcefileline").c_str ()); + yy_pop_state (); +} { [^\%]* { } @@ -231,7 +274,7 @@ BOM_UTF8 \357\273\277 } <> { LexerError (_ ("EOF found inside a comment").c_str ()); - is_main_input_ = false; + is_main_input_ = false; // should be safe , can't have \include in --safe. if (! close_input ()) yyterminate (); // can't move this, since it actually rets a YY_NULL } @@ -283,7 +326,7 @@ BOM_UTF8 \357\273\277 } {RESTNAME} { char const *s = YYText (); - yylval.scm = scm_makfrom0str (s); + yylval.scm = scm_from_locale_string (s); return RESTNAME; } R { @@ -294,7 +337,7 @@ BOM_UTF8 \357\273\277 Input hi = here_input(); hi.step_forward (); SCM sval = ly_parse_scm (hi.start (), &n, hi, - be_safe_global && is_main_input_); + be_safe_global && is_main_input_, parser_); if (sval == SCM_UNDEFINED) { @@ -315,16 +358,26 @@ BOM_UTF8 \357\273\277 } yylval.scm = sval; - return SCM_T; + return SCM_TOKEN; } { - \<\< { + \<\< { return DOUBLE_ANGLE_OPEN; } - \>\> { + \>\> { return DOUBLE_ANGLE_CLOSE; } } + +{ + \< { + return ANGLE_OPEN; + } + \> { + return ANGLE_CLOSE; + } +} + { _ { return FIGURE_SPACE; @@ -362,36 +415,9 @@ BOM_UTF8 \357\273\277 yylval.i = String_convert::dec2int (string (YYText () +1)); return E_UNSIGNED; } - \" { - start_quote (); - } } -\" { - start_quote (); -} -{ - \\{ESCAPED} { - *yylval.string += to_string (escaped_char (YYText ()[1])); - } - [^\\"]+ { - *yylval.string += YYText (); - } - \" { - - yy_pop_state (); - - /* yylval is union. Must remember STRING before setting SCM*/ - string *sp = yylval.string; - yylval.scm = scm_makfrom0str (sp->c_str ()); - delete sp; - return STRING; - } - . { - *yylval.string += YYText (); - } -} -{ +{ \\{ESCAPED} { *yylval.string += to_string (escaped_char (YYText ()[1])); } @@ -404,9 +430,9 @@ BOM_UTF8 \357\273\277 /* yylval is union. Must remember STRING before setting SCM*/ string *sp = yylval.string; - yylval.scm = scm_makfrom0str (sp->c_str ()); + yylval.scm = ly_string2scm (*sp); delete sp; - return LYRICS_STRING; + return is_lyric_state () ? LYRICS_STRING : STRING; } . { *yylval.string += YYText (); @@ -441,7 +467,7 @@ BOM_UTF8 \357\273\277 if (c == '{' || c == '}') // brace open is for not confusing dumb tools. here_input ().warning ( _ ("Brace found at end of lyric. Did you forget a space?")); - yylval.scm = scm_makfrom0str (s.c_str ()); + yylval.scm = ly_string2scm (s); return LYRICS_STRING; @@ -465,9 +491,6 @@ BOM_UTF8 \357\273\277 yylval.i = String_convert::dec2int (string (YYText ())); return UNSIGNED; } - \" { - start_quote (); - } - { return CHORD_MINUS; } @@ -490,16 +513,13 @@ BOM_UTF8 \357\273\277 { - \" { - start_quote (); - } \\score { return SCORE; } {MARKUPCOMMAND} { string str (YYText () + 1); SCM s = lookup_markup_command (str); - + SCM s2 = lookup_markup_list_command (str); if (scm_is_pair (s) && scm_is_symbol (scm_cdr (s)) ) { yylval.scm = scm_car(s); SCM tag = scm_cdr(s); @@ -519,6 +539,10 @@ BOM_UTF8 \357\273\277 return MARKUP_HEAD_SCM0_MARKUP1; else if (tag == ly_symbol2scm ("scheme0-scheme1-markup2")) return MARKUP_HEAD_SCM0_SCM1_MARKUP2; + else if (tag == ly_symbol2scm ("scheme0-scheme1-markup2-markup3")) + return MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3; + else if (tag == ly_symbol2scm ("scheme0-markup1-markup2")) + return MARKUP_HEAD_SCM0_MARKUP1_MARKUP2; else if (tag == ly_symbol2scm ("scheme0-scheme1-scheme2")) return MARKUP_HEAD_SCM0_SCM1_SCM2; else { @@ -526,6 +550,24 @@ BOM_UTF8 \357\273\277 ly_display_scm (s); assert(false); } + } else if (scm_is_pair (s2) && scm_is_symbol (scm_cdr (s2))) { + yylval.scm = scm_car(s2); + SCM tag = scm_cdr(s2); + if (tag == ly_symbol2scm("empty")) + return MARKUP_LIST_HEAD_EMPTY; + else if (tag == ly_symbol2scm ("scheme0")) + return MARKUP_LIST_HEAD_SCM0; + else if (tag == ly_symbol2scm ("markup-list0")) + return MARKUP_LIST_HEAD_LIST0; + else if (tag == ly_symbol2scm ("scheme0-markup-list1")) + return MARKUP_LIST_HEAD_SCM0_LIST1; + else if (tag == ly_symbol2scm ("scheme0-scheme1-markup-list2")) + return MARKUP_LIST_HEAD_SCM0_SCM1_LIST2; + else { + programming_error ("no parser tag defined for this markup list signature"); + ly_display_scm (s); + assert(false); + } } else return scan_escaped_word (str); } @@ -540,7 +582,7 @@ BOM_UTF8 \357\273\277 if (c == '{' || c == '}') here_input ().warning ( _ ("Brace found at end of markup. Did you forget a space?")); - yylval.scm = scm_makfrom0str (s.c_str ()); + yylval.scm = ly_string2scm (s); return STRING; @@ -550,10 +592,14 @@ BOM_UTF8 \357\273\277 } } -<> { +<*><> { if (is_main_input_) { - is_main_input_ = false; + /* 2 = init.ly + current file. + > because we're before closing, but is_main_input_ should + reflect after. + */ + is_main_input_ = include_stack_.size () > 2; if (!close_input ()) /* Returns YY_NULL */ yyterminate (); @@ -646,6 +692,20 @@ BOM_UTF8 \357\273\277 %% +/* Make the lexer generate a token of the given type as the next token. + TODO: make it possible to define a value for the token as well */ +void +Lily_lexer::push_extra_token (int token_type) +{ + if (extra_token_types_.empty ()) + { + if (YY_START != extratoken) + hidden_state_ = YY_START; + yy_push_state (extratoken); + } + extra_token_types_.push_back (token_type); +} + void Lily_lexer::push_chord_state (SCM tab) { @@ -689,6 +749,7 @@ Lily_lexer::pop_state () { if (YYSTATE == notes || YYSTATE == chords) pitchname_tab_stack_ = scm_cdr (pitchname_tab_stack_); + yy_pop_state (); } @@ -717,7 +778,20 @@ Lily_lexer::scan_escaped_word (string str) if (is_music_function (sid)) { yylval.scm = get_music_function_transform (sid); - return music_function_type (yylval.scm); + + SCM s = scm_object_property (yylval.scm, ly_symbol2scm ("music-function-signature")); + push_extra_token (EXPECT_NO_MORE_ARGS); + for (; scm_is_pair (s); s = scm_cdr (s)) + { + if (scm_car (s) == ly_music_p_proc) + push_extra_token (EXPECT_MUSIC); + else if (scm_car (s) == ly_lily_module_constant ("markup?")) + push_extra_token (EXPECT_MARKUP); + else if (ly_is_procedure (scm_car (s))) + push_extra_token (EXPECT_SCM); + else programming_error ("Function parameter without type-checking predicate"); + } + return MUSIC_FUNCTION; } if (sid != SCM_UNDEFINED) @@ -729,7 +803,7 @@ Lily_lexer::scan_escaped_word (string str) string msg (_f ("unknown escaped string: `\\%s'", str)); LexerError (msg.c_str ()); - yylval.scm = scm_makfrom0str (str.c_str ()); + yylval.scm = ly_string2scm (str); return STRING; } @@ -750,39 +824,49 @@ Lily_lexer::scan_bare_word (string str) else if (scm_is_symbol (yylval.scm)) return DRUM_PITCH; } - else if ((handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F) + else if ((YYSTATE == chords) + && (handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F) { yylval.scm = scm_cdr (handle); return CHORD_MODIFIER; } } - yylval.scm = scm_makfrom0str (str.c_str ()); + yylval.scm = ly_string2scm (str); return STRING; } +int +Lily_lexer::get_state () const +{ + if (YY_START == extratoken) + return hidden_state_; + else + return YY_START; +} + bool Lily_lexer::is_note_state () const { - return YY_START == notes; + return get_state () == notes; } bool Lily_lexer::is_chord_state () const { - return YY_START == chords; + return get_state () == chords; } bool Lily_lexer::is_lyric_state () const { - return YY_START == lyrics; + return get_state () == lyrics; } bool Lily_lexer::is_figure_state () const { - return YY_START == figures; + return get_state () == figures; } /* @@ -821,12 +905,18 @@ is_valid_version (string s) { Lilypond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL ); Lilypond_version ver (s); - if (! ((ver >= oldest_version) && (ver <= current))) + if (int (ver) < oldest_version) { - non_fatal_error (_f ("Incorrect lilypond version: %s (%s, %s)", ver.to_string (), oldest_version.to_string (), current.to_string ())); - non_fatal_error (_ ("Consider updating the input with the convert-ly script")); + non_fatal_error (_f ("file too old: %s (oldest supported: %s)", ver.to_string (), oldest_version.to_string ())); + non_fatal_error (_ ("consider updating the input with the convert-ly script")); return false; - } + } + + if (ver > current) + { + non_fatal_error (_f ("program too old: %s (file requires: %s)", current.to_string (), ver.to_string ())); + return false; + } return true; } @@ -877,60 +967,14 @@ SCM lookup_markup_command (string s) { SCM proc = ly_lily_module_constant ("lookup-markup-command"); - return scm_call_1 (proc, scm_makfrom0str (s.c_str ())); -} - -struct Parser_signature -{ - char *symbol; - int token_type; -}; -static SCM signature_hash_table; - -static void init_signature_hash_table () -{ - signature_hash_table = scm_gc_protect_object (scm_c_make_hash_table (31)); - Parser_signature sigs[] = { - {"scm", MUSIC_FUNCTION_SCM}, - {"music", MUSIC_FUNCTION_MUSIC}, - {"scm-music", MUSIC_FUNCTION_SCM_MUSIC}, - {"scm-scm", MUSIC_FUNCTION_SCM_SCM}, - {"music-music", MUSIC_FUNCTION_MUSIC_MUSIC}, - {"scm-music-music", MUSIC_FUNCTION_SCM_MUSIC_MUSIC}, - {"scm-scm-music-music", MUSIC_FUNCTION_SCM_SCM_MUSIC_MUSIC}, - {"scm-scm-music", MUSIC_FUNCTION_SCM_SCM_MUSIC}, - {"scm-scm-scm-music", MUSIC_FUNCTION_SCM_SCM_SCM_SCM_MUSIC}, - {"scm-scm-scm-scm-music", MUSIC_FUNCTION_SCM_SCM_SCM_MUSIC}, - {"scm-scm-scm", MUSIC_FUNCTION_SCM_SCM_SCM}, - {"markup", MUSIC_FUNCTION_MARKUP}, - {"markup-music", MUSIC_FUNCTION_MARKUP_MUSIC}, - {"markup-markup", MUSIC_FUNCTION_MARKUP_MARKUP}, - {"markup-music-music", MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC}, - {"markup-markup-music", MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC}, - {"noarg", MUSIC_FUNCTION}, - {0,0} - }; - - for (int i = 0; sigs[i].symbol; i++) - scm_hashq_set_x (signature_hash_table, scm_gc_protect_object (ly_symbol2scm (sigs[i].symbol)), - scm_from_int (sigs[i].token_type)); + return scm_call_1 (proc, ly_string2scm (s)); } -int -music_function_type (SCM func) +SCM +lookup_markup_list_command (string s) { - if (!signature_hash_table) - init_signature_hash_table (); - - SCM type = scm_object_property (func, ly_symbol2scm ("music-function-signature-keyword")); - SCM token_type = scm_hashq_ref (signature_hash_table, type, SCM_BOOL_F); - if (!scm_is_number (token_type)) - { - programming_error (_ ("can't find signature for music function")); - return MUSIC_FUNCTION_SCM; - } - - return scm_to_int (token_type); + SCM proc = ly_lily_module_constant ("lookup-markup-list-command"); + return scm_call_1 (proc, ly_string2scm (s)); } /* Shut up lexer warnings. */