X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=bb9ee2271a641e89f5e966272216dfba1172b0b7;hb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;hp=a1c7623703f107f67a50401d80efc87e186c89e6;hpb=81690554116358aa3e28711361e09865a783091d;p=lilypond.git diff --git a/lily/lexer.ll b/lily/lexer.ll index a1c7623703..bb9ee2271a 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -4,7 +4,7 @@ source file of the LilyPond music typesetter - (c) 1996--2004 Han-Wen Nienhuys + (c) 1996--2005 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -76,6 +76,9 @@ bool is_valid_version (String s); #define yylval \ (*(YYSTYPE*)lexval) +#define yylloc \ + (*(YYLTYPE*)lexloc) + #define YY_USER_ACTION add_lexed_char (YYLeng ()); /* @@ -101,13 +104,12 @@ SCM (* scm_parse_error_handler) (void *); %option warn %x chords -%x encoding %x figures %x incl %x lyrics %x lyric_quote %x longcomment -%x markup +%x markup %x notes %x quote %x renameinput @@ -140,6 +142,7 @@ LYRICS ({AA}|{TEX})[^0-9 \t\n\r\f]* ESCAPED [nt\\'"] EXTENDER __ HYPHEN -- +BOM_UTF8 \357\273\277 %% @@ -147,7 +150,17 @@ HYPHEN -- // windows-suck-suck-suck } -{ +{BOM_UTF8} { + if (this->lexloc->line_number () != 1 || this->lexloc->column_number () != 0) + { + LexerError (_ ("stray UTF-8 BOM encountered").to_str0 ()); + exit (1); + } + if (be_verbose_global) + message (_ ("Skipping UTF-8 BOM")); +} + +{ "%{" { yy_push_state (longcomment); } @@ -164,21 +177,12 @@ HYPHEN -- } } -\\encoding{WHITE}* { - yy_push_state (encoding); -} \\version{WHITE}* { yy_push_state (version); } \\renameinput{WHITE}* { yy_push_state (renameinput); } -\"[^"]*\" { - String s (YYText () + 1); - s = s.left_string (s.index_last ('\"')); - set_encoding (s); - yy_pop_state (); -} \"[^"]*\" { /* got the version number */ String s (YYText () + 1); s = s.left_string (s.index_last ('\"')); @@ -186,30 +190,30 @@ HYPHEN -- yy_pop_state (); if (!is_valid_version (s)) return INVALID; + + SCM top_scope = scm_car (scm_last_pair (scopes_)); + scm_module_define (top_scope, ly_symbol2scm ("version-seen?"), SCM_BOOL_T); + } \"[^"]*\" { String s (YYText () + 1); s = s.left_string (s.index_last ('\"')); - yy_pop_state(); - this->here_input().source_file_->name_ = s; - progress_indication (_f ("Renaming input to: `%s'", s.to_str0 ())); + yy_pop_state (); + this->here_input().get_source_file ()->name_ = s; + message (_f ("Renaming input to: `%s'", s.to_str0 ())); progress_indication ("\n"); scm_module_define (scm_car (scopes_), ly_symbol2scm ("input-file-name"), scm_makfrom0str (s.to_str0 ())); } -. { - LexerError (_ ("No quoted string found after \\encoding").to_str0 ()); - yy_pop_state (); -} . { - LexerError (_ ("No quoted string found after \\version").to_str0 ()); + LexerError (_ ("quoted string expected after \\version").to_str0 ()); yy_pop_state (); } . { - LexerError (_ ("No quoted string found after \\renameinput").to_str0 ()); + LexerError (_ ("quoted string expected after \\renameinput").to_str0 ()); yy_pop_state (); } { @@ -223,7 +227,7 @@ HYPHEN -- } <> { LexerError (_ ("EOF found inside a comment").to_str0 ()); - main_input_b_ = false; + is_main_input_ = false; if (! close_input ()) yyterminate (); // can't move this, since it actually rets a YY_NULL } @@ -231,10 +235,10 @@ HYPHEN -- \\maininput { - if (!main_input_b_) + if (!is_main_input_) { start_main_input (); - main_input_b_ = true; + is_main_input_ = true; } else error (_ ("\\maininput not allowed outside init files")); @@ -270,23 +274,23 @@ HYPHEN -- } } \"[^"]* { // backup rule - error (_ ("Missing end quote")); + error (_ ("end quote missing")); exit (1); } {RESTNAME} { - const char *s = YYText (); + char const *s = YYText (); yylval.scm = scm_makfrom0str (s); return RESTNAME; } R { return MULTI_MEASURE_REST; } -# { //embedded scm - //char const* s = YYText () + 1; - char const* s = here_str0 (); +# { //embedded scm int n = 0; - SCM sval = ly_parse_scm (s, &n, here_input (), - safe_global_b && main_input_b_); + Input hi = here_input(); + hi.step_forward (); + SCM sval = ly_parse_scm (hi.start (), &n, hi, + be_safe_global && is_main_input_); if (sval == SCM_UNDEFINED) { @@ -294,7 +298,7 @@ HYPHEN -- error_level_ = 1; } - for (int i=0; i < n; i++) + for (int i = 0; i < n; i++) { yyinput (); } @@ -485,12 +489,6 @@ HYPHEN -- \" { start_quote (); } - \< { - return '<'; - } - \> { - return '>'; - } \\score { return SCORE; } @@ -520,7 +518,7 @@ HYPHEN -- else if (tag == ly_symbol2scm ("scheme0-scheme1-scheme2")) return MARKUP_HEAD_SCM0_SCM1_SCM2; else { - programming_error ("No parser tag defined for this signature. Abort"); + programming_error ("no parser tag defined for this signature"); ly_display_scm (s); assert(false); } @@ -549,9 +547,9 @@ HYPHEN -- } <> { - if (main_input_b_) + if (is_main_input_) { - main_input_b_ = false; + is_main_input_ = false; if (!close_input ()) /* Returns YY_NULL */ yyterminate (); @@ -570,10 +568,10 @@ HYPHEN -- } {REAL} { Real r; - int cnv=sscanf (YYText (), "%lf", &r); + int cnv = sscanf (YYText (), "%lf", &r); assert (cnv == 1); - yylval.scm = scm_make_real (r); + yylval.scm = scm_from_double (r); return REAL; } @@ -598,13 +596,13 @@ HYPHEN -- } \\. { - char c= YYText ()[1]; + char c = YYText ()[1]; switch (c) { case '>': - return E_BIGGER; + return E_ANGLE_CLOSE; case '<': - return E_SMALLER; + return E_ANGLE_OPEN; case '!': return E_EXCLAMATION; case '(': @@ -612,9 +610,9 @@ HYPHEN -- case ')': return E_CLOSE; case '[': - return E_LEFTSQUARE; + return E_BRACKET_OPEN; case ']': - return E_RIGHTSQUARE; + return E_BRACKET_CLOSE; case '~': return E_TILDE; case '\\': @@ -694,15 +692,16 @@ Lily_lexer::scan_escaped_word (String str) // SCM sym = ly_symbol2scm (str.to_str0 ()); - int l = lookup_keyword (str); - if (l != -1) { - return l; - } + 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 (is_music_function (sid)) { yylval.scm = get_music_function_transform (sid); - return music_function_type (yylval.scm); } @@ -778,7 +777,7 @@ Lily_lexer::is_figure_state () const void strip_leading_white (String&s) { - int i=0; + int i = 0; for (; i < s.length (); i++) if (!isspace (s[i])) break; @@ -789,7 +788,7 @@ strip_leading_white (String&s) void strip_trailing_white (String&s) { - int i=s.length (); + int i = s.length (); while (i--) if (!isspace (s[i])) break; @@ -824,7 +823,7 @@ is_valid_version (String s) String lyric_fudge (String s) { - char * chars =s.get_copy_str0 (); + char * chars = s.get_copy_str0 (); for (char * p = chars; *p ; p++) { @@ -835,8 +834,8 @@ lyric_fudge (String s) s = String (chars); delete[] chars; - int i =0; - if ((i=s.index ("\\,")) != -1) // change "\," to TeX's "\c " + int i = 0; + if ((i = s.index ("\\,")) != -1) // change "\," to TeX's "\c " { * (s.get_str0 () + i + 1) = 'c'; s = s.left_string (i+2) + " " + s.right_string (s.length ()-i-2); @@ -858,7 +857,7 @@ scan_fraction (String frac) int n = String_convert::dec2int (left); int d = String_convert::dec2int (right); - return scm_cons (scm_int2num (n), scm_int2num (d)); + return scm_cons (scm_from_int (n), scm_from_int (d)); } // Breaks for flex 2.5.31 @@ -884,7 +883,7 @@ avoid_silly_flex_induced_gcc_warnings () SCM lookup_markup_command (String s) { - SCM proc = ly_scheme_function ("lookup-markup-command"); + SCM proc = ly_lily_module_constant ("lookup-markup-command"); return scm_call_1 (proc, scm_makfrom0str (s.to_str0 ())); } @@ -892,7 +891,7 @@ lookup_markup_command (String s) int music_function_type (SCM func) { - SCM type= scm_object_property (func, ly_symbol2scm ("music-function-signature-keyword")); + SCM type = scm_object_property (func, ly_symbol2scm ("music-function-signature-keyword")); if (type == ly_symbol2scm ("scm")) { return MUSIC_FUNCTION_SCM; @@ -948,7 +947,7 @@ music_function_type (SCM func) else { /* TODO: print location */ - error ("Can not find signature for music function."); + error (_ ("can't find signature for music function")); } return MUSIC_FUNCTION_SCM;