From 731b54a7d71b7ee7ff85f7b88853f7f7e5fd8fdd Mon Sep 17 00:00:00 2001 From: Ulya Trofimovich Date: Mon, 27 Jul 2015 12:57:46 +0100 Subject: [PATCH] Renames '-Wempty-rule' -> '-Wmatch-empty-string' and improved message. --- re2c/bootstrap/src/conf/parse_opts.cc | 1215 +++++++++-------- re2c/src/codegen/prepare_dfa.cc | 4 +- re2c/src/conf/parse_opts.re | 2 +- re2c/src/conf/warn.cc | 8 +- re2c/src/conf/warn.h | 4 +- re2c/test/bug1454253.c | 2 +- re2c/test/bug1454253.s.c | 2 +- re2c/test/bug2462777.ci.c | 2 +- re2c/test/bug2462777.i.c | 2 +- re2c/test/bug46_infinite_loop.c | 4 +- re2c/test/bug61.i--empty-class(match-empty).c | 6 +- re2c/test/bug61.i.c | 6 +- ...ference_full.i--empty-class(match-empty).c | 2 +- re2c/test/bug61_difference_full.i.c | 2 +- ...g61_negative.i--empty-class(match-empty).c | 2 +- re2c/test/bug61_negative.i.c | 2 +- ...g61_positive.i--empty-class(match-empty).c | 2 +- re2c/test/bug61_positive.i.c | 2 +- re2c/test/condition_02.c.c | 2 +- re2c/test/condition_02.cg.c | 2 +- re2c/test/condition_03.cg.c | 2 +- re2c/test/condition_11.cg.c | 2 +- re2c/test/condition_13.cg.c | 2 +- re2c/test/range_empty.8.c | 2 +- re2c/test/range_empty.c | 2 +- re2c/test/range_empty.e.c | 2 +- re2c/test/range_empty.u.c | 2 +- re2c/test/range_empty.w.c | 2 +- re2c/test/range_empty.x.c | 2 +- re2c/test/scanner.c | 2 +- re2c/test/scanner.fs.c | 2 +- re2c/test/scanner.s.c | 2 +- re2c/test/scanner_re2c.bi.c | 2 +- re2c/test/scanner_re2c_default.D.c | 2 +- re2c/test/scanner_re2c_default.bi.c | 2 +- re2c/test/yyaccept_missing.bci.c | 2 +- 36 files changed, 667 insertions(+), 638 deletions(-) diff --git a/re2c/bootstrap/src/conf/parse_opts.cc b/re2c/bootstrap/src/conf/parse_opts.cc index b4817421..4d8352ce 100644 --- a/re2c/bootstrap/src/conf/parse_opts.cc +++ b/re2c/bootstrap/src/conf/parse_opts.cc @@ -1,4 +1,4 @@ -/* Generated by re2c 0.14.3 on Sun Jul 26 14:45:34 2015 */ +/* Generated by re2c 0.14.3 on Mon Jul 27 12:54:38 2015 */ #include #include "src/conf/msg.h" @@ -196,8 +196,12 @@ opt_warn: { YYCTYPE yych; yych = *YYCURSOR; - if (yych == 'e') goto yy46; - if (yych == 'n') goto yy47; + if (yych <= 'l') { + if (yych == 'e') goto yy46; + } else { + if (yych <= 'm') goto yy47; + if (yych <= 'n') goto yy48; + } ++YYCURSOR; yy45: { @@ -206,98 +210,123 @@ yy45: } yy46: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'm') goto yy63; + if (yych == 'm') goto yy83; goto yy45; yy47: + yych = *(YYMARKER = ++YYCURSOR); + if (yych == 'a') goto yy64; + goto yy45; +yy48: yych = *(YYMARKER = ++YYCURSOR); if (yych != 'a') goto yy45; yych = *++YYCURSOR; - if (yych == 'k') goto yy50; -yy49: + if (yych == 'k') goto yy51; +yy50: YYCURSOR = YYMARKER; goto yy45; -yy50: +yy51: yych = *++YYCURSOR; - if (yych != 'e') goto yy49; + if (yych != 'e') goto yy50; yych = *++YYCURSOR; - if (yych != 'd') goto yy49; + if (yych != 'd') goto yy50; yych = *++YYCURSOR; - if (yych != '-') goto yy49; + if (yych != '-') goto yy50; yych = *++YYCURSOR; - if (yych != 'd') goto yy49; + if (yych != 'd') goto yy50; yych = *++YYCURSOR; - if (yych != 'e') goto yy49; + if (yych != 'e') goto yy50; yych = *++YYCURSOR; - if (yych != 'f') goto yy49; + if (yych != 'f') goto yy50; yych = *++YYCURSOR; - if (yych != 'a') goto yy49; + if (yych != 'a') goto yy50; yych = *++YYCURSOR; - if (yych != 'u') goto yy49; + if (yych != 'u') goto yy50; yych = *++YYCURSOR; - if (yych != 'l') goto yy49; + if (yych != 'l') goto yy50; yych = *++YYCURSOR; - if (yych != 't') goto yy49; + if (yych != 't') goto yy50; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy49; + if (yych >= 0x01) goto yy50; ++YYCURSOR; { warn.set (Warn::NAKED_DEFAULT, option); goto opt; } -yy63: +yy64: + yych = *++YYCURSOR; + if (yych != 't') goto yy50; + yych = *++YYCURSOR; + if (yych != 'c') goto yy50; + yych = *++YYCURSOR; + if (yych != 'h') goto yy50; + yych = *++YYCURSOR; + if (yych != '-') goto yy50; + yych = *++YYCURSOR; + if (yych != 'e') goto yy50; + yych = *++YYCURSOR; + if (yych != 'm') goto yy50; + yych = *++YYCURSOR; + if (yych != 'p') goto yy50; yych = *++YYCURSOR; - if (yych != 'p') goto yy49; + if (yych != 't') goto yy50; yych = *++YYCURSOR; - if (yych != 't') goto yy49; + if (yych != 'y') goto yy50; yych = *++YYCURSOR; - if (yych != 'y') goto yy49; + if (yych != '-') goto yy50; yych = *++YYCURSOR; - if (yych != '-') goto yy49; + if (yych != 's') goto yy50; yych = *++YYCURSOR; - if (yych == 'c') goto yy68; - if (yych == 'r') goto yy69; - goto yy49; -yy68: + if (yych != 't') goto yy50; yych = *++YYCURSOR; - if (yych == 'h') goto yy75; - goto yy49; -yy69: + if (yych != 'r') goto yy50; yych = *++YYCURSOR; - if (yych != 'u') goto yy49; + if (yych != 'i') goto yy50; yych = *++YYCURSOR; - if (yych != 'l') goto yy49; + if (yych != 'n') goto yy50; yych = *++YYCURSOR; - if (yych != 'e') goto yy49; + if (yych != 'g') goto yy50; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy49; + if (yych >= 0x01) goto yy50; ++YYCURSOR; - { warn.set (Warn::EMPTY_RULE, option); goto opt; } -yy75: + { warn.set (Warn::MATCH_EMPTY_STRING, option); goto opt; } +yy83: yych = *++YYCURSOR; - if (yych != 'a') goto yy49; + if (yych != 'p') goto yy50; yych = *++YYCURSOR; - if (yych != 'r') goto yy49; + if (yych != 't') goto yy50; yych = *++YYCURSOR; - if (yych != 'a') goto yy49; + if (yych != 'y') goto yy50; yych = *++YYCURSOR; - if (yych != 'c') goto yy49; + if (yych != '-') goto yy50; yych = *++YYCURSOR; - if (yych != 't') goto yy49; + if (yych != 'c') goto yy50; yych = *++YYCURSOR; - if (yych != 'e') goto yy49; + if (yych != 'h') goto yy50; yych = *++YYCURSOR; - if (yych != 'r') goto yy49; + if (yych != 'a') goto yy50; yych = *++YYCURSOR; - if (yych != '-') goto yy49; + if (yych != 'r') goto yy50; yych = *++YYCURSOR; - if (yych != 'c') goto yy49; + if (yych != 'a') goto yy50; yych = *++YYCURSOR; - if (yych != 'l') goto yy49; + if (yych != 'c') goto yy50; yych = *++YYCURSOR; - if (yych != 'a') goto yy49; + if (yych != 't') goto yy50; yych = *++YYCURSOR; - if (yych != 's') goto yy49; + if (yych != 'e') goto yy50; yych = *++YYCURSOR; - if (yych != 's') goto yy49; + if (yych != 'r') goto yy50; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy49; + if (yych != '-') goto yy50; + yych = *++YYCURSOR; + if (yych != 'c') goto yy50; + yych = *++YYCURSOR; + if (yych != 'l') goto yy50; + yych = *++YYCURSOR; + if (yych != 'a') goto yy50; + yych = *++YYCURSOR; + if (yych != 's') goto yy50; + yych = *++YYCURSOR; + if (yych != 's') goto yy50; + yych = *++YYCURSOR; + if (yych >= 0x01) goto yy50; ++YYCURSOR; { warn.set (Warn::EMPTY_CHARACTER_CLASS, option); goto opt; } } @@ -311,135 +340,135 @@ opt_short: if (yych <= 'c') { if (yych <= 'C') { if (yych <= '7') { - if (yych <= 0x00) goto yy93; - if (yych == '1') goto yy97; - goto yy95; + if (yych <= 0x00) goto yy107; + if (yych == '1') goto yy111; + goto yy109; } else { - if (yych <= '8') goto yy99; - if (yych == '?') goto yy101; - goto yy95; + if (yych <= '8') goto yy113; + if (yych == '?') goto yy115; + goto yy109; } } else { if (yych <= 'U') { - if (yych <= 'D') goto yy103; - if (yych == 'F') goto yy105; - goto yy95; + if (yych <= 'D') goto yy117; + if (yych == 'F') goto yy119; + goto yy109; } else { - if (yych <= 'V') goto yy107; - if (yych <= 'a') goto yy95; - if (yych <= 'b') goto yy109; - goto yy111; + if (yych <= 'V') goto yy121; + if (yych <= 'a') goto yy109; + if (yych <= 'b') goto yy123; + goto yy125; } } } else { if (yych <= 'o') { if (yych <= 'g') { - if (yych <= 'd') goto yy113; - if (yych <= 'e') goto yy115; - if (yych <= 'f') goto yy117; - goto yy119; + if (yych <= 'd') goto yy127; + if (yych <= 'e') goto yy129; + if (yych <= 'f') goto yy131; + goto yy133; } else { - if (yych <= 'h') goto yy101; - if (yych <= 'i') goto yy121; - if (yych <= 'n') goto yy95; - goto yy123; + if (yych <= 'h') goto yy115; + if (yych <= 'i') goto yy135; + if (yych <= 'n') goto yy109; + goto yy137; } } else { if (yych <= 't') { - if (yych <= 'q') goto yy95; - if (yych <= 'r') goto yy125; - if (yych <= 's') goto yy127; - goto yy129; + if (yych <= 'q') goto yy109; + if (yych <= 'r') goto yy139; + if (yych <= 's') goto yy141; + goto yy143; } else { if (yych <= 'v') { - if (yych <= 'u') goto yy131; - goto yy133; + if (yych <= 'u') goto yy145; + goto yy147; } else { - if (yych <= 'w') goto yy135; - if (yych <= 'x') goto yy137; - goto yy95; + if (yych <= 'w') goto yy149; + if (yych <= 'x') goto yy151; + goto yy109; } } } } -yy93: +yy107: ++YYCURSOR; { goto opt; } -yy95: +yy109: ++YYCURSOR; { error ("bad short option: %s", *argv); return EXIT_FAIL; } -yy97: +yy111: ++YYCURSOR; { goto opt_short; } -yy99: +yy113: ++YYCURSOR; { if (!opts.utf_8 ()) { error_encoding (); return EXIT_FAIL; } goto opt_short; } -yy101: +yy115: ++YYCURSOR; { usage (); return EXIT_OK; } -yy103: +yy117: ++YYCURSOR; { opts.emit_dot (); goto opt_short; } -yy105: +yy119: ++YYCURSOR; { opts.flex_syntax (); goto opt_short; } -yy107: +yy121: ++YYCURSOR; { vernum (); return EXIT_OK; } -yy109: +yy123: ++YYCURSOR; { opts.bit_vectors (); goto opt_short; } -yy111: +yy125: ++YYCURSOR; { opts.start_conditions (); goto opt_short; } -yy113: +yy127: ++YYCURSOR; { opts.debug_output (); goto opt_short; } -yy115: +yy129: ++YYCURSOR; { if (!opts.ecb ()) { error_encoding (); return EXIT_FAIL; } goto opt_short; } -yy117: +yy131: ++YYCURSOR; { opts.storable_state (); goto opt_short; } -yy119: +yy133: ++YYCURSOR; { opts.computed_gotos (); goto opt_short; } -yy121: +yy135: ++YYCURSOR; { opts.no_debug_info (); goto opt_short; } -yy123: +yy137: ++YYCURSOR; - if ((yych = *YYCURSOR) <= 0x00) goto yy141; + if ((yych = *YYCURSOR) <= 0x00) goto yy155; { *argv = YYCURSOR; goto opt_output; } -yy125: +yy139: ++YYCURSOR; { opts.reusable (); goto opt_short; } -yy127: +yy141: ++YYCURSOR; { opts.nested_ifs (); goto opt_short; } -yy129: +yy143: ++YYCURSOR; - if ((yych = *YYCURSOR) <= 0x00) goto yy139; + if ((yych = *YYCURSOR) <= 0x00) goto yy153; { *argv = YYCURSOR; goto opt_header; } -yy131: +yy145: ++YYCURSOR; { if (!opts.unicode ()) { error_encoding (); return EXIT_FAIL; } goto opt_short; } -yy133: +yy147: ++YYCURSOR; { version (); return EXIT_OK; } -yy135: +yy149: ++YYCURSOR; { if (!opts.wide_chars ()) { error_encoding (); return EXIT_FAIL; } goto opt_short; } -yy137: +yy151: ++YYCURSOR; { if (!opts.utf_16 ()) { error_encoding (); return EXIT_FAIL; } goto opt_short; } -yy139: +yy153: ++YYCURSOR; { YYCURSOR = *++argv; goto opt_header; } -yy141: +yy155: ++YYCURSOR; { YYCURSOR = *++argv; goto opt_output; } } @@ -451,699 +480,699 @@ opt_long: YYCTYPE yych; yych = *YYCURSOR; switch (yych) { - case 'b': goto yy147; - case 'c': goto yy148; - case 'd': goto yy149; - case 'e': goto yy150; - case 'f': goto yy151; - case 'h': goto yy152; - case 'i': goto yy153; - case 'n': goto yy154; - case 'o': goto yy155; - case 'r': goto yy156; - case 's': goto yy157; - case 't': goto yy158; - case 'u': goto yy159; - case 'v': goto yy160; - case 'w': goto yy161; - default: goto yy145; + case 'b': goto yy161; + case 'c': goto yy162; + case 'd': goto yy163; + case 'e': goto yy164; + case 'f': goto yy165; + case 'h': goto yy166; + case 'i': goto yy167; + case 'n': goto yy168; + case 'o': goto yy169; + case 'r': goto yy170; + case 's': goto yy171; + case 't': goto yy172; + case 'u': goto yy173; + case 'v': goto yy174; + case 'w': goto yy175; + default: goto yy159; } -yy145: +yy159: ++YYCURSOR; -yy146: +yy160: { error ("bad long option: %s", *argv); return EXIT_FAIL; } -yy147: +yy161: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'i') goto yy443; - goto yy146; -yy148: + if (yych == 'i') goto yy457; + goto yy160; +yy162: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'a') goto yy403; - if (yych == 'o') goto yy404; - goto yy146; -yy149: + if (yych == 'a') goto yy417; + if (yych == 'o') goto yy418; + goto yy160; +yy163: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'e') goto yy390; - goto yy146; -yy150: + if (yych == 'e') goto yy404; + goto yy160; +yy164: yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'l') { - if (yych == 'c') goto yy352; - goto yy146; + if (yych == 'c') goto yy366; + goto yy160; } else { - if (yych <= 'm') goto yy350; - if (yych <= 'n') goto yy351; - goto yy146; + if (yych <= 'm') goto yy364; + if (yych <= 'n') goto yy365; + goto yy160; } -yy151: +yy165: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'l') goto yy338; - goto yy146; -yy152: + if (yych == 'l') goto yy352; + goto yy160; +yy166: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'e') goto yy333; - goto yy146; -yy153: + if (yych == 'e') goto yy347; + goto yy160; +yy167: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'n') goto yy327; - goto yy146; -yy154: + if (yych == 'n') goto yy341; + goto yy160; +yy168: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'e') goto yy286; - if (yych == 'o') goto yy285; - goto yy146; -yy155: + if (yych == 'e') goto yy300; + if (yych == 'o') goto yy299; + goto yy160; +yy169: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'u') goto yy278; - goto yy146; -yy156: + if (yych == 'u') goto yy292; + goto yy160; +yy170: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'e') goto yy269; - goto yy146; -yy157: + if (yych == 'e') goto yy283; + goto yy160; +yy171: yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'j') { - if (yych == 'i') goto yy217; - goto yy146; + if (yych == 'i') goto yy231; + goto yy160; } else { - if (yych <= 'k') goto yy218; - if (yych == 't') goto yy219; - goto yy146; + if (yych <= 'k') goto yy232; + if (yych == 't') goto yy233; + goto yy160; } -yy158: +yy172: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'y') goto yy205; - goto yy146; -yy159: + if (yych == 'y') goto yy219; + goto yy160; +yy173: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'n') goto yy188; - if (yych == 't') goto yy187; - goto yy146; -yy160: + if (yych == 'n') goto yy202; + if (yych == 't') goto yy201; + goto yy160; +yy174: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'e') goto yy174; - goto yy146; -yy161: + if (yych == 'e') goto yy188; + goto yy160; +yy175: yych = *(YYMARKER = ++YYCURSOR); - if (yych != 'i') goto yy146; + if (yych != 'i') goto yy160; yych = *++YYCURSOR; - if (yych == 'd') goto yy164; -yy163: + if (yych == 'd') goto yy178; +yy177: YYCURSOR = YYMARKER; - goto yy146; -yy164: + goto yy160; +yy178: yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych != '-') goto yy163; + if (yych != '-') goto yy177; yych = *++YYCURSOR; - if (yych != 'c') goto yy163; + if (yych != 'c') goto yy177; yych = *++YYCURSOR; - if (yych != 'h') goto yy163; + if (yych != 'h') goto yy177; yych = *++YYCURSOR; - if (yych != 'a') goto yy163; + if (yych != 'a') goto yy177; yych = *++YYCURSOR; - if (yych != 'r') goto yy163; + if (yych != 'r') goto yy177; yych = *++YYCURSOR; - if (yych != 's') goto yy163; + if (yych != 's') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { if (!opts.wide_chars ()) { error_encoding (); return EXIT_FAIL; } goto opt; } -yy174: +yy188: yych = *++YYCURSOR; - if (yych != 'r') goto yy163; + if (yych != 'r') goto yy177; yych = *++YYCURSOR; - if (yych == 'n') goto yy176; - if (yych == 's') goto yy177; - goto yy163; -yy176: + if (yych == 'n') goto yy190; + if (yych == 's') goto yy191; + goto yy177; +yy190: yych = *++YYCURSOR; - if (yych == 'u') goto yy183; - goto yy163; -yy177: + if (yych == 'u') goto yy197; + goto yy177; +yy191: yych = *++YYCURSOR; - if (yych != 'i') goto yy163; + if (yych != 'i') goto yy177; yych = *++YYCURSOR; - if (yych != 'o') goto yy163; + if (yych != 'o') goto yy177; yych = *++YYCURSOR; - if (yych != 'n') goto yy163; + if (yych != 'n') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { version (); return EXIT_OK; } -yy183: +yy197: yych = *++YYCURSOR; - if (yych != 'm') goto yy163; + if (yych != 'm') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { vernum (); return EXIT_OK; } -yy187: +yy201: yych = *++YYCURSOR; - if (yych == 'f') goto yy196; - goto yy163; -yy188: + if (yych == 'f') goto yy210; + goto yy177; +yy202: yych = *++YYCURSOR; - if (yych != 'i') goto yy163; + if (yych != 'i') goto yy177; yych = *++YYCURSOR; - if (yych != 'c') goto yy163; + if (yych != 'c') goto yy177; yych = *++YYCURSOR; - if (yych != 'o') goto yy163; + if (yych != 'o') goto yy177; yych = *++YYCURSOR; - if (yych != 'd') goto yy163; + if (yych != 'd') goto yy177; yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { if (!opts.unicode ()) { error_encoding (); return EXIT_FAIL; } goto opt; } -yy196: +yy210: yych = *++YYCURSOR; - if (yych != '-') goto yy163; + if (yych != '-') goto yy177; yych = *++YYCURSOR; - if (yych == '1') goto yy198; - if (yych == '8') goto yy199; - goto yy163; -yy198: + if (yych == '1') goto yy212; + if (yych == '8') goto yy213; + goto yy177; +yy212: yych = *++YYCURSOR; - if (yych == '6') goto yy202; - goto yy163; -yy199: + if (yych == '6') goto yy216; + goto yy177; +yy213: yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { if (!opts.utf_8 ()) { error_encoding (); return EXIT_FAIL; } goto opt; } -yy202: +yy216: yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { if (!opts.utf_16 ()) { error_encoding (); return EXIT_FAIL; } goto opt; } -yy205: +yy219: yych = *++YYCURSOR; - if (yych != 'p') goto yy163; + if (yych != 'p') goto yy177; yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych != '-') goto yy163; + if (yych != '-') goto yy177; yych = *++YYCURSOR; - if (yych != 'h') goto yy163; + if (yych != 'h') goto yy177; yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych != 'a') goto yy163; + if (yych != 'a') goto yy177; yych = *++YYCURSOR; - if (yych != 'd') goto yy163; + if (yych != 'd') goto yy177; yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych != 'r') goto yy163; + if (yych != 'r') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { YYCURSOR = *++argv; goto opt_header; } -yy217: +yy231: yych = *++YYCURSOR; - if (yych == 'n') goto yy258; - goto yy163; -yy218: + if (yych == 'n') goto yy272; + goto yy177; +yy232: yych = *++YYCURSOR; - if (yych == 'e') goto yy250; - goto yy163; -yy219: + if (yych == 'e') goto yy264; + goto yy177; +yy233: yych = *++YYCURSOR; - if (yych == 'a') goto yy220; - if (yych == 'o') goto yy221; - goto yy163; -yy220: + if (yych == 'a') goto yy234; + if (yych == 'o') goto yy235; + goto yy177; +yy234: yych = *++YYCURSOR; - if (yych == 'r') goto yy235; - goto yy163; -yy221: + if (yych == 'r') goto yy249; + goto yy177; +yy235: yych = *++YYCURSOR; - if (yych != 'r') goto yy163; + if (yych != 'r') goto yy177; yych = *++YYCURSOR; - if (yych != 'a') goto yy163; + if (yych != 'a') goto yy177; yych = *++YYCURSOR; - if (yych != 'b') goto yy163; + if (yych != 'b') goto yy177; yych = *++YYCURSOR; - if (yych != 'l') goto yy163; + if (yych != 'l') goto yy177; yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych != '-') goto yy163; + if (yych != '-') goto yy177; yych = *++YYCURSOR; - if (yych != 's') goto yy163; + if (yych != 's') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != 'a') goto yy163; + if (yych != 'a') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { opts.storable_state (); goto opt; } -yy235: +yy249: yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != '-') goto yy163; + if (yych != '-') goto yy177; yych = *++YYCURSOR; - if (yych != 'c') goto yy163; + if (yych != 'c') goto yy177; yych = *++YYCURSOR; - if (yych != 'o') goto yy163; + if (yych != 'o') goto yy177; yych = *++YYCURSOR; - if (yych != 'n') goto yy163; + if (yych != 'n') goto yy177; yych = *++YYCURSOR; - if (yych != 'd') goto yy163; + if (yych != 'd') goto yy177; yych = *++YYCURSOR; - if (yych != 'i') goto yy163; + if (yych != 'i') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != 'i') goto yy163; + if (yych != 'i') goto yy177; yych = *++YYCURSOR; - if (yych != 'o') goto yy163; + if (yych != 'o') goto yy177; yych = *++YYCURSOR; - if (yych != 'n') goto yy163; + if (yych != 'n') goto yy177; yych = *++YYCURSOR; - if (yych != 's') goto yy163; + if (yych != 's') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { opts.start_conditions (); goto opt; } -yy250: +yy264: yych = *++YYCURSOR; - if (yych != 'l') goto yy163; + if (yych != 'l') goto yy177; yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != 'o') goto yy163; + if (yych != 'o') goto yy177; yych = *++YYCURSOR; - if (yych != 'n') goto yy163; + if (yych != 'n') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { opts.skeleton (); goto opt; } -yy258: +yy272: yych = *++YYCURSOR; - if (yych != 'g') goto yy163; + if (yych != 'g') goto yy177; yych = *++YYCURSOR; - if (yych != 'l') goto yy163; + if (yych != 'l') goto yy177; yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych != '-') goto yy163; + if (yych != '-') goto yy177; yych = *++YYCURSOR; - if (yych != 'p') goto yy163; + if (yych != 'p') goto yy177; yych = *++YYCURSOR; - if (yych != 'a') goto yy163; + if (yych != 'a') goto yy177; yych = *++YYCURSOR; - if (yych != 's') goto yy163; + if (yych != 's') goto yy177; yych = *++YYCURSOR; - if (yych != 's') goto yy163; + if (yych != 's') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { goto opt; } -yy269: +yy283: yych = *++YYCURSOR; - if (yych != 'u') goto yy163; + if (yych != 'u') goto yy177; yych = *++YYCURSOR; - if (yych != 's') goto yy163; + if (yych != 's') goto yy177; yych = *++YYCURSOR; - if (yych != 'a') goto yy163; + if (yych != 'a') goto yy177; yych = *++YYCURSOR; - if (yych != 'b') goto yy163; + if (yych != 'b') goto yy177; yych = *++YYCURSOR; - if (yych != 'l') goto yy163; + if (yych != 'l') goto yy177; yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { opts.reusable (); goto opt; } -yy278: +yy292: yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != 'p') goto yy163; + if (yych != 'p') goto yy177; yych = *++YYCURSOR; - if (yych != 'u') goto yy163; + if (yych != 'u') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { YYCURSOR = *++argv; goto opt_output; } -yy285: +yy299: yych = *++YYCURSOR; - if (yych == '-') goto yy297; - goto yy163; -yy286: + if (yych == '-') goto yy311; + goto yy177; +yy300: yych = *++YYCURSOR; - if (yych != 's') goto yy163; + if (yych != 's') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych != 'd') goto yy163; + if (yych != 'd') goto yy177; yych = *++YYCURSOR; - if (yych != '-') goto yy163; + if (yych != '-') goto yy177; yych = *++YYCURSOR; - if (yych != 'i') goto yy163; + if (yych != 'i') goto yy177; yych = *++YYCURSOR; - if (yych != 'f') goto yy163; + if (yych != 'f') goto yy177; yych = *++YYCURSOR; - if (yych != 's') goto yy163; + if (yych != 's') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { opts.nested_ifs (); goto opt; } -yy297: +yy311: yych = *++YYCURSOR; - if (yych == 'd') goto yy299; - if (yych != 'g') goto yy163; + if (yych == 'd') goto yy313; + if (yych != 'g') goto yy177; yych = *++YYCURSOR; - if (yych == 'e') goto yy311; - goto yy163; -yy299: + if (yych == 'e') goto yy325; + goto yy177; +yy313: yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych != 'b') goto yy163; + if (yych != 'b') goto yy177; yych = *++YYCURSOR; - if (yych != 'u') goto yy163; + if (yych != 'u') goto yy177; yych = *++YYCURSOR; - if (yych != 'g') goto yy163; + if (yych != 'g') goto yy177; yych = *++YYCURSOR; - if (yych != '-') goto yy163; + if (yych != '-') goto yy177; yych = *++YYCURSOR; - if (yych != 'i') goto yy163; + if (yych != 'i') goto yy177; yych = *++YYCURSOR; - if (yych != 'n') goto yy163; + if (yych != 'n') goto yy177; yych = *++YYCURSOR; - if (yych != 'f') goto yy163; + if (yych != 'f') goto yy177; yych = *++YYCURSOR; - if (yych != 'o') goto yy163; + if (yych != 'o') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { opts.no_debug_info (); goto opt; } -yy311: +yy325: yych = *++YYCURSOR; - if (yych != 'n') goto yy163; + if (yych != 'n') goto yy177; yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych != 'r') goto yy163; + if (yych != 'r') goto yy177; yych = *++YYCURSOR; - if (yych != 'a') goto yy163; + if (yych != 'a') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != 'i') goto yy163; + if (yych != 'i') goto yy177; yych = *++YYCURSOR; - if (yych != 'o') goto yy163; + if (yych != 'o') goto yy177; yych = *++YYCURSOR; - if (yych != 'n') goto yy163; + if (yych != 'n') goto yy177; yych = *++YYCURSOR; - if (yych != '-') goto yy163; + if (yych != '-') goto yy177; yych = *++YYCURSOR; - if (yych != 'd') goto yy163; + if (yych != 'd') goto yy177; yych = *++YYCURSOR; - if (yych != 'a') goto yy163; + if (yych != 'a') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { opts.no_generation_date (); goto opt; } -yy327: +yy341: yych = *++YYCURSOR; - if (yych != 'p') goto yy163; + if (yych != 'p') goto yy177; yych = *++YYCURSOR; - if (yych != 'u') goto yy163; + if (yych != 'u') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { goto opt_input; } -yy333: +yy347: yych = *++YYCURSOR; - if (yych != 'l') goto yy163; + if (yych != 'l') goto yy177; yych = *++YYCURSOR; - if (yych != 'p') goto yy163; + if (yych != 'p') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { usage (); return EXIT_OK; } -yy338: +yy352: yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych != 'x') goto yy163; + if (yych != 'x') goto yy177; yych = *++YYCURSOR; - if (yych != '-') goto yy163; + if (yych != '-') goto yy177; yych = *++YYCURSOR; - if (yych != 's') goto yy163; + if (yych != 's') goto yy177; yych = *++YYCURSOR; - if (yych != 'y') goto yy163; + if (yych != 'y') goto yy177; yych = *++YYCURSOR; - if (yych != 'n') goto yy163; + if (yych != 'n') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != 'a') goto yy163; + if (yych != 'a') goto yy177; yych = *++YYCURSOR; - if (yych != 'x') goto yy163; + if (yych != 'x') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { opts.flex_syntax (); goto opt; } -yy350: +yy364: yych = *++YYCURSOR; - if (yych == 'i') goto yy371; - if (yych == 'p') goto yy372; - goto yy163; -yy351: + if (yych == 'i') goto yy385; + if (yych == 'p') goto yy386; + goto yy177; +yy365: yych = *++YYCURSOR; - if (yych == 'c') goto yy356; - goto yy163; -yy352: + if (yych == 'c') goto yy370; + goto yy177; +yy366: yych = *++YYCURSOR; - if (yych != 'b') goto yy163; + if (yych != 'b') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { if (!opts.ecb ()) { error_encoding (); return EXIT_FAIL; } goto opt; } -yy356: +yy370: yych = *++YYCURSOR; - if (yych != 'o') goto yy163; + if (yych != 'o') goto yy177; yych = *++YYCURSOR; - if (yych != 'd') goto yy163; + if (yych != 'd') goto yy177; yych = *++YYCURSOR; - if (yych != 'i') goto yy163; + if (yych != 'i') goto yy177; yych = *++YYCURSOR; - if (yych != 'n') goto yy163; + if (yych != 'n') goto yy177; yych = *++YYCURSOR; - if (yych != 'g') goto yy163; + if (yych != 'g') goto yy177; yych = *++YYCURSOR; - if (yych != '-') goto yy163; + if (yych != '-') goto yy177; yych = *++YYCURSOR; - if (yych != 'p') goto yy163; + if (yych != 'p') goto yy177; yych = *++YYCURSOR; - if (yych != 'o') goto yy163; + if (yych != 'o') goto yy177; yych = *++YYCURSOR; - if (yych != 'l') goto yy163; + if (yych != 'l') goto yy177; yych = *++YYCURSOR; - if (yych != 'i') goto yy163; + if (yych != 'i') goto yy177; yych = *++YYCURSOR; - if (yych != 'c') goto yy163; + if (yych != 'c') goto yy177; yych = *++YYCURSOR; - if (yych != 'y') goto yy163; + if (yych != 'y') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { goto opt_encoding_policy; } -yy371: +yy385: yych = *++YYCURSOR; - if (yych == 't') goto yy383; - goto yy163; -yy372: + if (yych == 't') goto yy397; + goto yy177; +yy386: yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != 'y') goto yy163; + if (yych != 'y') goto yy177; yych = *++YYCURSOR; - if (yych != '-') goto yy163; + if (yych != '-') goto yy177; yych = *++YYCURSOR; - if (yych != 'c') goto yy163; + if (yych != 'c') goto yy177; yych = *++YYCURSOR; - if (yych != 'l') goto yy163; + if (yych != 'l') goto yy177; yych = *++YYCURSOR; - if (yych != 'a') goto yy163; + if (yych != 'a') goto yy177; yych = *++YYCURSOR; - if (yych != 's') goto yy163; + if (yych != 's') goto yy177; yych = *++YYCURSOR; - if (yych != 's') goto yy163; + if (yych != 's') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { goto opt_empty_class; } -yy383: +yy397: yych = *++YYCURSOR; - if (yych != '-') goto yy163; + if (yych != '-') goto yy177; yych = *++YYCURSOR; - if (yych != 'd') goto yy163; + if (yych != 'd') goto yy177; yych = *++YYCURSOR; - if (yych != 'o') goto yy163; + if (yych != 'o') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { opts.emit_dot (); goto opt; } -yy390: +yy404: yych = *++YYCURSOR; - if (yych != 'b') goto yy163; + if (yych != 'b') goto yy177; yych = *++YYCURSOR; - if (yych != 'u') goto yy163; + if (yych != 'u') goto yy177; yych = *++YYCURSOR; - if (yych != 'g') goto yy163; + if (yych != 'g') goto yy177; yych = *++YYCURSOR; - if (yych != '-') goto yy163; + if (yych != '-') goto yy177; yych = *++YYCURSOR; - if (yych != 'o') goto yy163; + if (yych != 'o') goto yy177; yych = *++YYCURSOR; - if (yych != 'u') goto yy163; + if (yych != 'u') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != 'p') goto yy163; + if (yych != 'p') goto yy177; yych = *++YYCURSOR; - if (yych != 'u') goto yy163; + if (yych != 'u') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { opts.debug_output (); goto opt; } -yy403: +yy417: yych = *++YYCURSOR; - if (yych == 's') goto yy419; - goto yy163; -yy404: + if (yych == 's') goto yy433; + goto yy177; +yy418: yych = *++YYCURSOR; - if (yych != 'm') goto yy163; + if (yych != 'm') goto yy177; yych = *++YYCURSOR; - if (yych != 'p') goto yy163; + if (yych != 'p') goto yy177; yych = *++YYCURSOR; - if (yych != 'u') goto yy163; + if (yych != 'u') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych != 'd') goto yy163; + if (yych != 'd') goto yy177; yych = *++YYCURSOR; - if (yych != '-') goto yy163; + if (yych != '-') goto yy177; yych = *++YYCURSOR; - if (yych != 'g') goto yy163; + if (yych != 'g') goto yy177; yych = *++YYCURSOR; - if (yych != 'o') goto yy163; + if (yych != 'o') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != 'o') goto yy163; + if (yych != 'o') goto yy177; yych = *++YYCURSOR; - if (yych != 's') goto yy163; + if (yych != 's') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { opts.computed_gotos (); goto opt; } -yy419: +yy433: yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych != '-') goto yy163; + if (yych != '-') goto yy177; yych = *++YYCURSOR; - if (yych != 'i') goto yy163; + if (yych != 'i') goto yy177; yych = *++YYCURSOR; - if (yych != 'n') goto yy163; + if (yych != 'n') goto yy177; yych = *++YYCURSOR; - if (yych == 's') goto yy425; - if (yych != 'v') goto yy163; + if (yych == 's') goto yy439; + if (yych != 'v') goto yy177; yych = *++YYCURSOR; - if (yych == 'e') goto yy436; - goto yy163; -yy425: + if (yych == 'e') goto yy450; + goto yy177; +yy439: yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych != 'n') goto yy163; + if (yych != 'n') goto yy177; yych = *++YYCURSOR; - if (yych != 's') goto yy163; + if (yych != 's') goto yy177; yych = *++YYCURSOR; - if (yych != 'i') goto yy163; + if (yych != 'i') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != 'i') goto yy163; + if (yych != 'i') goto yy177; yych = *++YYCURSOR; - if (yych != 'v') goto yy163; + if (yych != 'v') goto yy177; yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { opts.case_insensitive (); goto opt; } -yy436: +yy450: yych = *++YYCURSOR; - if (yych != 'r') goto yy163; + if (yych != 'r') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych != 'd') goto yy163; + if (yych != 'd') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { opts.case_inverted (); goto opt; } -yy443: +yy457: yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != '-') goto yy163; + if (yych != '-') goto yy177; yych = *++YYCURSOR; - if (yych != 'v') goto yy163; + if (yych != 'v') goto yy177; yych = *++YYCURSOR; - if (yych != 'e') goto yy163; + if (yych != 'e') goto yy177; yych = *++YYCURSOR; - if (yych != 'c') goto yy163; + if (yych != 'c') goto yy177; yych = *++YYCURSOR; - if (yych != 't') goto yy163; + if (yych != 't') goto yy177; yych = *++YYCURSOR; - if (yych != 'o') goto yy163; + if (yych != 'o') goto yy177; yych = *++YYCURSOR; - if (yych != 'r') goto yy163; + if (yych != 'r') goto yy177; yych = *++YYCURSOR; - if (yych != 's') goto yy163; + if (yych != 's') goto yy177; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy163; + if (yych >= 0x01) goto yy177; ++YYCURSOR; { opts.bit_vectors (); goto opt; } } @@ -1188,23 +1217,23 @@ opt_output: 128, 128, 128, 128, 128, 128, 128, 128, }; yych = *YYCURSOR; - if (yych <= 0x00) goto yy457; - if (yych != '-') goto yy459; -yy457: + if (yych <= 0x00) goto yy471; + if (yych != '-') goto yy473; +yy471: ++YYCURSOR; { error ("bad argument to option -o, --output: %s", *argv); return EXIT_FAIL; } -yy459: +yy473: yych = *(YYMARKER = ++YYCURSOR); - goto yy461; -yy460: + goto yy475; +yy474: ++YYCURSOR; yych = *YYCURSOR; -yy461: +yy475: if (yybm[0+yych] & 128) { - goto yy460; + goto yy474; } ++YYCURSOR; { if (!opts.output (*argv)) return EXIT_FAIL; goto opt; } @@ -1250,23 +1279,23 @@ opt_header: 128, 128, 128, 128, 128, 128, 128, 128, }; yych = *YYCURSOR; - if (yych <= 0x00) goto yy466; - if (yych != '-') goto yy468; -yy466: + if (yych <= 0x00) goto yy480; + if (yych != '-') goto yy482; +yy480: ++YYCURSOR; { error ("bad argument to option -t, --type-header: %s", *argv); return EXIT_FAIL; } -yy468: +yy482: yych = *(YYMARKER = ++YYCURSOR); - goto yy470; -yy469: + goto yy484; +yy483: ++YYCURSOR; yych = *YYCURSOR; -yy470: +yy484: if (yybm[0+yych] & 128) { - goto yy469; + goto yy483; } ++YYCURSOR; { if (!opts.type_header (*argv)) return EXIT_FAIL; goto opt; } @@ -1280,72 +1309,72 @@ opt_encoding_policy: YYCTYPE yych; yych = *YYCURSOR; if (yych <= 'h') { - if (yych == 'f') goto yy477; + if (yych == 'f') goto yy491; } else { - if (yych <= 'i') goto yy478; - if (yych == 's') goto yy479; + if (yych <= 'i') goto yy492; + if (yych == 's') goto yy493; } ++YYCURSOR; -yy476: +yy490: { error ("bad argument to option --encoding-policy (expected: ignore | substitute | fail): %s", *argv); return EXIT_FAIL; } -yy477: +yy491: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'a') goto yy499; - goto yy476; -yy478: + if (yych == 'a') goto yy513; + goto yy490; +yy492: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'g') goto yy492; - goto yy476; -yy479: + if (yych == 'g') goto yy506; + goto yy490; +yy493: yych = *(YYMARKER = ++YYCURSOR); - if (yych != 'u') goto yy476; + if (yych != 'u') goto yy490; yych = *++YYCURSOR; - if (yych == 'b') goto yy482; -yy481: + if (yych == 'b') goto yy496; +yy495: YYCURSOR = YYMARKER; - goto yy476; -yy482: + goto yy490; +yy496: yych = *++YYCURSOR; - if (yych != 's') goto yy481; + if (yych != 's') goto yy495; yych = *++YYCURSOR; - if (yych != 't') goto yy481; + if (yych != 't') goto yy495; yych = *++YYCURSOR; - if (yych != 'i') goto yy481; + if (yych != 'i') goto yy495; yych = *++YYCURSOR; - if (yych != 't') goto yy481; + if (yych != 't') goto yy495; yych = *++YYCURSOR; - if (yych != 'u') goto yy481; + if (yych != 'u') goto yy495; yych = *++YYCURSOR; - if (yych != 't') goto yy481; + if (yych != 't') goto yy495; yych = *++YYCURSOR; - if (yych != 'e') goto yy481; + if (yych != 'e') goto yy495; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy481; + if (yych >= 0x01) goto yy495; ++YYCURSOR; { opts.encoding_policy (Enc::POLICY_SUBSTITUTE); goto opt; } -yy492: +yy506: yych = *++YYCURSOR; - if (yych != 'n') goto yy481; + if (yych != 'n') goto yy495; yych = *++YYCURSOR; - if (yych != 'o') goto yy481; + if (yych != 'o') goto yy495; yych = *++YYCURSOR; - if (yych != 'r') goto yy481; + if (yych != 'r') goto yy495; yych = *++YYCURSOR; - if (yych != 'e') goto yy481; + if (yych != 'e') goto yy495; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy481; + if (yych >= 0x01) goto yy495; ++YYCURSOR; { opts.encoding_policy (Enc::POLICY_IGNORE); goto opt; } -yy499: +yy513: yych = *++YYCURSOR; - if (yych != 'i') goto yy481; + if (yych != 'i') goto yy495; yych = *++YYCURSOR; - if (yych != 'l') goto yy481; + if (yych != 'l') goto yy495; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy481; + if (yych >= 0x01) goto yy495; ++YYCURSOR; { opts.encoding_policy (Enc::POLICY_FAIL); goto opt; } } @@ -1357,52 +1386,52 @@ opt_input: { YYCTYPE yych; yych = *YYCURSOR; - if (yych <= 'b') goto yy506; - if (yych <= 'c') goto yy508; - if (yych <= 'd') goto yy509; -yy506: + if (yych <= 'b') goto yy520; + if (yych <= 'c') goto yy522; + if (yych <= 'd') goto yy523; +yy520: ++YYCURSOR; -yy507: +yy521: { error ("bad argument to option --input (expected: default | custom): %s", *argv); return EXIT_FAIL; } -yy508: +yy522: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'u') goto yy519; - goto yy507; -yy509: + if (yych == 'u') goto yy533; + goto yy521; +yy523: yych = *(YYMARKER = ++YYCURSOR); - if (yych != 'e') goto yy507; + if (yych != 'e') goto yy521; yych = *++YYCURSOR; - if (yych == 'f') goto yy512; -yy511: + if (yych == 'f') goto yy526; +yy525: YYCURSOR = YYMARKER; - goto yy507; -yy512: + goto yy521; +yy526: yych = *++YYCURSOR; - if (yych != 'a') goto yy511; + if (yych != 'a') goto yy525; yych = *++YYCURSOR; - if (yych != 'u') goto yy511; + if (yych != 'u') goto yy525; yych = *++YYCURSOR; - if (yych != 'l') goto yy511; + if (yych != 'l') goto yy525; yych = *++YYCURSOR; - if (yych != 't') goto yy511; + if (yych != 't') goto yy525; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy511; + if (yych >= 0x01) goto yy525; ++YYCURSOR; { opts.input (InputAPI::DEFAULT); goto opt; } -yy519: +yy533: yych = *++YYCURSOR; - if (yych != 's') goto yy511; + if (yych != 's') goto yy525; yych = *++YYCURSOR; - if (yych != 't') goto yy511; + if (yych != 't') goto yy525; yych = *++YYCURSOR; - if (yych != 'o') goto yy511; + if (yych != 'o') goto yy525; yych = *++YYCURSOR; - if (yych != 'm') goto yy511; + if (yych != 'm') goto yy525; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy511; + if (yych >= 0x01) goto yy525; ++YYCURSOR; { opts.input (InputAPI::CUSTOM); goto opt; } } @@ -1414,72 +1443,72 @@ opt_empty_class: { YYCTYPE yych; yych = *YYCURSOR; - if (yych == 'e') goto yy530; - if (yych == 'm') goto yy531; + if (yych == 'e') goto yy544; + if (yych == 'm') goto yy545; ++YYCURSOR; -yy529: +yy543: { error ("bad argument to option --empty-class (expected: match-empty | match-none | error): %s", *argv); return EXIT_FAIL; } -yy530: +yy544: yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'r') goto yy551; - goto yy529; -yy531: + if (yych == 'r') goto yy565; + goto yy543; +yy545: yych = *(YYMARKER = ++YYCURSOR); - if (yych != 'a') goto yy529; + if (yych != 'a') goto yy543; yych = *++YYCURSOR; - if (yych == 't') goto yy534; -yy533: + if (yych == 't') goto yy548; +yy547: YYCURSOR = YYMARKER; - goto yy529; -yy534: + goto yy543; +yy548: yych = *++YYCURSOR; - if (yych != 'c') goto yy533; + if (yych != 'c') goto yy547; yych = *++YYCURSOR; - if (yych != 'h') goto yy533; + if (yych != 'h') goto yy547; yych = *++YYCURSOR; - if (yych != '-') goto yy533; + if (yych != '-') goto yy547; yych = *++YYCURSOR; - if (yych == 'e') goto yy538; - if (yych == 'n') goto yy539; - goto yy533; -yy538: + if (yych == 'e') goto yy552; + if (yych == 'n') goto yy553; + goto yy547; +yy552: yych = *++YYCURSOR; - if (yych == 'm') goto yy545; - goto yy533; -yy539: + if (yych == 'm') goto yy559; + goto yy547; +yy553: yych = *++YYCURSOR; - if (yych != 'o') goto yy533; + if (yych != 'o') goto yy547; yych = *++YYCURSOR; - if (yych != 'n') goto yy533; + if (yych != 'n') goto yy547; yych = *++YYCURSOR; - if (yych != 'e') goto yy533; + if (yych != 'e') goto yy547; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy533; + if (yych >= 0x01) goto yy547; ++YYCURSOR; { opts.empty_class (EMPTY_CLASS_MATCH_NONE); goto opt; } -yy545: +yy559: yych = *++YYCURSOR; - if (yych != 'p') goto yy533; + if (yych != 'p') goto yy547; yych = *++YYCURSOR; - if (yych != 't') goto yy533; + if (yych != 't') goto yy547; yych = *++YYCURSOR; - if (yych != 'y') goto yy533; + if (yych != 'y') goto yy547; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy533; + if (yych >= 0x01) goto yy547; ++YYCURSOR; { opts.empty_class (EMPTY_CLASS_MATCH_EMPTY); goto opt; } -yy551: +yy565: yych = *++YYCURSOR; - if (yych != 'r') goto yy533; + if (yych != 'r') goto yy547; yych = *++YYCURSOR; - if (yych != 'o') goto yy533; + if (yych != 'o') goto yy547; yych = *++YYCURSOR; - if (yych != 'r') goto yy533; + if (yych != 'r') goto yy547; yych = *++YYCURSOR; - if (yych >= 0x01) goto yy533; + if (yych >= 0x01) goto yy547; ++YYCURSOR; { opts.empty_class (EMPTY_CLASS_ERROR); goto opt; } } diff --git a/re2c/src/codegen/prepare_dfa.cc b/re2c/src/codegen/prepare_dfa.cc index a3ad9f10..4b904989 100644 --- a/re2c/src/codegen/prepare_dfa.cc +++ b/re2c/src/codegen/prepare_dfa.cc @@ -254,10 +254,10 @@ void DFA::prepare(OutputFile & o, uint32_t & max_fill) warn.naked_default (stray_cunits); } - // warn about not shadowed empty rule + // warn about not shadowed rule that matches empty string if (empty_rule && !stray_cunits.empty ()) { - warn.empty_rule (head->rule->code->line); + warn.match_empty_string (head->rule->code->line); } // split ``base'' states into two parts diff --git a/re2c/src/conf/parse_opts.re b/re2c/src/conf/parse_opts.re index 25865611..df7e49f8 100644 --- a/re2c/src/conf/parse_opts.re +++ b/re2c/src/conf/parse_opts.re @@ -76,7 +76,7 @@ opt_warn: return EXIT_FAIL; } "empty-character-class" end { warn.set (Warn::EMPTY_CHARACTER_CLASS, option); goto opt; } - "empty-rule" end { warn.set (Warn::EMPTY_RULE, option); goto opt; } + "match-empty-string" end { warn.set (Warn::MATCH_EMPTY_STRING, option); goto opt; } "naked-default" end { warn.set (Warn::NAKED_DEFAULT, option); goto opt; } */ diff --git a/re2c/src/conf/warn.cc b/re2c/src/conf/warn.cc index 01c2fee9..15cfdc06 100644 --- a/re2c/src/conf/warn.cc +++ b/re2c/src/conf/warn.cc @@ -74,15 +74,15 @@ void Warn::empty_class (uint32_t line) } } -void Warn::empty_rule (uint32_t line) +void Warn::match_empty_string (uint32_t line) { - if (mask[EMPTY_RULE] & WARNING) + if (mask[MATCH_EMPTY_STRING] & WARNING) { - if (mask[EMPTY_RULE] & ERROR) + if (mask[MATCH_EMPTY_STRING] & ERROR) { error_accuml = true; } - warning (names[EMPTY_RULE], "empty rule at line %u", line); + warning (names[MATCH_EMPTY_STRING], "rule matches empty string at line %u", line); } } diff --git a/re2c/src/conf/warn.h b/re2c/src/conf/warn.h index f07304f8..e74ae220 100644 --- a/re2c/src/conf/warn.h +++ b/re2c/src/conf/warn.h @@ -9,7 +9,7 @@ namespace re2c { #define RE2C_WARNING_TYPES \ W (EMPTY_CHARACTER_CLASS, "empty-character-class"), \ - W (EMPTY_RULE, "empty-rule"), \ + W (MATCH_EMPTY_STRING, "match-empty-string"), \ W (NAKED_DEFAULT, "naked-default"), class Warn @@ -44,7 +44,7 @@ public: void set (type_t t, option_t o); void set_all (option_t o); void empty_class (uint32_t line); - void empty_rule (uint32_t line); + void match_empty_string (uint32_t line); void naked_default (const std::vector > & stray_cunits); }; diff --git a/re2c/test/bug1454253.c b/re2c/test/bug1454253.c index d93e1fa6..e44e5349 100644 --- a/re2c/test/bug1454253.c +++ b/re2c/test/bug1454253.c @@ -1,4 +1,4 @@ -re2c: warning: empty rule at line 40 [-Wempty-rule] +re2c: warning: rule matches empty string at line 40 [-Wmatch-empty-string] /* Generated by re2c */ #line 1 "bug1454253.re" #include diff --git a/re2c/test/bug1454253.s.c b/re2c/test/bug1454253.s.c index f13ea181..c8ef7d44 100644 --- a/re2c/test/bug1454253.s.c +++ b/re2c/test/bug1454253.s.c @@ -1,4 +1,4 @@ -re2c: warning: empty rule at line 40 [-Wempty-rule] +re2c: warning: rule matches empty string at line 40 [-Wmatch-empty-string] /* Generated by re2c */ #line 1 "bug1454253.s.re" #include diff --git a/re2c/test/bug2462777.ci.c b/re2c/test/bug2462777.ci.c index 2cbcb217..c00546e2 100644 --- a/re2c/test/bug2462777.ci.c +++ b/re2c/test/bug2462777.ci.c @@ -1,4 +1,4 @@ -re2c: warning: empty rule at line 2 [-Wempty-rule] +re2c: warning: rule matches empty string at line 2 [-Wmatch-empty-string] /* Generated by re2c */ { diff --git a/re2c/test/bug2462777.i.c b/re2c/test/bug2462777.i.c index 36c6e8fb..cdf8d4de 100644 --- a/re2c/test/bug2462777.i.c +++ b/re2c/test/bug2462777.i.c @@ -1,4 +1,4 @@ -re2c: warning: empty rule at line 2 [-Wempty-rule] +re2c: warning: rule matches empty string at line 2 [-Wmatch-empty-string] /* Generated by re2c */ { diff --git a/re2c/test/bug46_infinite_loop.c b/re2c/test/bug46_infinite_loop.c index 0b75955a..72edea01 100644 --- a/re2c/test/bug46_infinite_loop.c +++ b/re2c/test/bug46_infinite_loop.c @@ -1,5 +1,5 @@ -re2c: warning: empty rule at line 13 [-Wempty-rule] -re2c: warning: empty rule at line 18 [-Wempty-rule] +re2c: warning: rule matches empty string at line 13 [-Wmatch-empty-string] +re2c: warning: rule matches empty string at line 18 [-Wmatch-empty-string] /* Generated by re2c */ #line 1 "bug46_infinite_loop.re" #include diff --git a/re2c/test/bug61.i--empty-class(match-empty).c b/re2c/test/bug61.i--empty-class(match-empty).c index 06b93d64..8d2f2da2 100644 --- a/re2c/test/bug61.i--empty-class(match-empty).c +++ b/re2c/test/bug61.i--empty-class(match-empty).c @@ -1,9 +1,9 @@ re2c: warning: empty character class at line 2 [-Wempty-character-class] -re2c: warning: empty rule at line 2 [-Wempty-rule] +re2c: warning: rule matches empty string at line 2 [-Wmatch-empty-string] re2c: warning: empty character class at line 6 [-Wempty-character-class] -re2c: warning: empty rule at line 6 [-Wempty-rule] +re2c: warning: rule matches empty string at line 6 [-Wmatch-empty-string] re2c: warning: empty character class at line 10 [-Wempty-character-class] -re2c: warning: empty rule at line 10 [-Wempty-rule] +re2c: warning: rule matches empty string at line 10 [-Wmatch-empty-string] re2c: warning: empty character class at line 14 [-Wempty-character-class] re2c: warning: empty character class at line 14 [-Wempty-character-class] re2c: error: line 14, column 11: can only difference char sets diff --git a/re2c/test/bug61.i.c b/re2c/test/bug61.i.c index 06b93d64..8d2f2da2 100644 --- a/re2c/test/bug61.i.c +++ b/re2c/test/bug61.i.c @@ -1,9 +1,9 @@ re2c: warning: empty character class at line 2 [-Wempty-character-class] -re2c: warning: empty rule at line 2 [-Wempty-rule] +re2c: warning: rule matches empty string at line 2 [-Wmatch-empty-string] re2c: warning: empty character class at line 6 [-Wempty-character-class] -re2c: warning: empty rule at line 6 [-Wempty-rule] +re2c: warning: rule matches empty string at line 6 [-Wmatch-empty-string] re2c: warning: empty character class at line 10 [-Wempty-character-class] -re2c: warning: empty rule at line 10 [-Wempty-rule] +re2c: warning: rule matches empty string at line 10 [-Wmatch-empty-string] re2c: warning: empty character class at line 14 [-Wempty-character-class] re2c: warning: empty character class at line 14 [-Wempty-character-class] re2c: error: line 14, column 11: can only difference char sets diff --git a/re2c/test/bug61_difference_full.i--empty-class(match-empty).c b/re2c/test/bug61_difference_full.i--empty-class(match-empty).c index 8b538002..181c5789 100644 --- a/re2c/test/bug61_difference_full.i--empty-class(match-empty).c +++ b/re2c/test/bug61_difference_full.i--empty-class(match-empty).c @@ -1,5 +1,5 @@ re2c: warning: empty character class at line 2 [-Wempty-character-class] -re2c: warning: empty rule at line 2 [-Wempty-rule] +re2c: warning: rule matches empty string at line 2 [-Wmatch-empty-string] /* Generated by re2c */ { diff --git a/re2c/test/bug61_difference_full.i.c b/re2c/test/bug61_difference_full.i.c index 8b538002..181c5789 100644 --- a/re2c/test/bug61_difference_full.i.c +++ b/re2c/test/bug61_difference_full.i.c @@ -1,5 +1,5 @@ re2c: warning: empty character class at line 2 [-Wempty-character-class] -re2c: warning: empty rule at line 2 [-Wempty-rule] +re2c: warning: rule matches empty string at line 2 [-Wmatch-empty-string] /* Generated by re2c */ { diff --git a/re2c/test/bug61_negative.i--empty-class(match-empty).c b/re2c/test/bug61_negative.i--empty-class(match-empty).c index 8b538002..181c5789 100644 --- a/re2c/test/bug61_negative.i--empty-class(match-empty).c +++ b/re2c/test/bug61_negative.i--empty-class(match-empty).c @@ -1,5 +1,5 @@ re2c: warning: empty character class at line 2 [-Wempty-character-class] -re2c: warning: empty rule at line 2 [-Wempty-rule] +re2c: warning: rule matches empty string at line 2 [-Wmatch-empty-string] /* Generated by re2c */ { diff --git a/re2c/test/bug61_negative.i.c b/re2c/test/bug61_negative.i.c index 8b538002..181c5789 100644 --- a/re2c/test/bug61_negative.i.c +++ b/re2c/test/bug61_negative.i.c @@ -1,5 +1,5 @@ re2c: warning: empty character class at line 2 [-Wempty-character-class] -re2c: warning: empty rule at line 2 [-Wempty-rule] +re2c: warning: rule matches empty string at line 2 [-Wmatch-empty-string] /* Generated by re2c */ { diff --git a/re2c/test/bug61_positive.i--empty-class(match-empty).c b/re2c/test/bug61_positive.i--empty-class(match-empty).c index 8b538002..181c5789 100644 --- a/re2c/test/bug61_positive.i--empty-class(match-empty).c +++ b/re2c/test/bug61_positive.i--empty-class(match-empty).c @@ -1,5 +1,5 @@ re2c: warning: empty character class at line 2 [-Wempty-character-class] -re2c: warning: empty rule at line 2 [-Wempty-rule] +re2c: warning: rule matches empty string at line 2 [-Wmatch-empty-string] /* Generated by re2c */ { diff --git a/re2c/test/bug61_positive.i.c b/re2c/test/bug61_positive.i.c index 8b538002..181c5789 100644 --- a/re2c/test/bug61_positive.i.c +++ b/re2c/test/bug61_positive.i.c @@ -1,5 +1,5 @@ re2c: warning: empty character class at line 2 [-Wempty-character-class] -re2c: warning: empty rule at line 2 [-Wempty-rule] +re2c: warning: rule matches empty string at line 2 [-Wmatch-empty-string] /* Generated by re2c */ { diff --git a/re2c/test/condition_02.c.c b/re2c/test/condition_02.c.c index ff455d7f..c3705f66 100644 --- a/re2c/test/condition_02.c.c +++ b/re2c/test/condition_02.c.c @@ -1,4 +1,4 @@ -re2c: warning: empty rule at line 3 [-Wempty-rule] +re2c: warning: rule matches empty string at line 3 [-Wmatch-empty-string] re2c: warning: naked default case (stray code units: [0x00-`][c-0xFF]), better add default rule * [-Wnaked-default] re2c: warning: naked default case (stray code units: [0x00-a][c-0xFF]), better add default rule * [-Wnaked-default] /* Generated by re2c */ diff --git a/re2c/test/condition_02.cg.c b/re2c/test/condition_02.cg.c index c111d770..0cfbb235 100644 --- a/re2c/test/condition_02.cg.c +++ b/re2c/test/condition_02.cg.c @@ -1,4 +1,4 @@ -re2c: warning: empty rule at line 3 [-Wempty-rule] +re2c: warning: rule matches empty string at line 3 [-Wmatch-empty-string] re2c: warning: naked default case (stray code units: [0x00-`][c-0xFF]), better add default rule * [-Wnaked-default] re2c: warning: naked default case (stray code units: [0x00-a][c-0xFF]), better add default rule * [-Wnaked-default] /* Generated by re2c */ diff --git a/re2c/test/condition_03.cg.c b/re2c/test/condition_03.cg.c index 1432f882..a7bc9774 100644 --- a/re2c/test/condition_03.cg.c +++ b/re2c/test/condition_03.cg.c @@ -1,4 +1,4 @@ -re2c: warning: empty rule at line 3 [-Wempty-rule] +re2c: warning: rule matches empty string at line 3 [-Wmatch-empty-string] re2c: warning: naked default case (stray code units: [0x00-0][3-`][c-0xFF]), better add default rule * [-Wnaked-default] re2c: warning: naked default case (stray code units: [0x00-0][3-a][c-0xFF]), better add default rule * [-Wnaked-default] /* Generated by re2c */ diff --git a/re2c/test/condition_11.cg.c b/re2c/test/condition_11.cg.c index b65493f1..1522a4e7 100644 --- a/re2c/test/condition_11.cg.c +++ b/re2c/test/condition_11.cg.c @@ -1,4 +1,4 @@ -re2c: warning: empty rule at line 3 [-Wempty-rule] +re2c: warning: rule matches empty string at line 3 [-Wmatch-empty-string] re2c: warning: naked default case (stray code units: [0x00-0][3-`][c-0xFF]), better add default rule * [-Wnaked-default] re2c: warning: naked default case (stray code units: [0x00-0][3-a][c-0xFF]), better add default rule * [-Wnaked-default] /* Generated by re2c */ diff --git a/re2c/test/condition_13.cg.c b/re2c/test/condition_13.cg.c index 49eb54e1..12ec0988 100644 --- a/re2c/test/condition_13.cg.c +++ b/re2c/test/condition_13.cg.c @@ -1,4 +1,4 @@ -re2c: warning: empty rule at line 3 [-Wempty-rule] +re2c: warning: rule matches empty string at line 3 [-Wmatch-empty-string] re2c: warning: naked default case (stray code units: [0x00-0][3-`][c-0xFF]), better add default rule * [-Wnaked-default] re2c: warning: naked default case (stray code units: [0x00-0][3-a][c-0xFF]), better add default rule * [-Wnaked-default] /* Generated by re2c */ diff --git a/re2c/test/range_empty.8.c b/re2c/test/range_empty.8.c index 0e5f435a..5e38c605 100644 --- a/re2c/test/range_empty.8.c +++ b/re2c/test/range_empty.8.c @@ -1,5 +1,5 @@ re2c: warning: empty character class at line 2 [-Wempty-character-class] -re2c: warning: empty rule at line 2 [-Wempty-rule] +re2c: warning: rule matches empty string at line 2 [-Wmatch-empty-string] /* Generated by re2c */ #line 1 "range_empty.8.re" diff --git a/re2c/test/range_empty.c b/re2c/test/range_empty.c index e5425613..536519bc 100644 --- a/re2c/test/range_empty.c +++ b/re2c/test/range_empty.c @@ -1,5 +1,5 @@ re2c: warning: empty character class at line 2 [-Wempty-character-class] -re2c: warning: empty rule at line 2 [-Wempty-rule] +re2c: warning: rule matches empty string at line 2 [-Wmatch-empty-string] /* Generated by re2c */ #line 1 "range_empty.re" diff --git a/re2c/test/range_empty.e.c b/re2c/test/range_empty.e.c index be878cd4..31eb1e58 100644 --- a/re2c/test/range_empty.e.c +++ b/re2c/test/range_empty.e.c @@ -1,5 +1,5 @@ re2c: warning: empty character class at line 2 [-Wempty-character-class] -re2c: warning: empty rule at line 2 [-Wempty-rule] +re2c: warning: rule matches empty string at line 2 [-Wmatch-empty-string] /* Generated by re2c */ #line 1 "range_empty.e.re" diff --git a/re2c/test/range_empty.u.c b/re2c/test/range_empty.u.c index 647dcdaa..de4e2bbc 100644 --- a/re2c/test/range_empty.u.c +++ b/re2c/test/range_empty.u.c @@ -1,5 +1,5 @@ re2c: warning: empty character class at line 2 [-Wempty-character-class] -re2c: warning: empty rule at line 2 [-Wempty-rule] +re2c: warning: rule matches empty string at line 2 [-Wmatch-empty-string] /* Generated by re2c */ #line 1 "range_empty.u.re" diff --git a/re2c/test/range_empty.w.c b/re2c/test/range_empty.w.c index f1aef790..2c833142 100644 --- a/re2c/test/range_empty.w.c +++ b/re2c/test/range_empty.w.c @@ -1,5 +1,5 @@ re2c: warning: empty character class at line 2 [-Wempty-character-class] -re2c: warning: empty rule at line 2 [-Wempty-rule] +re2c: warning: rule matches empty string at line 2 [-Wmatch-empty-string] /* Generated by re2c */ #line 1 "range_empty.w.re" diff --git a/re2c/test/range_empty.x.c b/re2c/test/range_empty.x.c index 5099497d..39eba14d 100644 --- a/re2c/test/range_empty.x.c +++ b/re2c/test/range_empty.x.c @@ -1,5 +1,5 @@ re2c: warning: empty character class at line 2 [-Wempty-character-class] -re2c: warning: empty rule at line 2 [-Wempty-rule] +re2c: warning: rule matches empty string at line 2 [-Wmatch-empty-string] /* Generated by re2c */ #line 1 "range_empty.x.re" diff --git a/re2c/test/scanner.c b/re2c/test/scanner.c index 12ce2f28..1d7e8823 100644 --- a/re2c/test/scanner.c +++ b/re2c/test/scanner.c @@ -1,4 +1,4 @@ -re2c: warning: empty rule at line 300 [-Wempty-rule] +re2c: warning: rule matches empty string at line 300 [-Wmatch-empty-string] /* Generated by re2c */ #line 1 "scanner.re" /* Id: scanner.re,v 1.37 2006/02/25 12:41:41 helly Exp */ diff --git a/re2c/test/scanner.fs.c b/re2c/test/scanner.fs.c index 5f54dc71..a6e0fbd1 100644 --- a/re2c/test/scanner.fs.c +++ b/re2c/test/scanner.fs.c @@ -1,4 +1,4 @@ -re2c: warning: empty rule at line 300 [-Wempty-rule] +re2c: warning: rule matches empty string at line 300 [-Wmatch-empty-string] /* Generated by re2c */ #line 1 "scanner.fs.re" /* $Id: scanner.re,v 1.37 2006/02/25 12:41:41 helly Exp $ */ diff --git a/re2c/test/scanner.s.c b/re2c/test/scanner.s.c index f0a3a353..4745767f 100644 --- a/re2c/test/scanner.s.c +++ b/re2c/test/scanner.s.c @@ -1,4 +1,4 @@ -re2c: warning: empty rule at line 300 [-Wempty-rule] +re2c: warning: rule matches empty string at line 300 [-Wmatch-empty-string] /* Generated by re2c */ #line 1 "scanner.s.re" /* Id: scanner.re,v 1.37 2006/02/25 12:41:41 helly Exp */ diff --git a/re2c/test/scanner_re2c.bi.c b/re2c/test/scanner_re2c.bi.c index 02c1a394..ca19a0df 100644 --- a/re2c/test/scanner_re2c.bi.c +++ b/re2c/test/scanner_re2c.bi.c @@ -1,4 +1,4 @@ -re2c: warning: empty rule at line 608 [-Wempty-rule] +re2c: warning: rule matches empty string at line 608 [-Wmatch-empty-string] /* Generated by re2c */ /* $Id$ */ #include diff --git a/re2c/test/scanner_re2c_default.D.c b/re2c/test/scanner_re2c_default.D.c index 24248791..10f47844 100644 --- a/re2c/test/scanner_re2c_default.D.c +++ b/re2c/test/scanner_re2c_default.D.c @@ -1,4 +1,4 @@ -re2c: warning: empty rule at line 610 [-Wempty-rule] +re2c: warning: rule matches empty string at line 610 [-Wmatch-empty-string] /* Generated by re2c */ digraph re2c { diff --git a/re2c/test/scanner_re2c_default.bi.c b/re2c/test/scanner_re2c_default.bi.c index d80fa048..bd201b93 100644 --- a/re2c/test/scanner_re2c_default.bi.c +++ b/re2c/test/scanner_re2c_default.bi.c @@ -1,4 +1,4 @@ -re2c: warning: empty rule at line 610 [-Wempty-rule] +re2c: warning: rule matches empty string at line 610 [-Wmatch-empty-string] /* Generated by re2c */ /* $Id$ */ #include diff --git a/re2c/test/yyaccept_missing.bci.c b/re2c/test/yyaccept_missing.bci.c index 5c396636..e254b142 100644 --- a/re2c/test/yyaccept_missing.bci.c +++ b/re2c/test/yyaccept_missing.bci.c @@ -1,4 +1,4 @@ -re2c: warning: empty rule at line 44 [-Wempty-rule] +re2c: warning: rule matches empty string at line 44 [-Wmatch-empty-string] /* Generated by re2c */ #include #include -- 2.40.0