X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=a31f25e43bc3d1c785092ea045147e541c6bfd0f;hb=3639deb950d8c48fdc4d0cc812eb95e1511cd968;hp=0914fee3290361f3fb188d41e1f79c4ba5194da4;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git diff --git a/lily/lexer.ll b/lily/lexer.ll index 0914fee329..a31f25e43b 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -4,7 +4,7 @@ source file of the LilyPond music typesetter - (c) 1996--2005 Han-Wen Nienhuys + (c) 1996--2006 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -22,9 +22,10 @@ */ -#include -#include -#include + +#include +#include +#include /* Flex >= 2.5.29 fix; FlexLexer.h's multiple include bracing breaks when building the actual lexer. */ @@ -32,46 +33,45 @@ #define LEXER_CC #include - using namespace std; -#include "music-function.hh" -#include "source-file.hh" -#include "parse-scm.hh" -#include "lily-guile.hh" -#include "string.hh" -#include "string-convert.hh" -#include "lily-lexer.hh" +#include "context-def.hh" +#include "identifier-smob.hh" +#include "international.hh" #include "interval.hh" #include "lily-guile.hh" -#include "parser.hh" -#include "warn.hh" +#include "lily-lexer.hh" +#include "lilypond-input-version.hh" #include "main.hh" +#include "music-function.hh" +#include "parse-scm.hh" +#include "parser.hh" +#include "source-file.hh" +#include "std-string.hh" +#include "string-convert.hh" #include "version.hh" -#include "lilypond-input-version.hh" -#include "context-def.hh" -#include "identifier-smob.hh" +#include "warn.hh" /* RH 7 fix (?) */ #define isatty HORRIBLEKLUDGE -void strip_trailing_white (String&); -void strip_leading_white (String&); -String lyric_fudge (String s); +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); -bool is_valid_version (String s); +SCM lookup_markup_command (string s); +bool is_valid_version (string s); #define start_quote() \ yy_push_state (quote);\ - yylval.string = new String + yylval.string = new string #define start_lyric_quote() \ yy_push_state (lyric_quote);\ - yylval.string = new String + yylval.string = new string #define yylval \ (*(YYSTYPE*)lexval) @@ -87,7 +87,7 @@ LYRICS ({AA}|{TEX})[^0-9 \t\n\f]* */ -SCM scan_fraction (String); +SCM scan_fraction (string); SCM (* scm_parse_error_handler) (void *); @@ -109,10 +109,10 @@ SCM (* scm_parse_error_handler) (void *); %x lyrics %x lyric_quote %x longcomment -%x markup +%x markup %x notes %x quote -%x renameinput +%x sourcefilename %x version A [a-zA-Z] @@ -124,6 +124,8 @@ ACCENT \\[`'"^] NATIONAL [\001-\006\021-\027\031\036\200-\377] TEX {AA}|-|{PUNCT}|{ACCENT}|{NATIONAL} WORD {A}{AN}* +DASHED_WORD {A}({AN}|-)* +DASHED_KEY_WORD \\{DASHED_WORD} ALPHAWORD {A}+ DIGIT {N} UNSIGNED {N}+ @@ -142,6 +144,7 @@ LYRICS ({AA}|{TEX})[^0-9 \t\n\r\f]* ESCAPED [nt\\'"] EXTENDER __ HYPHEN -- +BOM_UTF8 \357\273\277 %% @@ -149,7 +152,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").c_str ()); + exit (1); + } + if (be_verbose_global) + message (_ ("Skipping UTF-8 BOM")); +} + +{ "%{" { yy_push_state (longcomment); } @@ -169,12 +182,12 @@ HYPHEN -- \\version{WHITE}* { yy_push_state (version); } -\\renameinput{WHITE}* { - yy_push_state (renameinput); +\\sourcefilename{WHITE}* { + yy_push_state (sourcefilename); } \"[^"]*\" { /* got the version number */ - String s (YYText () + 1); - s = s.left_string (s.index_last ('\"')); + string s (YYText () + 1); + s = s.substr (0, s.rfind ('\"')); yy_pop_state (); if (!is_valid_version (s)) @@ -184,25 +197,25 @@ HYPHEN -- scm_module_define (top_scope, ly_symbol2scm ("version-seen?"), SCM_BOOL_T); } -\"[^"]*\" { - String s (YYText () + 1); - s = s.left_string (s.index_last ('\"')); +\"[^"]*\" { + string s (YYText () + 1); + s = s.substr (0, s.rfind ('\"')); - 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.c_str ())); progress_indication ("\n"); scm_module_define (scm_car (scopes_), ly_symbol2scm ("input-file-name"), - scm_makfrom0str (s.to_str0 ())); + scm_makfrom0str (s.c_str ())); } . { - LexerError (_ ("No quoted string found after \\version").to_str0 ()); + LexerError (_ ("quoted string expected after \\version").c_str ()); yy_pop_state (); } -. { - LexerError (_ ("No quoted string found after \\renameinput").to_str0 ()); +. { + LexerError (_ ("quoted string expected after \\sourcefilename").c_str ()); yy_pop_state (); } { @@ -215,7 +228,7 @@ HYPHEN -- yy_pop_state (); } <> { - LexerError (_ ("EOF found inside a comment").to_str0 ()); + LexerError (_ ("EOF found inside a comment").c_str ()); is_main_input_ = false; if (! close_input ()) yyterminate (); // can't move this, since it actually rets a YY_NULL @@ -237,48 +250,48 @@ HYPHEN -- yy_push_state (incl); } \"[^"]*\" { /* got the include file name */ - String s (YYText ()+1); - s = s.left_string (s.index_last ('"')); + string s (YYText ()+1); + s = s.substr (0, s.rfind ('"')); new_input (s, sources_); yy_pop_state (); } \\{BLACK}*{WHITE} { /* got the include identifier */ - String s = YYText () + 1; + string s = YYText () + 1; strip_trailing_white (s); if (s.length () && (s[s.length () - 1] == ';')) - s = s.left_string (s.length () - 1); + s = s.substr (0, s.length () - 1); SCM sid = lookup_identifier (s); if (scm_is_string (sid)) { new_input (ly_scm2string (sid), sources_); yy_pop_state (); } else { - String msg (_f ("wrong or undefined identifier: `%s'", s )); + string msg (_f ("wrong or undefined identifier: `%s'", s )); - LexerError (msg.to_str0 ()); + LexerError (msg.c_str ()); SCM err = scm_current_error_port (); scm_puts ("This value was found in the table: ", err); scm_display (sid, err); } } \"[^"]* { // 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 +# { //embedded scm int n = 0; Input hi = here_input(); hi.step_forward (); - SCM sval = ly_parse_scm (hi.start_, &n, hi, + SCM sval = ly_parse_scm (hi.start (), &n, hi, be_safe_global && is_main_input_); if (sval == SCM_UNDEFINED) @@ -291,7 +304,7 @@ HYPHEN -- { yyinput (); } - char_count_stack_.top () += n; + char_count_stack_.back () += n; if (unpack_identifier (sval) != SCM_UNDEFINED) { @@ -336,15 +349,15 @@ HYPHEN -- } {DIGIT} { - yylval.i = String_convert::dec2int (String (YYText ())); + yylval.i = String_convert::dec2int (string (YYText ())); return DIGIT; } {UNSIGNED} { - yylval.i = String_convert::dec2int (String (YYText ())); + yylval.i = String_convert::dec2int (string (YYText ())); return UNSIGNED; } {E_UNSIGNED} { - yylval.i = String_convert::dec2int (String (YYText () +1)); + yylval.i = String_convert::dec2int (string (YYText () +1)); return E_UNSIGNED; } \" { @@ -367,8 +380,8 @@ HYPHEN -- yy_pop_state (); /* yylval is union. Must remember STRING before setting SCM*/ - String *sp = yylval.string; - yylval.scm = scm_makfrom0str (sp->to_str0 ()); + string *sp = yylval.string; + yylval.scm = scm_makfrom0str (sp->c_str ()); delete sp; return STRING; } @@ -388,8 +401,8 @@ HYPHEN -- yy_pop_state (); /* yylval is union. Must remember STRING before setting SCM*/ - String *sp = yylval.string; - yylval.scm = scm_makfrom0str (sp->to_str0 ()); + string *sp = yylval.string; + yylval.scm = scm_makfrom0str (sp->c_str ()); delete sp; return LYRICS_STRING; } @@ -407,7 +420,7 @@ HYPHEN -- return FRACTION; } {UNSIGNED} { - yylval.i = String_convert::dec2int (String (YYText ())); + yylval.i = String_convert::dec2int (string (YYText ())); return UNSIGNED; } {NOTECOMMAND} { @@ -415,7 +428,7 @@ HYPHEN -- } {LYRICS} { /* ugr. This sux. */ - String s (YYText ()); + string s (YYText ()); if (s == "__") return yylval.i = EXTENDER; if (s == "--") @@ -426,7 +439,7 @@ HYPHEN -- 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.to_str0 ()); + yylval.scm = scm_makfrom0str (s.c_str ()); return LYRICS_STRING; @@ -447,7 +460,7 @@ HYPHEN -- return FRACTION; } {UNSIGNED} { - yylval.i = String_convert::dec2int (String (YYText ())); + yylval.i = String_convert::dec2int (string (YYText ())); return UNSIGNED; } \" { @@ -482,7 +495,7 @@ HYPHEN -- return SCORE; } {MARKUPCOMMAND} { - String str (YYText () + 1); + string str (YYText () + 1); SCM s = lookup_markup_command (str); if (scm_is_pair (s) && scm_is_symbol (scm_cdr (s)) ) { @@ -507,7 +520,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 markup signature"); ly_display_scm (s); assert(false); } @@ -518,14 +531,14 @@ HYPHEN -- return YYText ()[0]; } [^#{}"\\ \t\n\r\f]+ { - String s (YYText ()); + string s (YYText ()); 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 = scm_makfrom0str (s.to_str0 ()); + yylval.scm = scm_makfrom0str (s.c_str ()); return STRING; @@ -548,6 +561,14 @@ HYPHEN -- yyterminate (); } +{ + {DASHED_WORD} { + return scan_bare_word (YYText ()); + } + {DASHED_KEY_WORD} { + return scan_escaped_word (YYText () + 1); + } +} {WORD} { return scan_bare_word (YYText ()); @@ -559,13 +580,14 @@ HYPHEN -- Real r; int cnv = sscanf (YYText (), "%lf", &r); assert (cnv == 1); + (void) cnv; - yylval.scm = scm_make_real (r); + yylval.scm = scm_from_double (r); return REAL; } {UNSIGNED} { - yylval.i = String_convert::dec2int (String (YYText ())); + yylval.i = String_convert::dec2int (string (YYText ())); return UNSIGNED; } @@ -589,9 +611,9 @@ HYPHEN -- switch (c) { case '>': - return E_BIGGER; + return E_ANGLE_CLOSE; case '<': - return E_SMALLER; + return E_ANGLE_OPEN; case '!': return E_EXCLAMATION; case '(': @@ -599,9 +621,11 @@ HYPHEN -- case ')': return E_CLOSE; case '[': - return E_LEFTSQUARE; + return E_BRACKET_OPEN; + case '+': + return E_PLUS; case ']': - return E_RIGHTSQUARE; + return E_BRACKET_CLOSE; case '~': return E_TILDE; case '\\': @@ -613,8 +637,8 @@ HYPHEN -- } <*>. { - String msg = _f ("invalid character: `%c'", YYText ()[0]); - LexerError (msg.to_str0 ()); + string msg = _f ("invalid character: `%c'", YYText ()[0]); + LexerError (msg.c_str ()); return YYText ()[0]; } @@ -675,21 +699,22 @@ Lily_lexer::identifier_type (SCM sid) int -Lily_lexer::scan_escaped_word (String str) +Lily_lexer::scan_escaped_word (string str) { // use more SCM for this. -// SCM sym = ly_symbol2scm (str.to_str0 ()); +// SCM sym = ly_symbol2scm (str.c_str ()); + + int i = lookup_keyword (str); + if (i == MARKUP && is_lyric_state ()) + return LYRIC_MARKUP; + if (i != -1) + return i; - int l = lookup_keyword (str); - if (l != -1) { - return l; - } SCM sid = lookup_identifier (str); if (is_music_function (sid)) { yylval.scm = get_music_function_transform (sid); - return music_function_type (yylval.scm); } @@ -699,18 +724,18 @@ Lily_lexer::scan_escaped_word (String str) return identifier_type (sid); } - String msg (_f ("unknown escaped string: `\\%s'", str)); - LexerError (msg.to_str0 ()); + string msg (_f ("unknown escaped string: `\\%s'", str)); + LexerError (msg.c_str ()); - yylval.scm = scm_makfrom0str (str.to_str0 ()); + yylval.scm = scm_makfrom0str (str.c_str ()); return STRING; } int -Lily_lexer::scan_bare_word (String str) +Lily_lexer::scan_bare_word (string str) { - SCM sym = ly_symbol2scm (str.to_str0 ()); + SCM sym = ly_symbol2scm (str.c_str ()); if ((YYSTATE == notes) || (YYSTATE == chords)) { SCM handle = SCM_BOOL_F; if (scm_is_pair (pitchname_tab_stack_)) @@ -730,7 +755,7 @@ Lily_lexer::scan_bare_word (String str) } } - yylval.scm = scm_makfrom0str (str.to_str0 ()); + yylval.scm = scm_makfrom0str (str.c_str ()); return STRING; } @@ -759,29 +784,29 @@ Lily_lexer::is_figure_state () const } /* - urg, belong to String (_convert) + urg, belong to string (_convert) and should be generalised */ void -strip_leading_white (String&s) +strip_leading_white (string&s) { - int i = 0; - for (; i < s.length (); i++) + ssize i = 0; + for (; i < s.length (); i++) if (!isspace (s[i])) break; - s = s.nomid_string (0, i); + s = s.substr (i); } void -strip_trailing_white (String&s) +strip_trailing_white (string&s) { - int i = s.length (); + ssize i = s.length (); while (i--) if (!isspace (s[i])) break; - s = s.left_string (i+1); + s = s.substr (0, i + 1); } @@ -791,7 +816,7 @@ Lilypond_version oldest_version ("2.3.22"); bool -is_valid_version (String s) +is_valid_version (string s) { Lilypond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL ); Lilypond_version ver (s); @@ -808,25 +833,25 @@ is_valid_version (String s) /* substitute _ and \, */ -String -lyric_fudge (String s) +string +lyric_fudge (string s) { - char * chars = s.get_copy_str0 (); + char *chars = string_copy (s); - for (char * p = chars; *p ; p++) + for (char *p = chars; *p ; p++) { if (*p == '_' && (p == chars || *(p-1) != '\\')) *p = ' '; } - s = String (chars); + s = string (chars); delete[] chars; - int i = 0; - if ((i = s.index ("\\,")) != -1) // change "\," to TeX's "\c " + ssize i = 0; + if ((i = s.find ("\\,")) != NPOS) // change "\," to TeX's "\c " { - * (s.get_str0 () + i + 1) = 'c'; - s = s.left_string (i+2) + " " + s.right_string (s.length ()-i-2); + * (((char*)s.c_str ()) + i + 1) = 'c'; + s = s.substr (0, i + 2) + " " + s.substr (i - 2); } return s; @@ -836,43 +861,22 @@ lyric_fudge (String s) Convert "NUM/DEN" into a '(NUM . DEN) cons. */ SCM -scan_fraction (String frac) +scan_fraction (string frac) { - int i = frac.index ('/'); - int l = frac.length (); - String left = frac.left_string (i); - String right = frac.right_string (l - i - 1); + ssize i = frac.find ('/'); + string left = frac.substr (0, i); + string right = frac.substr (i + 1, (frac.length () - i + 1)); int n = String_convert::dec2int (left); int d = String_convert::dec2int (right); - return scm_cons (scm_int2num (n), scm_int2num (d)); -} - -// Breaks for flex 2.5.31 -#if 0 -/* avoid silly flex induced gcc warnings */ -static void yy_push_state (int) {;} -static void yy_pop_state () {;} -static int yy_top_state () { return 0; } - -static void -avoid_silly_flex_induced_gcc_warnings () -{ - (void)yy_start_stack_ptr; - (void)yy_start_stack_depth; - (void)yy_start_stack; - yy_push_state (0); - yy_pop_state (); - yy_top_state (); - avoid_silly_flex_induced_gcc_warnings (); + return scm_cons (scm_from_int (n), scm_from_int (d)); } -#endif SCM -lookup_markup_command (String s) +lookup_markup_command (string s) { SCM proc = ly_lily_module_constant ("lookup-markup-command"); - return scm_call_1 (proc, scm_makfrom0str (s.to_str0 ())); + return scm_call_1 (proc, scm_makfrom0str (s.c_str ())); } @@ -908,6 +912,10 @@ music_function_type (SCM func) { return MUSIC_FUNCTION_SCM_SCM_MUSIC; } + else if (type == ly_symbol2scm ("scm-scm-scm")) + { + return MUSIC_FUNCTION_SCM_SCM_SCM; + } else if (type == ly_symbol2scm ("markup")) { return MUSIC_FUNCTION_MARKUP; @@ -935,8 +943,40 @@ 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; } + +/* Shut up lexer warnings. */ +#if YY_STACK_USED + +static void +yy_push_state (int) +{ +} + +static void +yy_pop_state () +{ +} + +static int +yy_top_state () +{ + return 0; +} + +static void +silence_lexer_warnings () +{ + (void) yy_start_stack_ptr; + (void) yy_start_stack_depth; + (void) yy_start_stack; + (void) yy_push_state; + (void) yy_pop_state; + (void) yy_top_state; + (void) silence_lexer_warnings; +} +#endif