X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=0df70e20082f50bb4a6f131b00d6f55382f9b6af;hb=c110ed962e72db6731de40ce8416d13f341ab678;hp=07bb33c6f7187979356d7e6ffac05cca3ba095a5;hpb=47338f3a1b9696e9d6d49133505d229168d002d0;p=lilypond.git diff --git a/lily/lexer.ll b/lily/lexer.ll index 07bb33c6f7..0df70e2008 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -1,4 +1,4 @@ -%{ // -*- 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. @@ -86,13 +86,10 @@ SCM lookup_markup_list_command (string s); bool is_valid_version (string s); -#define start_quote() \ - yy_push_state (quote);\ - yylval.string = new string - -#define start_lyric_quote() \ - yy_push_state (lyric_quote);\ - yylval.string = new string +#define start_quote() do { \ + yy_push_state (quote); \ + yylval = SCM_EOL; \ + } while (0) #define yylval (*lexval_) @@ -122,8 +119,8 @@ SCM (* scm_parse_error_handler) (void *); %x figures %x incl %x lyrics -%x lyric_quote %x longcomment +%x maininput %x markup %x notes %x quote @@ -150,18 +147,10 @@ SCM (* scm_parse_error_handler) (void *); A [a-zA-Z\200-\377] AA {A}|_ N [0-9] -AN {AA}|{N} ANY_CHAR (.|\n) -PUNCT [][()?!:'`] -SPECIAL_CHAR [&@] -NATIONAL [\001-\006\021-\027\031\036] -TEX {AA}|-|{PUNCT}|{NATIONAL}|{SPECIAL_CHAR} -DASHED_WORD {A}({AN}|-)* -DASHED_KEY_WORD \\{DASHED_WORD} - +WORD {A}([-_]{A}|{A})* +COMMAND \\{WORD} - -ALPHAWORD {A}+ UNSIGNED {N}+ E_UNSIGNED \\{N}+ FRACTION {N}+\/{N}+ @@ -171,10 +160,7 @@ WHITE [ \n\t\f\r] HORIZONTALWHITE [ \t] BLACK [^ \n\t\f\r] RESTNAME [rs] -NOTECOMMAND \\{A}+ -MARKUPCOMMAND \\({A}|[-_])+ -LYRICS ({AA}|{TEX})[^0-9 \t\n\r\f]* -ESCAPED [nt\\'"] +ESCAPED [nt\\''""] EXTENDER __ HYPHEN -- BOM_UTF8 \357\273\277 @@ -195,7 +181,7 @@ BOM_UTF8 \357\273\277 /* produce requested token */ int type = scm_to_int (scm_caar (extra_tokens_)); - yylval.scm = scm_cdar (extra_tokens_); + yylval = scm_cdar (extra_tokens_); extra_tokens_ = scm_cdr (extra_tokens_); if (scm_is_null (extra_tokens_)) yy_pop_state (); @@ -208,7 +194,7 @@ BOM_UTF8 \357\273\277 /* produce requested token */ int type = scm_to_int (scm_caar (extra_tokens_)); - yylval.scm = scm_cdar (extra_tokens_); + yylval = scm_cdar (extra_tokens_); extra_tokens_ = scm_cdr (extra_tokens_); if (scm_is_null (extra_tokens_)) yy_pop_state (); @@ -231,16 +217,10 @@ BOM_UTF8 \357\273\277 "%{" { yy_push_state (longcomment); } - %[^{\n\r][^\n\r]*[\n\r] { - (void) YYText_utf8 (); - } - %[^{\n\r] { // backup rule + %[^{\n\r][^\n\r]*[\n\r]? { (void) YYText_utf8 (); } - %[\n\r] { - } - %[^{\n\r][^\n\r]* { - (void) YYText_utf8 (); + %[\n\r]? { } {WHITE}+ { @@ -262,7 +242,7 @@ BOM_UTF8 \357\273\277 \\sourcefileline{WHITE}* { yy_push_state (sourcefileline); } -\"[^"]*\" { /* got the version number */ +\"[^""]*\" { /* got the version number */ string s (YYText_utf8 () + 1); s = s.substr (0, s.rfind ('\"')); @@ -271,10 +251,10 @@ BOM_UTF8 \357\273\277 SCM top_scope = scm_car (scm_last_pair (scopes_)); scm_module_define (top_scope, ly_symbol2scm ("version-seen"), SCM_BOOL_T); - if (!is_valid_version (s)) + if (!is_valid_version (s)) { + yylval = SCM_UNSPECIFIED; return INVALID; - - + } } \"[^""]*\" { string s (YYText_utf8 () + 1); @@ -327,10 +307,14 @@ BOM_UTF8 \357\273\277 if (!is_main_input_) { start_main_input (); + main_input_level_ = include_stack_.size (); is_main_input_ = true; + int state = YYSTATE; + yy_push_state (maininput); + yy_push_state (state); } else - error (_ ("\\maininput not allowed outside init files")); + LexerError (_ ("\\maininput not allowed outside init files").c_str ()); } \\include { @@ -390,19 +374,31 @@ BOM_UTF8 \357\273\277 } \"[^""]* { // backup rule - error (_ ("end quote missing")); - exit (1); + LexerError (_ ("end quote missing").c_str ()); + yy_pop_state (); } + + /* Flex picks the longest matching pattern including trailing + * contexts. Without the backup pattern, r-. does not trigger the + * {RESTNAME} rule but rather the {WORD}/[-_] rule coming later, + * needed for avoiding backup states. + */ + +{RESTNAME}/[-_] | // pseudo backup rule {RESTNAME} { char const *s = YYText (); - yylval.scm = scm_from_locale_string (s); + yylval = scm_from_locale_string (s); return RESTNAME; } +q/[-_] | // pseudo backup rule q { + yylval = SCM_UNSPECIFIED; return CHORD_REPETITION; } +R/[-_] | // pseudo backup rule R { + yylval = SCM_UNSPECIFIED; return MULTI_MEASURE_REST; } # { //embedded scm @@ -421,7 +417,7 @@ BOM_UTF8 \357\273\277 } char_count_stack_.back () += n; - yylval.scm = sval; + yylval = sval; return SCM_TOKEN; } @@ -441,173 +437,193 @@ BOM_UTF8 \357\273\277 sval = eval_scm (sval, '$'); int token = scan_scm_id (sval); - if (!scm_is_eq (yylval.scm, SCM_UNSPECIFIED)) + if (!scm_is_eq (yylval, SCM_UNSPECIFIED)) return token; } { \<\< { + yylval = SCM_UNSPECIFIED; return DOUBLE_ANGLE_OPEN; } \>\> { + yylval = SCM_UNSPECIFIED; return DOUBLE_ANGLE_CLOSE; } } { \< { + yylval = SCM_UNSPECIFIED; return ANGLE_OPEN; } \> { + yylval = SCM_UNSPECIFIED; return ANGLE_CLOSE; } } { _ { + yylval = SCM_UNSPECIFIED; return FIGURE_SPACE; } \> { + yylval = SCM_UNSPECIFIED; return FIGURE_CLOSE; } \< { + yylval = SCM_UNSPECIFIED; return FIGURE_OPEN; } } { - {ALPHAWORD} { + {WORD}/[-_] | // backup rule + {WORD} { return scan_bare_word (YYText_utf8 ()); } - {NOTECOMMAND} { + {COMMAND}/[-_] | // backup rule + {COMMAND} { return scan_escaped_word (YYText_utf8 () + 1); } {FRACTION} { - yylval.scm = scan_fraction (YYText ()); + yylval = scan_fraction (YYText ()); return FRACTION; } {UNSIGNED}/\/ | // backup rule {UNSIGNED} { - yylval.scm = scm_c_read_string (YYText ()); + yylval = scm_c_read_string (YYText ()); return UNSIGNED; } {E_UNSIGNED} { - yylval.i = String_convert::dec2int (string (YYText () +1)); + yylval = scm_c_read_string (YYText () + 1); return E_UNSIGNED; } } -{ +{ \\{ESCAPED} { - *yylval.string += to_string (escaped_char (YYText ()[1])); + char c = escaped_char (YYText ()[1]); + yylval = scm_cons (scm_from_locale_stringn (&c, 1), + yylval); } [^\\""]+ { - *yylval.string += YYText_utf8 (); + yylval = scm_cons (scm_from_locale_string (YYText_utf8 ()), + yylval); } \" { yy_pop_state (); /* yylval is union. Must remember STRING before setting SCM*/ - string *sp = yylval.string; - yylval.scm = ly_string2scm (*sp); - delete sp; - return is_lyric_state () ? LYRICS_STRING : STRING; + + yylval = scm_string_concatenate_reverse (yylval, + SCM_UNDEFINED, + SCM_UNDEFINED); + + return STRING; } \\ { - *yylval.string += YYText (); + yylval = scm_cons (scm_from_locale_string (YYText ()), + yylval); } } { \" { - start_lyric_quote (); + start_quote (); } {FRACTION} { - yylval.scm = scan_fraction (YYText ()); + yylval = scan_fraction (YYText ()); return FRACTION; } - {UNSIGNED}/\/[^0-9] { // backup rule - yylval.scm = scm_c_read_string (YYText ()); - return UNSIGNED; - } {UNSIGNED}/\/ | // backup rule {UNSIGNED} { - yylval.scm = scm_c_read_string (YYText ()); + yylval = scm_c_read_string (YYText ()); return UNSIGNED; } - {NOTECOMMAND} { + {COMMAND}/[-_] | // backup rule + {COMMAND} { return scan_escaped_word (YYText_utf8 () + 1); } - {LYRICS} { + /* Characters needed to express durations, assignments, barchecks */ + [*.=|] { + yylval = SCM_UNSPECIFIED; + return YYText ()[0]; + } + [^$#{}\"\\ \t\n\r\f0-9]+ { /* ugr. This sux. */ - string s (YYText_utf8 ()); + string s (YYText_utf8 ()); + yylval = SCM_UNSPECIFIED; if (s == "__") - return yylval.i = EXTENDER; + return EXTENDER; if (s == "--") - return yylval.i = HYPHEN; + return HYPHEN; s = lyric_fudge (s); + yylval = ly_string2scm (s); - char c = s[s.length () - 1]; - 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 = ly_string2scm (s); - - - return LYRICS_STRING; + return STRING; } + /* This should really just cover {} */ . { - return YYText ()[0]; // LYRICS already catches all multibytes. + yylval = SCM_UNSPECIFIED; + return YYText ()[0]; // above catches all multibytes. } } { - {ALPHAWORD} { + {WORD}/[-_] | // backup rule + {WORD} { return scan_bare_word (YYText_utf8 ()); } - {NOTECOMMAND} { + {COMMAND}/[-_] | // backup rule + {COMMAND} { return scan_escaped_word (YYText_utf8 () + 1); } {FRACTION} { - yylval.scm = scan_fraction (YYText ()); + yylval = scan_fraction (YYText ()); return FRACTION; } - {UNSIGNED}/\/[^0-9] { // backup rule - yylval.scm = scm_c_read_string (YYText ()); - return UNSIGNED; - } {UNSIGNED}/\/ | // backup rule {UNSIGNED} { - yylval.scm = scm_c_read_string (YYText ()); + yylval = scm_c_read_string (YYText ()); return UNSIGNED; } - { + yylval = SCM_UNSPECIFIED; return CHORD_MINUS; } : { + yylval = SCM_UNSPECIFIED; return CHORD_COLON; } \/\+ { + yylval = SCM_UNSPECIFIED; return CHORD_BASS; } \/ { + yylval = SCM_UNSPECIFIED; return CHORD_SLASH; } \^ { + yylval = SCM_UNSPECIFIED; return CHORD_CARET; } . { - return YYText ()[0]; // ALPHAWORD catches all multibyte. + yylval = SCM_UNSPECIFIED; + return YYText ()[0]; // WORD catches all multibyte. } } { \\score { + yylval = SCM_UNSPECIFIED; return SCORE; } - {MARKUPCOMMAND} { + {COMMAND}/[-_] | // backup rule + {COMMAND} { string str (YYText_utf8 () + 1); int token_type = MARKUP_FUNCTION; @@ -637,7 +653,7 @@ BOM_UTF8 \357\273\277 // in reverse order, so the first token pushed in the // loop will be EXPECT_NO_MORE_ARGS. - yylval.scm = scm_car(s); + yylval = scm_car(s); // yylval now contains the function to call as token // value (for token type MARKUP_FUNCTION or @@ -657,42 +673,47 @@ BOM_UTF8 \357\273\277 } return token_type; } - [{}] { - return YYText ()[0]; - } [^$#{}\"\\ \t\n\r\f]+ { string s (YYText_utf8 ()); - char c = s[s.length () - 1]; - /* brace open is for not confusing dumb tools. */ - if (c == '{' || c == '}') - here_input ().warning ( - _ ("Brace found at end of markup. Did you forget a space?")); - yylval.scm = ly_string2scm (s); - - + yylval = ly_string2scm (s); return STRING; } . { - return YYText()[0]; // Above is catchall for multibyte + yylval = SCM_UNSPECIFIED; + return YYText ()[0]; // Above is catchall for multibyte } } <> { LexerError (_ ("EOF found inside a comment").c_str ()); - 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 + yy_pop_state (); } -<> { if (is_main_input_) +<> { + LexerError (_ ("EOF found inside string").c_str ()); + yy_pop_state (); +} + +<> { + yylval = SCM_UNSPECIFIED; + if (is_main_input_) { - /* 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 ()) + is_main_input_ = include_stack_.size () > main_input_level_; + if (!is_main_input_) + { + main_input_level_ = 0; + pop_state (); + if (YYSTATE != maininput) + { + LexerError (_ ("Unfinished main input").c_str ()); + do { + pop_state (); + } while (YYSTATE != maininput); + } + pop_state (); + } + if (!close_input () || !is_main_input_) /* Returns YY_NULL */ yyterminate (); } @@ -701,52 +722,60 @@ BOM_UTF8 \357\273\277 yyterminate (); } +. { + while (include_stack_.size () > main_input_level_ + && close_input ()) + ; + yyterminate (); +} + { - {DASHED_WORD} { + {WORD}/[-_] | // backup rule + {WORD} { return scan_bare_word (YYText_utf8 ()); } - {DASHED_KEY_WORD} { + {COMMAND}/[-_] | // backup rule + {COMMAND} { return scan_escaped_word (YYText_utf8 () + 1); } } {FRACTION} { - yylval.scm = scan_fraction (YYText ()); + yylval = scan_fraction (YYText ()); return FRACTION; } -{UNSIGNED} | // backup rule {REAL} { - yylval.scm = scm_c_read_string (YYText ()); - return REAL; -} --\. { // backup rule - yylval.scm = scm_from_double (0.0); + yylval = scm_c_read_string (YYText ()); return REAL; } {UNSIGNED}/\/ | // backup rule {UNSIGNED} { - yylval.scm = scm_c_read_string (YYText ()); + yylval = scm_c_read_string (YYText ()); return UNSIGNED; } [{}] { - + yylval = SCM_UNSPECIFIED; return YYText ()[0]; } -[*:=] { - char c = YYText ()[0]; - return c; +-/\. | // backup rule +[*:=] { + yylval = SCM_UNSPECIFIED; + return YYText ()[0]; } . { + yylval = SCM_UNSPECIFIED; return YYText ()[0]; } \\. { + yylval = SCM_UNSPECIFIED; char c = YYText ()[1]; switch (c) { @@ -779,6 +808,7 @@ BOM_UTF8 \357\273\277 <*>.[\200-\277]* { string msg = _f ("invalid character: `%s'", YYText_utf8 ()); LexerError (msg.c_str ()); + yylval = SCM_UNSPECIFIED; return '%'; // Better not return half a utf8 character. } @@ -836,12 +866,22 @@ Lily_lexer::push_markup_state () void Lily_lexer::push_note_state (SCM alist) { + bool extra = (YYSTATE == extratoken); + SCM p = scm_assq (alist, pitchname_tab_stack_); + if (extra) + yy_pop_state (); + if (scm_is_false (p)) p = scm_cons (alist, alist_to_hashq (alist)); pitchname_tab_stack_ = scm_cons (p, pitchname_tab_stack_); yy_push_state (notes); + + if (extra) { + hidden_state_ = YYSTATE; + yy_push_state (extratoken); + } } void @@ -866,7 +906,7 @@ Lily_lexer::pop_state () int Lily_lexer::identifier_type (SCM sid) { - int k = try_special_identifiers (&yylval.scm , sid); + int k = try_special_identifiers (&yylval , sid); return k >= 0 ? k : SCM_IDENTIFIER; } @@ -878,20 +918,25 @@ Lily_lexer::scan_escaped_word (string str) // SCM sym = ly_symbol2scm (str.c_str ()); + yylval = SCM_UNSPECIFIED; int i = lookup_keyword (str); - if (i == MARKUP && is_lyric_state ()) - return LYRIC_MARKUP; + if (i != -1) return i; SCM sid = lookup_identifier (str); + if (Music *m = unsmob_music (sid)) + { + m->set_spot (override_input (last_input_)); + } + if (sid != SCM_UNDEFINED) return scan_scm_id (sid); string msg (_f ("unknown escaped string: `\\%s'", str)); LexerError (msg.c_str ()); - yylval.scm = ly_string2scm (str); + yylval = ly_string2scm (str); return STRING; } @@ -903,7 +948,7 @@ Lily_lexer::scan_scm_id (SCM sid) { int funtype = SCM_FUNCTION; - yylval.scm = sid; + yylval = sid; SCM s = get_music_function_signature (sid); SCM cs = scm_car (s); @@ -949,7 +994,7 @@ Lily_lexer::scan_scm_id (SCM sid) } return funtype; } - yylval.scm = sid; + yylval = sid; return identifier_type (sid); } @@ -963,20 +1008,20 @@ Lily_lexer::scan_bare_word (string str) handle = scm_hashq_get_handle (scm_cdar (pitchname_tab_stack_), sym); if (scm_is_pair (handle)) { - yylval.scm = scm_cdr (handle); - if (unsmob_pitch (yylval.scm)) + yylval = scm_cdr (handle); + if (unsmob_pitch (yylval)) return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH; - else if (scm_is_symbol (yylval.scm)) + else if (scm_is_symbol (yylval)) return DRUM_PITCH; } else if ((YYSTATE == chords) && (handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F) { - yylval.scm = scm_cdr (handle); + yylval = scm_cdr (handle); return CHORD_MODIFIER; } } - yylval.scm = ly_string2scm (str); + yylval = ly_string2scm (str); return STRING; } @@ -1044,19 +1089,26 @@ Lily_lexer::eval_scm (SCM readerdata, char extra_token) sval = scm_struct_ref (sval, SCM_INUM0); if (scm_is_pair (sval)) { - for (SCM v = scm_reverse (scm_cdr (sval)); - scm_is_pair (v); - v = scm_cdr (v)) + for (SCM p = scm_reverse (scm_cdr (sval)); + scm_is_pair (p); + p = scm_cdr (p)) { + SCM v = scm_car (p); + if (Music *m = unsmob_music (v)) + { + if (!unsmob_input (m->get_property ("origin"))) + m->set_spot (override_input (last_input_)); + } + int token; switch (extra_token) { case '$': - token = scan_scm_id (scm_car (v)); - if (!scm_is_eq (yylval.scm, SCM_UNSPECIFIED)) - push_extra_token (token, yylval.scm); + token = scan_scm_id (v); + if (!scm_is_eq (yylval, SCM_UNSPECIFIED)) + push_extra_token (token, yylval); break; case '#': - push_extra_token (SCM_IDENTIFIER, scm_car (v)); + push_extra_token (SCM_IDENTIFIER, v); break; } } @@ -1065,6 +1117,12 @@ Lily_lexer::eval_scm (SCM readerdata, char extra_token) sval = SCM_UNSPECIFIED; } + if (Music *m = unsmob_music (sval)) + { + if (!unsmob_input (m->get_property ("origin"))) + m->set_spot (override_input (last_input_)); + } + return sval; }