X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=f9601985f40b6bed668c7853e61bb359f2ab1f13;hb=afcf9fa8d6794b08cd62f66dfd22c0f108a7c6e0;hp=bb9ee2271a641e89f5e966272216dfba1172b0b7;hpb=b4d2043223a86826764bc531e684a864c97605fe;p=lilypond.git diff --git a/lily/lexer.ll b/lily/lexer.ll index bb9ee2271a..f9601985f4 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 *); @@ -112,7 +112,7 @@ SCM (* scm_parse_error_handler) (void *); %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}+ @@ -153,7 +155,7 @@ BOM_UTF8 \357\273\277 {BOM_UTF8} { if (this->lexloc->line_number () != 1 || this->lexloc->column_number () != 0) { - LexerError (_ ("stray UTF-8 BOM encountered").to_str0 ()); + LexerError (_ ("stray UTF-8 BOM encountered").c_str ()); exit (1); } if (be_verbose_global) @@ -180,12 +182,12 @@ BOM_UTF8 \357\273\277 \\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)) @@ -195,25 +197,25 @@ BOM_UTF8 \357\273\277 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().get_source_file ()->name_ = s; - message (_f ("Renaming input to: `%s'", s.to_str0 ())); + 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 (_ ("quoted string expected after \\version").to_str0 ()); + LexerError (_ ("quoted string expected after \\version").c_str ()); yy_pop_state (); } -. { - LexerError (_ ("quoted string expected after \\renameinput").to_str0 ()); +. { + LexerError (_ ("quoted string expected after \\sourcefilename").c_str ()); yy_pop_state (); } { @@ -226,7 +228,7 @@ BOM_UTF8 \357\273\277 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 @@ -248,26 +250,26 @@ BOM_UTF8 \357\273\277 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); @@ -302,7 +304,7 @@ BOM_UTF8 \357\273\277 { yyinput (); } - char_count_stack_.top () += n; + char_count_stack_.back () += n; if (unpack_identifier (sval) != SCM_UNDEFINED) { @@ -347,15 +349,15 @@ BOM_UTF8 \357\273\277 } {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; } \" { @@ -378,8 +380,8 @@ BOM_UTF8 \357\273\277 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; } @@ -399,8 +401,8 @@ BOM_UTF8 \357\273\277 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; } @@ -418,7 +420,7 @@ BOM_UTF8 \357\273\277 return FRACTION; } {UNSIGNED} { - yylval.i = String_convert::dec2int (String (YYText ())); + yylval.i = String_convert::dec2int (string (YYText ())); return UNSIGNED; } {NOTECOMMAND} { @@ -426,7 +428,7 @@ BOM_UTF8 \357\273\277 } {LYRICS} { /* ugr. This sux. */ - String s (YYText ()); + string s (YYText ()); if (s == "__") return yylval.i = EXTENDER; if (s == "--") @@ -437,7 +439,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.to_str0 ()); + yylval.scm = scm_makfrom0str (s.c_str ()); return LYRICS_STRING; @@ -458,7 +460,7 @@ BOM_UTF8 \357\273\277 return FRACTION; } {UNSIGNED} { - yylval.i = String_convert::dec2int (String (YYText ())); + yylval.i = String_convert::dec2int (string (YYText ())); return UNSIGNED; } \" { @@ -493,7 +495,7 @@ BOM_UTF8 \357\273\277 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)) ) { @@ -518,7 +520,7 @@ BOM_UTF8 \357\273\277 else if (tag == ly_symbol2scm ("scheme0-scheme1-scheme2")) return MARKUP_HEAD_SCM0_SCM1_SCM2; else { - programming_error ("no parser tag defined for this signature"); + programming_error ("no parser tag defined for this markup signature"); ly_display_scm (s); assert(false); } @@ -529,14 +531,14 @@ BOM_UTF8 \357\273\277 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; @@ -559,6 +561,14 @@ BOM_UTF8 \357\273\277 yyterminate (); } +{ + {DASHED_WORD} { + return scan_bare_word (YYText ()); + } + {DASHED_KEY_WORD} { + return scan_escaped_word (YYText () + 1); + } +} {WORD} { return scan_bare_word (YYText ()); @@ -570,13 +580,14 @@ BOM_UTF8 \357\273\277 Real r; int cnv = sscanf (YYText (), "%lf", &r); assert (cnv == 1); + (void) cnv; 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; } @@ -611,6 +622,8 @@ BOM_UTF8 \357\273\277 return E_CLOSE; case '[': return E_BRACKET_OPEN; + case '+': + return E_PLUS; case ']': return E_BRACKET_CLOSE; case '~': @@ -624,8 +637,8 @@ BOM_UTF8 \357\273\277 } <*>. { - 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]; } @@ -686,11 +699,11 @@ 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 ()) @@ -711,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_)) @@ -742,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; } @@ -771,39 +784,38 @@ 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); } -/* 2.1.2x something -> \property -> \set. */ -Lilypond_version oldest_version ("2.3.22"); +Lilypond_version oldest_version ("2.7.38"); bool -is_valid_version (String s) +is_valid_version (string s) { Lilypond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL ); Lilypond_version ver (s); @@ -820,25 +832,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; @@ -848,107 +860,104 @@ 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_from_int (n), scm_from_int (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 (); -} -#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 ())); } +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_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)); +} int music_function_type (SCM func) { + if (!signature_hash_table) + init_signature_hash_table (); + SCM type = scm_object_property (func, ly_symbol2scm ("music-function-signature-keyword")); - if (type == ly_symbol2scm ("scm")) - { - return MUSIC_FUNCTION_SCM; - } - else if (type == ly_symbol2scm ("music")) - { - return MUSIC_FUNCTION_MUSIC; - } - else if (type == ly_symbol2scm ("scm-music")) - { - return MUSIC_FUNCTION_SCM_MUSIC; - } - else if (type == ly_symbol2scm ("scm-scm")) - { - return MUSIC_FUNCTION_SCM_SCM; - } - else if (type == ly_symbol2scm ("music-music")) - { - return MUSIC_FUNCTION_MUSIC_MUSIC; - } - else if (type == ly_symbol2scm ("scm-music-music")) - { - return MUSIC_FUNCTION_SCM_MUSIC_MUSIC; - } - else if (type == ly_symbol2scm ("scm-scm-music")) - { - return MUSIC_FUNCTION_SCM_SCM_MUSIC; - } - else if (type == ly_symbol2scm ("markup")) - { - return MUSIC_FUNCTION_MARKUP; - } - else if (type == ly_symbol2scm ("markup-music")) - { - return MUSIC_FUNCTION_MARKUP_MUSIC; - } - else if (type == ly_symbol2scm ("markup-markup")) - { - return MUSIC_FUNCTION_MARKUP_MARKUP; - } - else if (type == ly_symbol2scm ("markup-music-music")) - { - return MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC; - } - else if (type == ly_symbol2scm ("markup-markup-music")) - { - return MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC; - } - else if (type == ly_symbol2scm ("noarg")) - { - return MUSIC_FUNCTION; - } - else + SCM token_type = scm_hashq_ref (signature_hash_table, type, SCM_BOOL_F); + if (!scm_is_number (token_type)) { - /* TODO: print location */ - error (_ ("can't find signature for music function")); + programming_error (_ ("can't find signature for music function")); + return MUSIC_FUNCTION_SCM; } + + return scm_to_int (token_type); +} - 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