From: Ulya Trofimovich Date: Wed, 5 Oct 2016 21:38:46 +0000 (+0100) Subject: Renamed configuration 'tags:expr' to 'tags:expression'. X-Git-Tag: 1.0~39^2~261 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1dccc6709768cbd41f19f98490218590f8d1a101;p=re2c Renamed configuration 'tags:expr' to 'tags:expression'. --- diff --git a/re2c/bootstrap/src/parse/lex_conf.cc b/re2c/bootstrap/src/parse/lex_conf.cc index 5908b28e..45c5ed42 100644 --- a/re2c/bootstrap/src/parse/lex_conf.cc +++ b/re2c/bootstrap/src/parse/lex_conf.cc @@ -1,4 +1,4 @@ -/* Generated by re2c 0.16 on Wed May 11 11:08:20 2016 */ +/* Generated by re2c 0.16 on Wed Oct 5 22:22:36 2016 */ #line 1 "../src/parse/lex_conf.re" #include "src/util/c99_stdint.h" #include @@ -186,35 +186,35 @@ yy14: goto yy188; } } else { - goto yy280; + goto yy279; } } else { if (yyaccept <= 16) { if (yyaccept == 15) { - goto yy354; + goto yy355; } else { - goto yy429; + goto yy431; } } else { - goto yy533; + goto yy537; } } } else { if (yyaccept <= 20) { if (yyaccept <= 19) { if (yyaccept == 18) { - goto yy585; + goto yy591; } else { - goto yy624; + goto yy630; } } else { - goto yy630; + goto yy636; } } else { if (yyaccept == 21) { - goto yy707; + goto yy713; } else { - goto yy710; + goto yy716; } } } @@ -906,11 +906,11 @@ yy175: goto yy14; yy176: yych = (unsigned char)*++cur; - if (yych == 'f') goto yy225; + if (yych == 'f') goto yy224; goto yy14; yy177: yych = (unsigned char)*++cur; - if (yych == ':') goto yy226; + if (yych == ':') goto yy225; goto yy14; yy178: ++cur; @@ -919,140 +919,140 @@ yy178: #line 920 "src/parse/lex_conf.cc" yy180: yych = (unsigned char)*++cur; - if (yych == 'v') goto yy227; + if (yych == 'v') goto yy226; goto yy14; yy181: yych = (unsigned char)*++cur; - if (yych == 't') goto yy228; + if (yych == 't') goto yy227; goto yy14; yy182: yych = (unsigned char)*++cur; - if (yych == 'h') goto yy230; + if (yych == 'h') goto yy229; goto yy14; yy183: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy231; + if (yych == 'n') goto yy230; goto yy14; yy184: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy232; + if (yych == 'a') goto yy231; goto yy14; yy185: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy233; + if (yych == 'e') goto yy232; goto yy14; yy186: yych = (unsigned char)*++cur; - if (yych == 'd') goto yy234; + if (yych == 'd') goto yy233; goto yy14; yy187: yyaccept = 13; yych = (unsigned char)*(ptr = ++cur); - if (yych == '@') goto yy235; + if (yych == '@') goto yy234; yy188: #line 86 "../src/parse/lex_conf.re" { opts.set_condGoto (lex_conf_string ()); return; } #line 956 "src/parse/lex_conf.cc" yy189: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy236; + if (yych == 'r') goto yy235; goto yy14; yy190: yych = (unsigned char)*++cur; - if (yych == 'x') goto yy237; + if (yych == 'x') goto yy236; goto yy14; yy191: yych = (unsigned char)*++cur; switch (yych) { - case 'B': goto yy239; - case 'C': goto yy240; - case 'D': goto yy241; - case 'F': goto yy242; - case 'G': goto yy243; - case 'L': goto yy244; - case 'M': goto yy245; - case 'P': goto yy246; - case 'R': goto yy247; - case 'S': goto yy248; - case 'T': goto yy249; + case 'B': goto yy238; + case 'C': goto yy239; + case 'D': goto yy240; + case 'F': goto yy241; + case 'G': goto yy242; + case 'L': goto yy243; + case 'M': goto yy244; + case 'P': goto yy245; + case 'R': goto yy246; + case 'S': goto yy247; + case 'T': goto yy248; default: goto yy14; } yy192: yych = (unsigned char)*++cur; - if (yych == '-') goto yy250; + if (yych == '-') goto yy249; goto yy14; yy193: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy251; + if (yych == 'e') goto yy250; goto yy14; yy194: yych = (unsigned char)*++cur; - if (yych == 'p') goto yy252; + if (yych == 'p') goto yy251; goto yy14; yy195: yych = (unsigned char)*++cur; - if (yych == 'u') goto yy253; + if (yych == 'u') goto yy252; goto yy14; yy196: yych = (unsigned char)*++cur; - if (yych == '-') goto yy254; + if (yych == '-') goto yy253; goto yy14; yy197: yych = (unsigned char)*++cur; goto yy106; yy198: yych = (unsigned char)*++cur; - if (yych == 't') goto yy255; + if (yych == 't') goto yy254; goto yy14; yy199: yych = (unsigned char)*++cur; - if (yych == 't') goto yy256; + if (yych == 't') goto yy255; goto yy14; yy200: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy257; + if (yych == 'o') goto yy256; goto yy14; yy201: yych = (unsigned char)*++cur; - if (yych == 'x') goto yy258; + if (yych == 'x') goto yy257; goto yy14; yy202: yych = (unsigned char)*++cur; - if (yych == 'u') goto yy259; + if (yych == 'u') goto yy258; goto yy14; yy203: yych = (unsigned char)*++cur; - if (yych == 't') goto yy260; + if (yych == 't') goto yy259; goto yy14; yy204: yych = (unsigned char)*++cur; if (yych <= 'f') { - if (yych == 'd') goto yy261; + if (yych == 'd') goto yy260; goto yy14; } else { - if (yych <= 'g') goto yy262; - if (yych == 'v') goto yy263; + if (yych <= 'g') goto yy261; + if (yych == 'v') goto yy262; goto yy14; } yy205: yych = (unsigned char)*++cur; - if (yych == 'p') goto yy264; + if (yych == 'p') goto yy263; goto yy14; yy206: yych = (unsigned char)*++cur; - if (yych == 's') goto yy265; + if (yych == 's') goto yy264; goto yy14; yy207: yych = (unsigned char)*++cur; - if (yych == 'l') goto yy266; + if (yych == 'l') goto yy265; goto yy14; yy208: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy267; + if (yych == 'r') goto yy266; goto yy14; yy209: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy268; + if (yych == 'r') goto yy267; goto yy14; yy210: yych = (unsigned char)*++cur; @@ -1060,112 +1060,111 @@ yy210: goto yy14; yy211: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy269; + if (yych == 'e') goto yy268; goto yy14; yy212: yych = (unsigned char)*++cur; - if (yych == 'c') goto yy270; + if (yych == 'c') goto yy269; goto yy14; yy213: yych = (unsigned char)*++cur; - if (yych == '-') goto yy271; + if (yych == '-') goto yy270; goto yy14; yy214: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy272; + if (yych == 'e') goto yy271; goto yy14; yy215: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy273; + if (yych == 'r') goto yy272; goto yy14; yy216: yych = (unsigned char)*++cur; - if (yych == 'p') goto yy274; + if (yych == 'p') goto yy273; goto yy14; yy217: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy276; + if (yych == 'i') goto yy275; goto yy14; yy218: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy277; + if (yych == 'e') goto yy276; goto yy14; yy219: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy278; + if (yych == 'i') goto yy277; goto yy14; yy220: yych = (unsigned char)*++cur; - if (yych == 'l') goto yy279; + if (yych == 'l') goto yy278; goto yy14; yy221: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy281; + if (yych == 'r') goto yy280; goto yy14; yy222: yych = (unsigned char)*++cur; - if (yych == 't') goto yy282; + if (yych == 't') goto yy281; goto yy14; yy223: - ++cur; -#line 131 "../src/parse/lex_conf.re" - { opts.set_tags_expr (lex_conf_string ()); return; } -#line 1114 "src/parse/lex_conf.cc" -yy225: + yych = (unsigned char)*++cur; + if (yych == 'e') goto yy282; + goto yy14; +yy224: yych = (unsigned char)*++cur; if (yych == 'i') goto yy283; goto yy14; -yy226: +yy225: yych = (unsigned char)*++cur; if (yych == 'y') goto yy284; goto yy14; -yy227: +yy226: yych = (unsigned char)*++cur; if (yych == 'e') goto yy285; goto yy14; -yy228: +yy227: ++cur; #line 150 "../src/parse/lex_conf.re" { opts.set_bEmitYYCh (lex_conf_bool()); return; } -#line 1131 "src/parse/lex_conf.cc" -yy230: +#line 1130 "src/parse/lex_conf.cc" +yy229: yych = (unsigned char)*++cur; if (yych == 'e') goto yy286; goto yy14; -yy231: +yy230: yych = (unsigned char)*++cur; if (yych == 'a') goto yy287; goto yy14; -yy232: +yy231: yych = (unsigned char)*++cur; if (yych == 'r') goto yy288; goto yy14; -yy233: +yy232: yych = (unsigned char)*++cur; if (yych == 's') goto yy289; goto yy14; -yy234: +yy233: yych = (unsigned char)*++cur; if (yych == 'e') goto yy290; goto yy14; -yy235: +yy234: yych = (unsigned char)*++cur; if (yych == 'c') goto yy291; goto yy14; -yy236: +yy235: yych = (unsigned char)*++cur; if (yych == 'e') goto yy292; goto yy14; -yy237: +yy236: ++cur; #line 82 "../src/parse/lex_conf.re" { opts.set_condPrefix (lex_conf_string ()); return; } -#line 1164 "src/parse/lex_conf.cc" -yy239: +#line 1163 "src/parse/lex_conf.cc" +yy238: yych = (unsigned char)*++cur; if (yych == 'A') goto yy293; goto yy14; -yy240: +yy239: yych = (unsigned char)*++cur; if (yych <= 'S') { if (yych == 'O') goto yy294; @@ -1175,143 +1174,143 @@ yy240: if (yych <= 'U') goto yy296; goto yy14; } -yy241: +yy240: yych = (unsigned char)*++cur; if (yych == 'E') goto yy297; if (yych == 'I') goto yy298; goto yy14; -yy242: +yy241: yych = (unsigned char)*++cur; if (yych == 'I') goto yy299; goto yy14; -yy243: +yy242: yych = (unsigned char)*++cur; if (yych == 'E') goto yy300; goto yy14; -yy244: +yy243: yych = (unsigned char)*++cur; if (yych == 'E') goto yy301; if (yych == 'I') goto yy302; goto yy14; -yy245: +yy244: yych = (unsigned char)*++cur; if (yych == 'A') goto yy303; goto yy14; -yy246: +yy245: yych = (unsigned char)*++cur; if (yych == 'E') goto yy304; goto yy14; -yy247: +yy246: yych = (unsigned char)*++cur; if (yych == 'E') goto yy305; goto yy14; -yy248: +yy247: yych = (unsigned char)*++cur; if (yych == 'E') goto yy306; if (yych == 'K') goto yy307; goto yy14; -yy249: +yy248: yych = (unsigned char)*++cur; if (yych == 'A') goto yy308; goto yy14; -yy250: +yy249: yych = (unsigned char)*++cur; if (yych == 'v') goto yy309; goto yy14; -yy251: +yy250: yych = (unsigned char)*++cur; if (yych == '-') goto yy310; goto yy14; -yy252: +yy251: yych = (unsigned char)*++cur; if (yych == 'u') goto yy311; goto yy14; -yy253: +yy252: yych = (unsigned char)*++cur; if (yych == 'g') goto yy312; goto yy14; -yy254: +yy253: yych = (unsigned char)*++cur; if (yych == 'm') goto yy313; goto yy14; -yy255: +yy254: yych = (unsigned char)*++cur; if (yych == '-') goto yy314; goto yy14; -yy256: +yy255: yych = (unsigned char)*++cur; if (yych == 'y') goto yy315; goto yy14; -yy257: +yy256: yych = (unsigned char)*++cur; if (yych == 'd') goto yy316; goto yy14; -yy258: +yy257: yych = (unsigned char)*++cur; if (yych == '-') goto yy317; goto yy14; -yy259: +yy258: yych = (unsigned char)*++cur; if (yych == 't') goto yy318; goto yy14; -yy260: +yy259: yych = (unsigned char)*++cur; if (yych == 'e') goto yy320; goto yy14; -yy261: +yy260: yych = (unsigned char)*++cur; if (yych == 'e') goto yy321; goto yy14; -yy262: +yy261: yych = (unsigned char)*++cur; if (yych == 'e') goto yy322; goto yy14; -yy263: +yy262: yych = (unsigned char)*++cur; if (yych == 'e') goto yy323; goto yy14; -yy264: +yy263: yych = (unsigned char)*++cur; if (yych == 'u') goto yy324; goto yy14; -yy265: +yy264: yych = (unsigned char)*++cur; if (yych == 'a') goto yy325; goto yy14; -yy266: +yy265: yych = (unsigned char)*++cur; if (yych == 'e') goto yy326; goto yy14; -yy267: +yy266: yych = (unsigned char)*++cur; if (yych == 't') goto yy327; goto yy14; -yy268: +yy267: yych = (unsigned char)*++cur; if (yych == 'a') goto yy328; goto yy14; -yy269: +yy268: yych = (unsigned char)*++cur; if (yych == '-') goto yy329; goto yy14; -yy270: +yy269: yych = (unsigned char)*++cur; if (yych == 'o') goto yy330; goto yy14; -yy271: +yy270: yych = (unsigned char)*++cur; if (yych == '1') goto yy331; if (yych == '8') goto yy89; goto yy14; -yy272: +yy271: yych = (unsigned char)*++cur; if (yych == '-') goto yy332; goto yy14; -yy273: +yy272: yych = (unsigned char)*++cur; if (yych == 'i') goto yy333; goto yy14; -yy274: +yy273: ++cur; #line 135 "../src/parse/lex_conf.re" { @@ -1323,20 +1322,20 @@ yy274: opts.set_topIndent (static_cast (n)); return; } -#line 1327 "src/parse/lex_conf.cc" -yy276: +#line 1326 "src/parse/lex_conf.cc" +yy275: yych = (unsigned char)*++cur; if (yych == 'l') goto yy334; goto yy14; -yy277: +yy276: yych = (unsigned char)*++cur; if (yych == 'x') goto yy335; goto yy14; -yy278: +yy277: yych = (unsigned char)*++cur; if (yych == 'x') goto yy336; goto yy14; -yy279: +yy278: yyaccept = 14; yych = (unsigned char)*(ptr = ++cur); if (yych <= 0x1F) { @@ -1354,208 +1353,212 @@ yy279: goto yy340; } } -yy280: +yy279: #line 163 "../src/parse/lex_conf.re" { out.block().user_start_label = lex_conf_string(); return; } -#line 1361 "src/parse/lex_conf.cc" -yy281: +#line 1360 "src/parse/lex_conf.cc" +yy280: yych = (unsigned char)*++cur; if (yych == 't') goto yy342; goto yy14; -yy282: +yy281: yych = (unsigned char)*++cur; if (yych == 'l') goto yy344; goto yy14; +yy282: + yych = (unsigned char)*++cur; + if (yych == 's') goto yy345; + goto yy14; yy283: yych = (unsigned char)*++cur; - if (yych == 'x') goto yy345; + if (yych == 'x') goto yy346; goto yy14; yy284: yych = (unsigned char)*++cur; - if (yych == 'y') goto yy347; + if (yych == 'y') goto yy348; goto yy14; yy285: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy348; + if (yych == 'r') goto yy349; goto yy14; yy286: yych = (unsigned char)*++cur; - if (yych == 'c') goto yy349; + if (yych == 'c') goto yy350; goto yy14; yy287: yych = (unsigned char)*++cur; - if (yych == 'b') goto yy350; + if (yych == 'b') goto yy351; goto yy14; yy288: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy351; + if (yych == 'a') goto yy352; goto yy14; yy289: yych = (unsigned char)*++cur; - if (yych == 'h') goto yy352; + if (yych == 'h') goto yy353; goto yy14; yy290: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy353; + if (yych == 'r') goto yy354; goto yy14; yy291: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy355; + if (yych == 'o') goto yy356; goto yy14; yy292: yych = (unsigned char)*++cur; - if (yych == 'f') goto yy356; + if (yych == 'f') goto yy357; goto yy14; yy293: yych = (unsigned char)*++cur; - if (yych == 'C') goto yy357; + if (yych == 'C') goto yy358; goto yy14; yy294: yych = (unsigned char)*++cur; - if (yych == 'N') goto yy358; + if (yych == 'N') goto yy359; goto yy14; yy295: yych = (unsigned char)*++cur; if (yych <= 'W') goto yy14; - if (yych <= 'X') goto yy359; - if (yych <= 'Y') goto yy360; + if (yych <= 'X') goto yy360; + if (yych <= 'Y') goto yy361; goto yy14; yy296: yych = (unsigned char)*++cur; - if (yych == 'R') goto yy361; + if (yych == 'R') goto yy362; goto yy14; yy297: yych = (unsigned char)*++cur; - if (yych == 'B') goto yy362; + if (yych == 'B') goto yy363; goto yy14; yy298: yych = (unsigned char)*++cur; - if (yych == 'S') goto yy363; + if (yych == 'S') goto yy364; goto yy14; yy299: yych = (unsigned char)*++cur; - if (yych == 'L') goto yy364; + if (yych == 'L') goto yy365; goto yy14; yy300: yych = (unsigned char)*++cur; - if (yych == 'T') goto yy365; + if (yych == 'T') goto yy366; goto yy14; yy301: yych = (unsigned char)*++cur; - if (yych == 'S') goto yy366; + if (yych == 'S') goto yy367; goto yy14; yy302: yych = (unsigned char)*++cur; - if (yych == 'M') goto yy367; + if (yych == 'M') goto yy368; goto yy14; yy303: yych = (unsigned char)*++cur; - if (yych == 'R') goto yy368; + if (yych == 'R') goto yy369; goto yy14; yy304: yych = (unsigned char)*++cur; - if (yych == 'E') goto yy369; + if (yych == 'E') goto yy370; goto yy14; yy305: yych = (unsigned char)*++cur; - if (yych == 'S') goto yy370; + if (yych == 'S') goto yy371; goto yy14; yy306: yych = (unsigned char)*++cur; - if (yych == 'T') goto yy371; + if (yych == 'T') goto yy372; goto yy14; yy307: yych = (unsigned char)*++cur; - if (yych == 'I') goto yy372; + if (yych == 'I') goto yy373; goto yy14; yy308: yych = (unsigned char)*++cur; - if (yych == 'G') goto yy373; + if (yych == 'G') goto yy374; goto yy14; yy309: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy375; + if (yych == 'e') goto yy376; goto yy14; yy310: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy376; + if (yych == 'i') goto yy377; goto yy14; yy311: yych = (unsigned char)*++cur; - if (yych == 't') goto yy377; + if (yych == 't') goto yy378; goto yy14; yy312: yych = (unsigned char)*++cur; - if (yych == '-') goto yy378; + if (yych == '-') goto yy379; goto yy14; yy313: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy379; + if (yych == 'i') goto yy380; goto yy14; yy314: yych = (unsigned char)*++cur; - if (yych == 'd') goto yy380; + if (yych == 'd') goto yy381; goto yy14; yy315: yych = (unsigned char)*++cur; - if (yych == '-') goto yy381; + if (yych == '-') goto yy382; goto yy14; yy316: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy382; + if (yych == 'i') goto yy383; goto yy14; yy317: yych = (unsigned char)*++cur; - if (yych == 's') goto yy383; + if (yych == 's') goto yy384; goto yy14; yy318: ++cur; #line 72 "../src/parse/lex_conf.re" { lex_conf_input(); return; } -#line 1516 "src/parse/lex_conf.cc" +#line 1519 "src/parse/lex_conf.cc" yy320: yych = (unsigned char)*++cur; - if (yych == 'd') goto yy384; + if (yych == 'd') goto yy385; goto yy14; yy321: yych = (unsigned char)*++cur; - if (yych == 'b') goto yy385; + if (yych == 'b') goto yy386; goto yy14; yy322: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy386; + if (yych == 'n') goto yy387; goto yy14; yy323: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy387; + if (yych == 'r') goto yy388; goto yy14; yy324: yych = (unsigned char)*++cur; - if (yych == 't') goto yy388; + if (yych == 't') goto yy389; goto yy14; yy325: yych = (unsigned char)*++cur; - if (yych == 'b') goto yy389; + if (yych == 'b') goto yy390; goto yy14; yy326: yych = (unsigned char)*++cur; - if (yych == 't') goto yy390; + if (yych == 't') goto yy391; goto yy14; yy327: yych = (unsigned char)*++cur; - if (yych == '-') goto yy391; + if (yych == '-') goto yy392; goto yy14; yy328: yych = (unsigned char)*++cur; - if (yych == 'b') goto yy392; + if (yych == 'b') goto yy393; goto yy14; yy329: yych = (unsigned char)*++cur; - if (yych == 'h') goto yy393; + if (yych == 'h') goto yy394; goto yy14; yy330: yych = (unsigned char)*++cur; - if (yych == 'd') goto yy394; + if (yych == 'd') goto yy395; goto yy14; yy331: yych = (unsigned char)*++cur; @@ -1563,25 +1566,25 @@ yy331: goto yy14; yy332: yych = (unsigned char)*++cur; - if (yych == 'c') goto yy395; + if (yych == 'c') goto yy396; goto yy14; yy333: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy396; + if (yych == 'n') goto yy397; goto yy14; yy334: yych = (unsigned char)*++cur; - if (yych == 'l') goto yy397; + if (yych == 'l') goto yy398; goto yy14; yy335: yych = (unsigned char)*++cur; - if (yych == 't') goto yy398; + if (yych == 't') goto yy399; goto yy14; yy336: ++cur; #line 159 "../src/parse/lex_conf.re" { opts.set_labelPrefix (lex_conf_string ()); return; } -#line 1585 "src/parse/lex_conf.cc" +#line 1588 "src/parse/lex_conf.cc" yy338: ++cur; if (lim <= cur) fill(1); @@ -1604,11 +1607,11 @@ yy340: } } else { if (yych <= '/') { - if (yych <= '-') goto yy400; + if (yych <= '-') goto yy401; goto yy14; } else { - if (yych <= '0') goto yy401; - if (yych <= '9') goto yy403; + if (yych <= '0') goto yy402; + if (yych <= '9') goto yy404; goto yy14; } } @@ -1616,689 +1619,689 @@ yy342: ++cur; #line 97 "../src/parse/lex_conf.re" { opts.set_bUseStateAbort (lex_conf_bool()); return; } -#line 1620 "src/parse/lex_conf.cc" +#line 1623 "src/parse/lex_conf.cc" yy344: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy405; + if (yych == 'a') goto yy406; goto yy14; yy345: + yych = (unsigned char)*++cur; + if (yych == 's') goto yy407; + goto yy14; +yy346: ++cur; #line 130 "../src/parse/lex_conf.re" - { opts.set_tags_prefix(lex_conf_string ()); return; } -#line 1629 "src/parse/lex_conf.cc" -yy347: + { opts.set_tags_prefix (lex_conf_string ()); return; } +#line 1636 "src/parse/lex_conf.cc" +yy348: yych = (unsigned char)*++cur; if (yych <= 'c') { if (yych <= '`') goto yy14; - if (yych <= 'a') goto yy406; - if (yych <= 'b') goto yy407; - goto yy408; + if (yych <= 'a') goto yy408; + if (yych <= 'b') goto yy409; + goto yy410; } else { if (yych <= 'r') goto yy14; - if (yych <= 's') goto yy409; - if (yych <= 't') goto yy410; + if (yych <= 's') goto yy411; + if (yych <= 't') goto yy412; goto yy14; } -yy348: - yych = (unsigned char)*++cur; - if (yych == 's') goto yy411; - goto yy14; yy349: yych = (unsigned char)*++cur; - if (yych == 'k') goto yy412; + if (yych == 's') goto yy413; goto yy14; yy350: yych = (unsigned char)*++cur; - if (yych == 'l') goto yy414; + if (yych == 'k') goto yy414; goto yy14; yy351: yych = (unsigned char)*++cur; - if (yych == 'm') goto yy415; + if (yych == 'l') goto yy416; goto yy14; yy352: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy416; + if (yych == 'm') goto yy417; goto yy14; yy353: + yych = (unsigned char)*++cur; + if (yych == 'o') goto yy418; + goto yy14; +yy354: yyaccept = 15; yych = (unsigned char)*(ptr = ++cur); - if (yych == '@') goto yy417; -yy354: + if (yych == '@') goto yy419; +yy355: #line 84 "../src/parse/lex_conf.re" { opts.set_condDivider (lex_conf_string ()); return; } -#line 1670 "src/parse/lex_conf.cc" -yy355: - yych = (unsigned char)*++cur; - if (yych == 'n') goto yy418; - goto yy14; +#line 1677 "src/parse/lex_conf.cc" yy356: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy419; + if (yych == 'n') goto yy420; goto yy14; yy357: yych = (unsigned char)*++cur; - if (yych == 'K') goto yy420; + if (yych == 'i') goto yy421; goto yy14; yy358: yych = (unsigned char)*++cur; - if (yych == 'D') goto yy421; + if (yych == 'K') goto yy422; goto yy14; yy359: yych = (unsigned char)*++cur; - if (yych == 'M') goto yy422; + if (yych == 'D') goto yy423; goto yy14; yy360: yych = (unsigned char)*++cur; - if (yych == 'P') goto yy423; + if (yych == 'M') goto yy424; goto yy14; yy361: yych = (unsigned char)*++cur; - if (yych == 'S') goto yy424; + if (yych == 'P') goto yy425; goto yy14; yy362: yych = (unsigned char)*++cur; - if (yych == 'U') goto yy425; + if (yych == 'S') goto yy426; goto yy14; yy363: yych = (unsigned char)*++cur; - if (yych == 'T') goto yy426; + if (yych == 'U') goto yy427; goto yy14; yy364: yych = (unsigned char)*++cur; - if (yych == 'L') goto yy428; + if (yych == 'T') goto yy428; goto yy14; yy365: yych = (unsigned char)*++cur; - if (yych == 'C') goto yy430; - if (yych == 'S') goto yy431; + if (yych == 'L') goto yy430; goto yy14; yy366: yych = (unsigned char)*++cur; - if (yych == 'S') goto yy432; + if (yych == 'C') goto yy432; + if (yych == 'S') goto yy433; goto yy14; yy367: yych = (unsigned char)*++cur; - if (yych == 'I') goto yy433; + if (yych == 'S') goto yy434; goto yy14; yy368: yych = (unsigned char)*++cur; - if (yych == 'K') goto yy434; + if (yych == 'I') goto yy435; goto yy14; yy369: yych = (unsigned char)*++cur; - if (yych == 'K') goto yy435; + if (yych == 'K') goto yy436; goto yy14; yy370: yych = (unsigned char)*++cur; - if (yych == 'T') goto yy437; + if (yych == 'K') goto yy437; goto yy14; yy371: yych = (unsigned char)*++cur; - if (yych == 'C') goto yy438; - if (yych == 'S') goto yy439; + if (yych == 'T') goto yy439; goto yy14; yy372: yych = (unsigned char)*++cur; - if (yych == 'P') goto yy440; + if (yych == 'C') goto yy440; + if (yych == 'S') goto yy441; goto yy14; yy373: + yych = (unsigned char)*++cur; + if (yych == 'P') goto yy442; + goto yy14; +yy374: ++cur; #line 127 "../src/parse/lex_conf.re" { opts.set_tags_yytag (lex_conf_string ()); return; } -#line 1749 "src/parse/lex_conf.cc" -yy375: - yych = (unsigned char)*++cur; - if (yych == 'c') goto yy442; - goto yy14; +#line 1756 "src/parse/lex_conf.cc" yy376: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy443; + if (yych == 'c') goto yy444; goto yy14; yy377: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy444; + if (yych == 'n') goto yy445; goto yy14; yy378: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy445; + if (yych == 'e') goto yy446; goto yy14; yy379: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy446; + if (yych == 'o') goto yy447; goto yy14; yy380: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy447; + if (yych == 'n') goto yy448; goto yy14; yy381: yych = (unsigned char)*++cur; - if (yych == 'c') goto yy448; + if (yych == 'o') goto yy449; goto yy14; yy382: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy449; + if (yych == 'c') goto yy450; goto yy14; yy383: yych = (unsigned char)*++cur; - if (yych == 'y') goto yy450; + if (yych == 'n') goto yy451; goto yy14; yy384: yych = (unsigned char)*++cur; - if (yych == '-') goto yy451; + if (yych == 'y') goto yy452; goto yy14; yy385: yych = (unsigned char)*++cur; - if (yych == 'u') goto yy452; + if (yych == '-') goto yy453; goto yy14; yy386: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy453; + if (yych == 'u') goto yy454; goto yy14; yy387: yych = (unsigned char)*++cur; - if (yych == 's') goto yy454; + if (yych == 'e') goto yy455; goto yy14; yy388: yych = (unsigned char)*++cur; - goto yy115; + if (yych == 's') goto yy456; + goto yy14; yy389: yych = (unsigned char)*++cur; - if (yych == 'l') goto yy455; - goto yy14; + goto yy115; yy390: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy456; + if (yych == 'l') goto yy457; goto yy14; yy391: yych = (unsigned char)*++cur; - if (yych == 'c') goto yy457; + if (yych == 'o') goto yy458; goto yy14; yy392: yych = (unsigned char)*++cur; - if (yych == 'l') goto yy458; + if (yych == 'c') goto yy459; goto yy14; yy393: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy459; + if (yych == 'l') goto yy460; goto yy14; yy394: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy460; + if (yych == 'e') goto yy461; goto yy14; yy395: yych = (unsigned char)*++cur; - if (yych == 'h') goto yy461; + if (yych == 'e') goto yy462; goto yy14; yy396: yych = (unsigned char)*++cur; - if (yych == 'g') goto yy462; + if (yych == 'h') goto yy463; goto yy14; yy397: yych = (unsigned char)*++cur; - if (yych == 'L') goto yy464; + if (yych == 'g') goto yy464; goto yy14; yy398: + yych = (unsigned char)*++cur; + if (yych == 'L') goto yy466; + goto yy14; +yy399: ++cur; #line 96 "../src/parse/lex_conf.re" { opts.set_yynext (lex_conf_string ()); return; } -#line 1845 "src/parse/lex_conf.cc" -yy400: +#line 1852 "src/parse/lex_conf.cc" +yy401: yych = (unsigned char)*++cur; if (yych <= '0') goto yy14; - if (yych <= '9') goto yy403; + if (yych <= '9') goto yy404; goto yy14; -yy401: - ++cur; yy402: + ++cur; +yy403: cur = ctx; #line 162 "../src/parse/lex_conf.re" { out.block().force_start_label = lex_conf_bool(); return; } -#line 1857 "src/parse/lex_conf.cc" -yy403: +#line 1864 "src/parse/lex_conf.cc" +yy404: ++cur; if (lim <= cur) fill(1); yych = (unsigned char)*cur; if (yybm[0+yych] & 128) { - goto yy403; + goto yy404; } - goto yy402; -yy405: - yych = (unsigned char)*++cur; - if (yych == 'b') goto yy465; - goto yy14; + goto yy403; yy406: yych = (unsigned char)*++cur; - if (yych == 'c') goto yy466; + if (yych == 'b') goto yy467; goto yy14; yy407: yych = (unsigned char)*++cur; - if (yych == 'm') goto yy467; + if (yych == 'i') goto yy468; goto yy14; yy408: yych = (unsigned char)*++cur; - if (yych == 'h') goto yy469; - if (yych == 't') goto yy471; + if (yych == 'c') goto yy469; goto yy14; yy409: yych = (unsigned char)*++cur; - if (yych == 't') goto yy472; + if (yych == 'm') goto yy470; goto yy14; yy410: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy473; + if (yych == 'h') goto yy472; + if (yych == 't') goto yy474; goto yy14; yy411: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy474; + if (yych == 't') goto yy475; goto yy14; yy412: - ++cur; -#line 157 "../src/parse/lex_conf.re" - { opts.set_fill_check (lex_conf_bool()); return; } -#line 1899 "src/parse/lex_conf.cc" -yy414: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy475; + if (yych == 'a') goto yy476; goto yy14; -yy415: +yy413: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy477; + if (yych == 'i') goto yy477; goto yy14; +yy414: + ++cur; +#line 157 "../src/parse/lex_conf.re" + { opts.set_fill_check (lex_conf_bool()); return; } +#line 1910 "src/parse/lex_conf.cc" yy416: yych = (unsigned char)*++cur; - if (yych == 'l') goto yy478; + if (yych == 'e') goto yy478; goto yy14; yy417: yych = (unsigned char)*++cur; - if (yych == 'c') goto yy479; + if (yych == 'e') goto yy480; goto yy14; yy418: yych = (unsigned char)*++cur; - if (yych == 'd') goto yy480; + if (yych == 'l') goto yy481; goto yy14; yy419: yych = (unsigned char)*++cur; - if (yych == 'x') goto yy482; + if (yych == 'c') goto yy482; goto yy14; yy420: yych = (unsigned char)*++cur; - if (yych == 'U') goto yy484; + if (yych == 'd') goto yy483; goto yy14; yy421: yych = (unsigned char)*++cur; - if (yych == 'T') goto yy485; + if (yych == 'x') goto yy485; goto yy14; yy422: yych = (unsigned char)*++cur; - if (yych == 'A') goto yy486; + if (yych == 'U') goto yy487; goto yy14; yy423: yych = (unsigned char)*++cur; - if (yych == 'E') goto yy487; + if (yych == 'T') goto yy488; goto yy14; yy424: yych = (unsigned char)*++cur; - if (yych == 'O') goto yy489; + if (yych == 'A') goto yy489; goto yy14; yy425: yych = (unsigned char)*++cur; - if (yych == 'G') goto yy490; + if (yych == 'E') goto yy490; goto yy14; yy426: + yych = (unsigned char)*++cur; + if (yych == 'O') goto yy492; + goto yy14; +yy427: + yych = (unsigned char)*++cur; + if (yych == 'G') goto yy493; + goto yy14; +yy428: ++cur; #line 128 "../src/parse/lex_conf.re" { opts.set_tags_yydist (lex_conf_string ()); return; } -#line 1952 "src/parse/lex_conf.cc" -yy428: +#line 1963 "src/parse/lex_conf.cc" +yy430: yyaccept = 16; yych = (unsigned char)*(ptr = ++cur); - if (yych == ':') goto yy492; - if (yych == '@') goto yy493; -yy429: + if (yych == ':') goto yy495; + if (yych == '@') goto yy496; +yy431: #line 152 "../src/parse/lex_conf.re" { opts.set_fill (lex_conf_string ()); return; } -#line 1961 "src/parse/lex_conf.cc" -yy430: - yych = (unsigned char)*++cur; - if (yych == 'O') goto yy494; - goto yy14; -yy431: - yych = (unsigned char)*++cur; - if (yych == 'T') goto yy495; - goto yy14; +#line 1972 "src/parse/lex_conf.cc" yy432: yych = (unsigned char)*++cur; - if (yych == 'T') goto yy496; + if (yych == 'O') goto yy497; goto yy14; yy433: yych = (unsigned char)*++cur; - if (yych == 'T') goto yy497; + if (yych == 'T') goto yy498; goto yy14; yy434: yych = (unsigned char)*++cur; - if (yych == 'E') goto yy499; + if (yych == 'T') goto yy499; goto yy14; yy435: - ++cur; -#line 120 "../src/parse/lex_conf.re" - { opts.set_yypeek (lex_conf_string ()); return; } -#line 1986 "src/parse/lex_conf.cc" -yy437: yych = (unsigned char)*++cur; - if (yych == 'O') goto yy500; + if (yych == 'T') goto yy500; goto yy14; -yy438: +yy436: yych = (unsigned char)*++cur; - if (yych == 'O') goto yy501; + if (yych == 'E') goto yy502; goto yy14; +yy437: + ++cur; +#line 120 "../src/parse/lex_conf.re" + { opts.set_yypeek (lex_conf_string ()); return; } +#line 1997 "src/parse/lex_conf.cc" yy439: yych = (unsigned char)*++cur; - if (yych == 'T') goto yy502; + if (yych == 'O') goto yy503; goto yy14; yy440: - ++cur; -#line 121 "../src/parse/lex_conf.re" - { opts.set_yyskip (lex_conf_string ()); return; } -#line 2003 "src/parse/lex_conf.cc" -yy442: yych = (unsigned char)*++cur; - if (yych == 't') goto yy503; + if (yych == 'O') goto yy504; goto yy14; -yy443: +yy441: yych = (unsigned char)*++cur; - if (yych == 's') goto yy504; - if (yych == 'v') goto yy505; + if (yych == 'T') goto yy505; goto yy14; +yy442: + ++cur; +#line 121 "../src/parse/lex_conf.re" + { opts.set_yyskip (lex_conf_string ()); return; } +#line 2014 "src/parse/lex_conf.cc" yy444: yych = (unsigned char)*++cur; - if (yych == 'd') goto yy506; + if (yych == 't') goto yy506; goto yy14; yy445: yych = (unsigned char)*++cur; - if (yych == 'u') goto yy507; + if (yych == 's') goto yy507; + if (yych == 'v') goto yy508; goto yy14; yy446: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy508; + if (yych == 'd') goto yy509; goto yy14; yy447: yych = (unsigned char)*++cur; - if (yych == 't') goto yy91; + if (yych == 'u') goto yy510; goto yy14; yy448: yych = (unsigned char)*++cur; - if (yych == 'l') goto yy509; + if (yych == 'i') goto yy511; goto yy14; yy449: yych = (unsigned char)*++cur; - if (yych == 'g') goto yy510; + if (yych == 't') goto yy91; goto yy14; yy450: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy511; + if (yych == 'l') goto yy512; goto yy14; yy451: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy512; + if (yych == 'g') goto yy513; goto yy14; yy452: yych = (unsigned char)*++cur; - if (yych == 'g') goto yy513; + if (yych == 'n') goto yy514; goto yy14; yy453: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy514; + if (yych == 'i') goto yy515; goto yy14; yy454: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy515; + if (yych == 'g') goto yy516; goto yy14; yy455: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy516; + if (yych == 'r') goto yy517; goto yy14; yy456: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy95; + if (yych == 'i') goto yy518; goto yy14; yy457: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy517; + if (yych == 'e') goto yy519; goto yy14; yy458: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy518; + if (yych == 'n') goto yy95; goto yy14; yy459: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy519; + if (yych == 'o') goto yy520; goto yy14; yy460: yych = (unsigned char)*++cur; - goto yy123; + if (yych == 'e') goto yy521; + goto yy14; yy461: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy520; + if (yych == 'a') goto yy522; goto yy14; yy462: + yych = (unsigned char)*++cur; + goto yy123; +yy463: + yych = (unsigned char)*++cur; + if (yych == 'a') goto yy523; + goto yy14; +yy464: ++cur; #line 133 "../src/parse/lex_conf.re" { opts.set_indString (lex_conf_string ()); return; } -#line 2088 "src/parse/lex_conf.cc" -yy464: +#line 2099 "src/parse/lex_conf.cc" +yy466: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy521; + if (yych == 'a') goto yy524; goto yy14; -yy465: +yy467: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy522; + if (yych == 'e') goto yy525; goto yy14; -yy466: +yy468: yych = (unsigned char)*++cur; - if (yych == 'c') goto yy523; + if (yych == 'o') goto yy526; goto yy14; -yy467: +yy469: + yych = (unsigned char)*++cur; + if (yych == 'c') goto yy527; + goto yy14; +yy470: ++cur; #line 101 "../src/parse/lex_conf.re" { opts.set_yybm (lex_conf_string ()); return; } -#line 2105 "src/parse/lex_conf.cc" -yy469: +#line 2120 "src/parse/lex_conf.cc" +yy472: ++cur; #line 148 "../src/parse/lex_conf.re" { opts.set_yych (lex_conf_string ()); return; } -#line 2110 "src/parse/lex_conf.cc" -yy471: +#line 2125 "src/parse/lex_conf.cc" +yy474: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy524; + if (yych == 'a') goto yy528; goto yy14; -yy472: +yy475: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy525; + if (yych == 'a') goto yy529; goto yy14; -yy473: +yy476: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy526; + if (yych == 'r') goto yy530; goto yy14; -yy474: +yy477: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy527; + if (yych == 'o') goto yy531; goto yy14; -yy475: +yy478: ++cur; #line 153 "../src/parse/lex_conf.re" { opts.set_fill_use (lex_conf_bool()); return; } -#line 2131 "src/parse/lex_conf.cc" -yy477: +#line 2146 "src/parse/lex_conf.cc" +yy480: yych = (unsigned char)*++cur; - if (yych == 't') goto yy528; + if (yych == 't') goto yy532; goto yy14; -yy478: +yy481: yych = (unsigned char)*++cur; - if (yych == 'd') goto yy529; + if (yych == 'd') goto yy533; goto yy14; -yy479: +yy482: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy531; + if (yych == 'o') goto yy535; goto yy14; -yy480: +yy483: ++cur; #line 87 "../src/parse/lex_conf.re" { opts.set_condGotoParam (lex_conf_string ()); return; } -#line 2148 "src/parse/lex_conf.cc" -yy482: +#line 2163 "src/parse/lex_conf.cc" +yy485: ++cur; #line 83 "../src/parse/lex_conf.re" { opts.set_condEnumPrefix (lex_conf_string ()); return; } -#line 2153 "src/parse/lex_conf.cc" -yy484: +#line 2168 "src/parse/lex_conf.cc" +yy487: yych = (unsigned char)*++cur; - if (yych == 'P') goto yy532; + if (yych == 'P') goto yy536; goto yy14; -yy485: +yy488: yych = (unsigned char)*++cur; - if (yych == 'Y') goto yy534; + if (yych == 'Y') goto yy538; goto yy14; -yy486: +yy489: yych = (unsigned char)*++cur; - if (yych == 'R') goto yy535; + if (yych == 'R') goto yy539; goto yy14; -yy487: +yy490: ++cur; #line 147 "../src/parse/lex_conf.re" { opts.set_yyctype (lex_conf_string ()); return; } -#line 2170 "src/parse/lex_conf.cc" -yy489: +#line 2185 "src/parse/lex_conf.cc" +yy492: yych = (unsigned char)*++cur; - if (yych == 'R') goto yy536; + if (yych == 'R') goto yy540; goto yy14; -yy490: +yy493: ++cur; #line 145 "../src/parse/lex_conf.re" { opts.set_yydebug (lex_conf_string ()); return; } -#line 2179 "src/parse/lex_conf.cc" -yy492: - yych = (unsigned char)*++cur; - if (yych == 'n') goto yy538; - goto yy14; -yy493: - yych = (unsigned char)*++cur; - if (yych == 'l') goto yy539; - goto yy14; -yy494: - yych = (unsigned char)*++cur; - if (yych == 'N') goto yy540; - goto yy14; +#line 2194 "src/parse/lex_conf.cc" yy495: yych = (unsigned char)*++cur; - if (yych == 'A') goto yy541; + if (yych == 'n') goto yy542; goto yy14; yy496: yych = (unsigned char)*++cur; - if (yych == 'H') goto yy542; + if (yych == 'l') goto yy543; goto yy14; yy497: - ++cur; -#line 118 "../src/parse/lex_conf.re" - { opts.set_yylimit (lex_conf_string ()); return; } -#line 2204 "src/parse/lex_conf.cc" -yy499: yych = (unsigned char)*++cur; - if (yych == 'R') goto yy543; + if (yych == 'N') goto yy544; goto yy14; -yy500: +yy498: yych = (unsigned char)*++cur; - if (yych == 'R') goto yy545; + if (yych == 'A') goto yy545; goto yy14; -yy501: +yy499: yych = (unsigned char)*++cur; - if (yych == 'N') goto yy546; + if (yych == 'H') goto yy546; goto yy14; +yy500: + ++cur; +#line 118 "../src/parse/lex_conf.re" + { opts.set_yylimit (lex_conf_string ()); return; } +#line 2219 "src/parse/lex_conf.cc" yy502: yych = (unsigned char)*++cur; - if (yych == 'A') goto yy547; + if (yych == 'R') goto yy547; goto yy14; yy503: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy548; + if (yych == 'R') goto yy549; goto yy14; yy504: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy549; + if (yych == 'N') goto yy550; goto yy14; yy505: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy550; + if (yych == 'A') goto yy551; goto yy14; yy506: yych = (unsigned char)*++cur; - if (yych == '-') goto yy551; + if (yych == 'o') goto yy552; goto yy14; yy507: yych = (unsigned char)*++cur; - if (yych == 't') goto yy552; + if (yych == 'e') goto yy553; goto yy14; yy508: yych = (unsigned char)*++cur; - if (yych == 'm') goto yy553; + if (yych == 'e') goto yy554; goto yy14; yy509: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy554; + if (yych == '-') goto yy555; goto yy14; yy510: yych = (unsigned char)*++cur; - if (yych == '-') goto yy555; + if (yych == 't') goto yy556; goto yy14; yy511: yych = (unsigned char)*++cur; - if (yych == 't') goto yy556; + if (yych == 'm') goto yy557; goto yy14; yy512: yych = (unsigned char)*++cur; - if (yych == 'f') goto yy557; + if (yych == 'a') goto yy558; goto yy14; yy513: yych = (unsigned char)*++cur; - if (yych == '-') goto yy558; + if (yych == '-') goto yy559; goto yy14; yy514: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy559; + if (yych == 't') goto yy560; goto yy14; yy515: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy560; + if (yych == 'f') goto yy561; goto yy14; yy516: yych = (unsigned char)*++cur; - goto yy117; + if (yych == '-') goto yy562; + goto yy14; yy517: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy561; + if (yych == 'a') goto yy563; goto yy14; yy518: yych = (unsigned char)*++cur; - if (yych == '-') goto yy562; + if (yych == 'o') goto yy564; goto yy14; yy519: yych = (unsigned char)*++cur; - if (yych == 'd') goto yy563; - goto yy14; + goto yy117; yy520: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy564; + if (yych == 'n') goto yy565; goto yy14; yy521: yych = (unsigned char)*++cur; - if (yych == 'b') goto yy565; + if (yych == '-') goto yy566; goto yy14; yy522: yych = (unsigned char)*++cur; - if (yych == 'l') goto yy566; + if (yych == 'd') goto yy567; goto yy14; yy523: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy568; + if (yych == 'r') goto yy568; goto yy14; yy524: yych = (unsigned char)*++cur; @@ -2306,21 +2309,37 @@ yy524: goto yy14; yy525: yych = (unsigned char)*++cur; - if (yych == 'b') goto yy570; + if (yych == 'l') goto yy570; goto yy14; yy526: yych = (unsigned char)*++cur; - if (yych == 'g') goto yy571; + if (yych == 'n') goto yy572; goto yy14; yy527: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy572; + if (yych == 'e') goto yy574; goto yy14; yy528: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy574; + if (yych == 'b') goto yy575; goto yy14; yy529: + yych = (unsigned char)*++cur; + if (yych == 'b') goto yy576; + goto yy14; +yy530: + yych = (unsigned char)*++cur; + if (yych == 'g') goto yy577; + goto yy14; +yy531: + yych = (unsigned char)*++cur; + if (yych == 'n') goto yy578; + goto yy14; +yy532: + yych = (unsigned char)*++cur; + if (yych == 'e') goto yy580; + goto yy14; +yy533: ++cur; #line 104 "../src/parse/lex_conf.re" { @@ -2332,246 +2351,227 @@ yy529: opts.set_cGotoThreshold (static_cast (n)); return; } -#line 2336 "src/parse/lex_conf.cc" -yy531: +#line 2355 "src/parse/lex_conf.cc" +yy535: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy575; + if (yych == 'n') goto yy581; goto yy14; -yy532: +yy536: yyaccept = 17; yych = (unsigned char)*(ptr = ++cur); - if (yych == 'C') goto yy576; -yy533: + if (yych == 'C') goto yy582; +yy537: #line 122 "../src/parse/lex_conf.re" { opts.set_yybackup (lex_conf_string ()); return; } -#line 2348 "src/parse/lex_conf.cc" -yy534: - yych = (unsigned char)*++cur; - if (yych == 'P') goto yy577; - goto yy14; -yy535: - yych = (unsigned char)*++cur; - if (yych == 'K') goto yy578; - goto yy14; -yy536: - ++cur; -#line 115 "../src/parse/lex_conf.re" - { opts.set_yycursor (lex_conf_string ()); return; } -#line 2361 "src/parse/lex_conf.cc" +#line 2367 "src/parse/lex_conf.cc" yy538: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy579; + if (yych == 'P') goto yy583; goto yy14; yy539: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy580; + if (yych == 'K') goto yy584; goto yy14; yy540: + ++cur; +#line 115 "../src/parse/lex_conf.re" + { opts.set_yycursor (lex_conf_string ()); return; } +#line 2380 "src/parse/lex_conf.cc" +yy542: yych = (unsigned char)*++cur; - if (yych == 'D') goto yy581; + if (yych == 'a') goto yy585; goto yy14; -yy541: +yy543: yych = (unsigned char)*++cur; - if (yych == 'T') goto yy582; + if (yych == 'e') goto yy586; goto yy14; -yy542: +yy544: yych = (unsigned char)*++cur; - if (yych == 'A') goto yy583; + if (yych == 'D') goto yy587; goto yy14; -yy543: - ++cur; -#line 116 "../src/parse/lex_conf.re" - { opts.set_yymarker (lex_conf_string ()); return; } -#line 2386 "src/parse/lex_conf.cc" yy545: yych = (unsigned char)*++cur; - if (yych == 'E') goto yy584; + if (yych == 'T') goto yy588; goto yy14; yy546: yych = (unsigned char)*++cur; - if (yych == 'D') goto yy586; + if (yych == 'A') goto yy589; goto yy14; yy547: - yych = (unsigned char)*++cur; - if (yych == 'T') goto yy587; - goto yy14; -yy548: - yych = (unsigned char)*++cur; - if (yych == 'r') goto yy588; - goto yy14; + ++cur; +#line 116 "../src/parse/lex_conf.re" + { opts.set_yymarker (lex_conf_string ()); return; } +#line 2405 "src/parse/lex_conf.cc" yy549: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy589; + if (yych == 'E') goto yy590; goto yy14; yy550: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy590; + if (yych == 'D') goto yy592; goto yy14; yy551: yych = (unsigned char)*++cur; - if (yych == 'g') goto yy591; + if (yych == 'T') goto yy593; goto yy14; yy552: yych = (unsigned char)*++cur; - if (yych == 'p') goto yy592; + if (yych == 'r') goto yy594; goto yy14; yy553: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy593; + if (yych == 'n') goto yy595; goto yy14; yy554: yych = (unsigned char)*++cur; - if (yych == 's') goto yy594; + if (yych == 'r') goto yy596; goto yy14; yy555: yych = (unsigned char)*++cur; - if (yych == 'p') goto yy595; + if (yych == 'g') goto yy597; goto yy14; yy556: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy596; + if (yych == 'p') goto yy598; goto yy14; yy557: yych = (unsigned char)*++cur; - if (yych == 's') goto yy597; + if (yych == 'i') goto yy599; goto yy14; yy558: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy598; + if (yych == 's') goto yy600; goto yy14; yy559: yych = (unsigned char)*++cur; - if (yych == 't') goto yy599; + if (yych == 'p') goto yy601; goto yy14; yy560: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy600; + if (yych == 'a') goto yy602; goto yy14; yy561: yych = (unsigned char)*++cur; - if (yych == 'd') goto yy602; + if (yych == 's') goto yy603; goto yy14; yy562: yych = (unsigned char)*++cur; - if (yych == 's') goto yy603; + if (yych == 'i') goto yy604; goto yy14; yy563: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy604; + if (yych == 't') goto yy605; goto yy14; yy564: yych = (unsigned char)*++cur; - if (yych == 's') goto yy605; + if (yych == 'n') goto yy606; goto yy14; yy565: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy606; + if (yych == 'd') goto yy608; goto yy14; yy566: - ++cur; -#line 98 "../src/parse/lex_conf.re" - { opts.set_bUseStateNext (lex_conf_bool()); return; } -#line 2475 "src/parse/lex_conf.cc" -yy568: yych = (unsigned char)*++cur; - if (yych == 'p') goto yy607; + if (yych == 's') goto yy609; goto yy14; -yy569: +yy567: yych = (unsigned char)*++cur; - if (yych == 'l') goto yy608; + if (yych == 'e') goto yy610; goto yy14; -yy570: +yy568: yych = (unsigned char)*++cur; - if (yych == 'l') goto yy609; + if (yych == 's') goto yy611; goto yy14; -yy571: +yy569: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy610; + if (yych == 'e') goto yy612; goto yy14; +yy570: + ++cur; +#line 98 "../src/parse/lex_conf.re" + { opts.set_bUseStateNext (lex_conf_bool()); return; } +#line 2494 "src/parse/lex_conf.cc" yy572: ++cur; -#line 149 "../src/parse/lex_conf.re" - { opts.set_yychConversion (lex_conf_bool()); return; } -#line 2496 "src/parse/lex_conf.cc" +#line 131 "../src/parse/lex_conf.re" + { opts.set_tags_expression(lex_conf_string ()); return; } +#line 2499 "src/parse/lex_conf.cc" yy574: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy611; + if (yych == 'p') goto yy613; goto yy14; yy575: yych = (unsigned char)*++cur; - if (yych == 'd') goto yy613; + if (yych == 'l') goto yy614; goto yy14; yy576: yych = (unsigned char)*++cur; - if (yych == 'T') goto yy615; + if (yych == 'l') goto yy615; goto yy14; yy577: yych = (unsigned char)*++cur; - if (yych == 'E') goto yy616; + if (yych == 'e') goto yy616; goto yy14; yy578: - yych = (unsigned char)*++cur; - if (yych == 'E') goto yy618; - goto yy14; -yy579: - yych = (unsigned char)*++cur; - if (yych == 'k') goto yy619; - goto yy14; + ++cur; +#line 149 "../src/parse/lex_conf.re" + { opts.set_yychConversion (lex_conf_bool()); return; } +#line 2520 "src/parse/lex_conf.cc" yy580: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy620; + if (yych == 'r') goto yy617; goto yy14; yy581: yych = (unsigned char)*++cur; - if (yych == 'I') goto yy622; + if (yych == 'd') goto yy619; goto yy14; yy582: yych = (unsigned char)*++cur; - if (yych == 'E') goto yy623; + if (yych == 'T') goto yy621; goto yy14; yy583: yych = (unsigned char)*++cur; - if (yych == 'N') goto yy625; + if (yych == 'E') goto yy622; goto yy14; yy584: - yyaccept = 18; - yych = (unsigned char)*(ptr = ++cur); - if (yych == 'C') goto yy627; + yych = (unsigned char)*++cur; + if (yych == 'E') goto yy624; + goto yy14; yy585: -#line 124 "../src/parse/lex_conf.re" - { opts.set_yyrestore (lex_conf_string ()); return; } -#line 2544 "src/parse/lex_conf.cc" + yych = (unsigned char)*++cur; + if (yych == 'k') goto yy625; + goto yy14; yy586: yych = (unsigned char)*++cur; - if (yych == 'I') goto yy628; + if (yych == 'n') goto yy626; goto yy14; yy587: yych = (unsigned char)*++cur; - if (yych == 'E') goto yy629; + if (yych == 'I') goto yy628; goto yy14; yy588: yych = (unsigned char)*++cur; - if (yych == 's') goto yy631; + if (yych == 'E') goto yy629; goto yy14; yy589: yych = (unsigned char)*++cur; - if (yych == 's') goto yy632; + if (yych == 'N') goto yy631; goto yy14; yy590: - yych = (unsigned char)*++cur; - if (yych == 't') goto yy633; - goto yy14; + yyaccept = 18; + yych = (unsigned char)*(ptr = ++cur); + if (yych == 'C') goto yy633; yy591: - yych = (unsigned char)*++cur; - if (yych == 'o') goto yy634; - goto yy14; +#line 124 "../src/parse/lex_conf.re" + { opts.set_yyrestore (lex_conf_string ()); return; } +#line 2568 "src/parse/lex_conf.cc" yy592: yych = (unsigned char)*++cur; - if (yych == 'u') goto yy635; + if (yych == 'I') goto yy634; goto yy14; yy593: yych = (unsigned char)*++cur; - if (yych == 'z') goto yy636; + if (yych == 'E') goto yy635; goto yy14; yy594: yych = (unsigned char)*++cur; @@ -2579,565 +2579,589 @@ yy594: goto yy14; yy595: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy639; + if (yych == 's') goto yy638; goto yy14; yy596: yych = (unsigned char)*++cur; - if (yych == 'x') goto yy93; + if (yych == 't') goto yy639; goto yy14; yy597: yych = (unsigned char)*++cur; - goto yy119; + if (yych == 'o') goto yy640; + goto yy14; yy598: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy640; + if (yych == 'u') goto yy641; goto yy14; yy599: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy641; + if (yych == 'z') goto yy642; goto yy14; yy600: - ++cur; -#line 58 "../src/parse/lex_conf.re" - { opts.set_version(!lex_conf_bool()); return; } -#line 2604 "src/parse/lex_conf.cc" + yych = (unsigned char)*++cur; + if (yych == 's') goto yy643; + goto yy14; +yy601: + yych = (unsigned char)*++cur; + if (yych == 'o') goto yy645; + goto yy14; yy602: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy642; + if (yych == 'x') goto yy93; goto yy14; yy603: yych = (unsigned char)*++cur; - if (yych == 't') goto yy643; - goto yy14; + goto yy119; yy604: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy644; + if (yych == 'n') goto yy646; goto yy14; yy605: yych = (unsigned char)*++cur; - goto yy125; + if (yych == 'i') goto yy647; + goto yy14; yy606: + ++cur; +#line 58 "../src/parse/lex_conf.re" + { opts.set_version(!lex_conf_bool()); return; } +#line 2628 "src/parse/lex_conf.cc" +yy608: yych = (unsigned char)*++cur; - if (yych == 'l') goto yy645; + if (yych == 'i') goto yy648; goto yy14; -yy607: +yy609: yych = (unsigned char)*++cur; - if (yych == 't') goto yy647; + if (yych == 't') goto yy649; goto yy14; -yy608: +yy610: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy649; + if (yych == 'r') goto yy650; goto yy14; -yy609: +yy611: + yych = (unsigned char)*++cur; + goto yy125; +yy612: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy651; + if (yych == 'l') goto yy651; goto yy14; -yy610: +yy613: yych = (unsigned char)*++cur; if (yych == 't') goto yy653; goto yy14; -yy611: +yy614: + yych = (unsigned char)*++cur; + if (yych == 'e') goto yy655; + goto yy14; +yy615: + yych = (unsigned char)*++cur; + if (yych == 'e') goto yy657; + goto yy14; +yy616: + yych = (unsigned char)*++cur; + if (yych == 't') goto yy659; + goto yy14; +yy617: ++cur; #line 155 "../src/parse/lex_conf.re" { opts.set_fill_arg_use (lex_conf_bool()); return; } -#line 2644 "src/parse/lex_conf.cc" -yy613: +#line 2668 "src/parse/lex_conf.cc" +yy619: ++cur; #line 85 "../src/parse/lex_conf.re" { opts.set_condDividerParam (lex_conf_string ()); return; } -#line 2649 "src/parse/lex_conf.cc" -yy615: +#line 2673 "src/parse/lex_conf.cc" +yy621: yych = (unsigned char)*++cur; - if (yych == 'X') goto yy655; + if (yych == 'X') goto yy661; goto yy14; -yy616: +yy622: ++cur; #line 76 "../src/parse/lex_conf.re" { opts.set_yycondtype (lex_conf_string ()); return; } -#line 2658 "src/parse/lex_conf.cc" -yy618: +#line 2682 "src/parse/lex_conf.cc" +yy624: yych = (unsigned char)*++cur; - if (yych == 'R') goto yy657; + if (yych == 'R') goto yy663; goto yy14; -yy619: +yy625: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy659; + if (yych == 'e') goto yy665; goto yy14; -yy620: +yy626: ++cur; #line 154 "../src/parse/lex_conf.re" { opts.set_fill_arg (lex_conf_string ()); return; } -#line 2671 "src/parse/lex_conf.cc" -yy622: +#line 2695 "src/parse/lex_conf.cc" +yy628: yych = (unsigned char)*++cur; - if (yych == 'T') goto yy660; + if (yych == 'T') goto yy666; goto yy14; -yy623: +yy629: yyaccept = 19; yych = (unsigned char)*(ptr = ++cur); - if (yych == ':') goto yy661; -yy624: + if (yych == ':') goto yy667; +yy630: #line 90 "../src/parse/lex_conf.re" { opts.set_state_get (lex_conf_string ()); return; } -#line 2683 "src/parse/lex_conf.cc" -yy625: +#line 2707 "src/parse/lex_conf.cc" +yy631: ++cur; #line 126 "../src/parse/lex_conf.re" { opts.set_yylessthan (lex_conf_string ()); return; } -#line 2688 "src/parse/lex_conf.cc" -yy627: +#line 2712 "src/parse/lex_conf.cc" +yy633: yych = (unsigned char)*++cur; - if (yych == 'T') goto yy662; + if (yych == 'T') goto yy668; goto yy14; -yy628: +yy634: yych = (unsigned char)*++cur; - if (yych == 'T') goto yy663; + if (yych == 'T') goto yy669; goto yy14; -yy629: +yy635: yyaccept = 20; yych = (unsigned char)*(ptr = ++cur); - if (yych == ':') goto yy664; - if (yych == '@') goto yy665; -yy630: + if (yych == ':') goto yy670; + if (yych == '@') goto yy671; +yy636: #line 92 "../src/parse/lex_conf.re" { opts.set_state_set (lex_conf_string ()); return; } -#line 2705 "src/parse/lex_conf.cc" -yy631: +#line 2729 "src/parse/lex_conf.cc" +yy637: yych = (unsigned char)*++cur; goto yy100; -yy632: +yy638: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy666; + if (yych == 'i') goto yy672; goto yy14; -yy633: +yy639: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy667; + if (yych == 'e') goto yy673; goto yy14; -yy634: +yy640: yych = (unsigned char)*++cur; - if (yych == 't') goto yy668; + if (yych == 't') goto yy674; goto yy14; -yy635: +yy641: yych = (unsigned char)*++cur; - if (yych == 't') goto yy669; + if (yych == 't') goto yy675; goto yy14; -yy636: +yy642: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy670; + if (yych == 'a') goto yy676; goto yy14; -yy637: +yy643: ++cur; #line 73 "../src/parse/lex_conf.re" { lex_conf_empty_class(); return; } -#line 2733 "src/parse/lex_conf.cc" -yy639: +#line 2757 "src/parse/lex_conf.cc" +yy645: yych = (unsigned char)*++cur; - if (yych == 'l') goto yy671; + if (yych == 'l') goto yy677; goto yy14; -yy640: +yy646: yych = (unsigned char)*++cur; - if (yych == 'f') goto yy672; + if (yych == 'f') goto yy678; goto yy14; -yy641: +yy647: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy673; + if (yych == 'o') goto yy679; goto yy14; -yy642: +yy648: yych = (unsigned char)*++cur; - if (yych == 't') goto yy674; + if (yych == 't') goto yy680; goto yy14; -yy643: +yy649: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy675; + if (yych == 'a') goto yy681; goto yy14; -yy644: +yy650: yych = (unsigned char)*++cur; goto yy121; -yy645: +yy651: ++cur; #line 95 "../src/parse/lex_conf.re" { opts.set_yyfilllabel (lex_conf_string ()); return; } -#line 2761 "src/parse/lex_conf.cc" -yy647: +#line 2785 "src/parse/lex_conf.cc" +yy653: ++cur; #line 99 "../src/parse/lex_conf.re" { opts.set_yyaccept (lex_conf_string ()); return; } -#line 2766 "src/parse/lex_conf.cc" -yy649: +#line 2790 "src/parse/lex_conf.cc" +yy655: ++cur; #line 88 "../src/parse/lex_conf.re" { opts.set_yyctable (lex_conf_string ()); return; } -#line 2771 "src/parse/lex_conf.cc" -yy651: +#line 2795 "src/parse/lex_conf.cc" +yy657: ++cur; #line 166 "../src/parse/lex_conf.re" { lex_conf_string (); return; } -#line 2776 "src/parse/lex_conf.cc" -yy653: +#line 2800 "src/parse/lex_conf.cc" +yy659: ++cur; #line 113 "../src/parse/lex_conf.re" { opts.set_yytarget (lex_conf_string ()); return; } -#line 2781 "src/parse/lex_conf.cc" -yy655: +#line 2805 "src/parse/lex_conf.cc" +yy661: ++cur; #line 123 "../src/parse/lex_conf.re" { opts.set_yybackupctx (lex_conf_string ()); return; } -#line 2786 "src/parse/lex_conf.cc" -yy657: +#line 2810 "src/parse/lex_conf.cc" +yy663: ++cur; #line 117 "../src/parse/lex_conf.re" { opts.set_yyctxmarker (lex_conf_string ()); return; } -#line 2791 "src/parse/lex_conf.cc" -yy659: - yych = (unsigned char)*++cur; - if (yych == 'd') goto yy676; - goto yy14; -yy660: - yych = (unsigned char)*++cur; - if (yych == 'I') goto yy678; - goto yy14; -yy661: - yych = (unsigned char)*++cur; - if (yych == 'n') goto yy679; - goto yy14; -yy662: - yych = (unsigned char)*++cur; - if (yych == 'X') goto yy680; - goto yy14; -yy663: - yych = (unsigned char)*++cur; - if (yych == 'I') goto yy682; - goto yy14; -yy664: - yych = (unsigned char)*++cur; - if (yych == 'n') goto yy683; - goto yy14; +#line 2815 "src/parse/lex_conf.cc" yy665: yych = (unsigned char)*++cur; - if (yych == 's') goto yy684; + if (yych == 'd') goto yy682; goto yy14; yy666: yych = (unsigned char)*++cur; - if (yych == 't') goto yy685; + if (yych == 'I') goto yy684; goto yy14; yy667: yych = (unsigned char)*++cur; - if (yych == 'd') goto yy686; + if (yych == 'n') goto yy685; goto yy14; yy668: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy688; + if (yych == 'X') goto yy686; goto yy14; yy669: yych = (unsigned char)*++cur; - goto yy104; + if (yych == 'I') goto yy688; + goto yy14; yy670: yych = (unsigned char)*++cur; - if (yych == 't') goto yy689; + if (yych == 'n') goto yy689; goto yy14; yy671: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy690; + if (yych == 's') goto yy690; goto yy14; yy672: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy691; + if (yych == 't') goto yy691; goto yy14; yy673: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy692; + if (yych == 'd') goto yy692; goto yy14; yy674: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy693; + if (yych == 'o') goto yy694; goto yy14; yy675: yych = (unsigned char)*++cur; - if (yych == 't') goto yy694; - goto yy14; + goto yy104; yy676: - ++cur; -#line 156 "../src/parse/lex_conf.re" - { opts.set_fill_naked (lex_conf_bool()); return; } -#line 2863 "src/parse/lex_conf.cc" + yych = (unsigned char)*++cur; + if (yych == 't') goto yy695; + goto yy14; +yy677: + yych = (unsigned char)*++cur; + if (yych == 'i') goto yy696; + goto yy14; yy678: yych = (unsigned char)*++cur; - if (yych == 'O') goto yy695; + if (yych == 'o') goto yy697; goto yy14; yy679: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy696; + if (yych == 'n') goto yy698; goto yy14; yy680: - ++cur; -#line 125 "../src/parse/lex_conf.re" - { opts.set_yyrestorectx (lex_conf_string ()); return; } -#line 2876 "src/parse/lex_conf.cc" -yy682: yych = (unsigned char)*++cur; - if (yych == 'O') goto yy697; + if (yych == 'i') goto yy699; goto yy14; -yy683: +yy681: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy698; + if (yych == 't') goto yy700; goto yy14; +yy682: + ++cur; +#line 156 "../src/parse/lex_conf.re" + { opts.set_fill_naked (lex_conf_bool()); return; } +#line 2887 "src/parse/lex_conf.cc" yy684: yych = (unsigned char)*++cur; - if (yych == 't') goto yy699; + if (yych == 'O') goto yy701; goto yy14; yy685: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy700; + if (yych == 'a') goto yy702; goto yy14; yy686: ++cur; -#line 60 "../src/parse/lex_conf.re" - { opts.set_bCaseInverted(lex_conf_bool()); return; } -#line 2897 "src/parse/lex_conf.cc" +#line 125 "../src/parse/lex_conf.re" + { opts.set_yyrestorectx (lex_conf_string ()); return; } +#line 2900 "src/parse/lex_conf.cc" yy688: yych = (unsigned char)*++cur; - if (yych == 's') goto yy109; + if (yych == 'O') goto yy703; goto yy14; yy689: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy701; + if (yych == 'a') goto yy704; goto yy14; yy690: yych = (unsigned char)*++cur; - if (yych == 'c') goto yy702; + if (yych == 't') goto yy705; goto yy14; yy691: yych = (unsigned char)*++cur; - goto yy112; -yy692: - yych = (unsigned char)*++cur; - if (yych == '-') goto yy703; - goto yy14; -yy693: - yych = (unsigned char)*++cur; - if (yych == 'o') goto yy704; + if (yych == 'i') goto yy706; goto yy14; +yy692: + ++cur; +#line 60 "../src/parse/lex_conf.re" + { opts.set_bCaseInverted(lex_conf_bool()); return; } +#line 2921 "src/parse/lex_conf.cc" yy694: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy705; + if (yych == 's') goto yy109; goto yy14; yy695: yych = (unsigned char)*++cur; - if (yych == 'N') goto yy706; + if (yych == 'i') goto yy707; goto yy14; yy696: yych = (unsigned char)*++cur; - if (yych == 'k') goto yy708; + if (yych == 'c') goto yy708; goto yy14; yy697: yych = (unsigned char)*++cur; - if (yych == 'N') goto yy709; - goto yy14; + goto yy112; yy698: yych = (unsigned char)*++cur; - if (yych == 'k') goto yy711; + if (yych == '-') goto yy709; goto yy14; yy699: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy712; + if (yych == 'o') goto yy710; goto yy14; yy700: yych = (unsigned char)*++cur; - if (yych == 'v') goto yy713; + if (yych == 'e') goto yy711; goto yy14; yy701: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy714; + if (yych == 'N') goto yy712; goto yy14; yy702: yych = (unsigned char)*++cur; - if (yych == 'y') goto yy715; + if (yych == 'k') goto yy714; goto yy14; yy703: yych = (unsigned char)*++cur; - if (yych == 'd') goto yy717; + if (yych == 'N') goto yy715; goto yy14; yy704: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy718; + if (yych == 'k') goto yy717; goto yy14; yy705: yych = (unsigned char)*++cur; - goto yy108; + if (yych == 'a') goto yy718; + goto yy14; yy706: + yych = (unsigned char)*++cur; + if (yych == 'v') goto yy719; + goto yy14; +yy707: + yych = (unsigned char)*++cur; + if (yych == 'o') goto yy720; + goto yy14; +yy708: + yych = (unsigned char)*++cur; + if (yych == 'y') goto yy721; + goto yy14; +yy709: + yych = (unsigned char)*++cur; + if (yych == 'd') goto yy723; + goto yy14; +yy710: + yych = (unsigned char)*++cur; + if (yych == 'n') goto yy724; + goto yy14; +yy711: + yych = (unsigned char)*++cur; + goto yy108; +yy712: yyaccept = 21; yych = (unsigned char)*(ptr = ++cur); - if (yych == ':') goto yy719; -yy707: + if (yych == ':') goto yy725; +yy713: #line 77 "../src/parse/lex_conf.re" { opts.set_cond_get (lex_conf_string ()); return; } -#line 2975 "src/parse/lex_conf.cc" -yy708: +#line 2999 "src/parse/lex_conf.cc" +yy714: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy720; + if (yych == 'e') goto yy726; goto yy14; -yy709: +yy715: yyaccept = 22; yych = (unsigned char)*(ptr = ++cur); - if (yych == ':') goto yy721; - if (yych == '@') goto yy722; -yy710: + if (yych == ':') goto yy727; + if (yych == '@') goto yy728; +yy716: #line 79 "../src/parse/lex_conf.re" { opts.set_cond_set (lex_conf_string ()); return; } -#line 2988 "src/parse/lex_conf.cc" -yy711: +#line 3012 "src/parse/lex_conf.cc" +yy717: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy723; + if (yych == 'e') goto yy729; goto yy14; -yy712: +yy718: yych = (unsigned char)*++cur; - if (yych == 't') goto yy724; + if (yych == 't') goto yy730; goto yy14; -yy713: +yy719: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy725; + if (yych == 'e') goto yy731; goto yy14; -yy714: +yy720: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy727; + if (yych == 'n') goto yy733; goto yy14; -yy715: +yy721: ++cur; #line 71 "../src/parse/lex_conf.re" { lex_conf_encoding_policy(); return; } -#line 3009 "src/parse/lex_conf.cc" -yy717: +#line 3033 "src/parse/lex_conf.cc" +yy723: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy729; + if (yych == 'a') goto yy735; goto yy14; -yy718: +yy724: yych = (unsigned char)*++cur; - if (yych == 's') goto yy730; + if (yych == 's') goto yy736; goto yy14; -yy719: +yy725: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy731; + if (yych == 'n') goto yy737; goto yy14; -yy720: +yy726: yych = (unsigned char)*++cur; - if (yych == 'd') goto yy732; + if (yych == 'd') goto yy738; goto yy14; -yy721: +yy727: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy734; + if (yych == 'n') goto yy740; goto yy14; -yy722: +yy728: yych = (unsigned char)*++cur; - if (yych == 'c') goto yy735; + if (yych == 'c') goto yy741; goto yy14; -yy723: +yy729: yych = (unsigned char)*++cur; - if (yych == 'd') goto yy736; + if (yych == 'd') goto yy742; goto yy14; -yy724: +yy730: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy738; + if (yych == 'e') goto yy744; goto yy14; -yy725: +yy731: ++cur; #line 59 "../src/parse/lex_conf.re" { opts.set_bCaseInsensitive(lex_conf_bool()); return; } -#line 3046 "src/parse/lex_conf.cc" -yy727: +#line 3070 "src/parse/lex_conf.cc" +yy733: ++cur; #line 74 "../src/parse/lex_conf.re" { lex_conf_dfa_minimization(); return; } -#line 3051 "src/parse/lex_conf.cc" -yy729: +#line 3075 "src/parse/lex_conf.cc" +yy735: yych = (unsigned char)*++cur; - if (yych == 't') goto yy740; + if (yych == 't') goto yy746; goto yy14; -yy730: +yy736: yych = (unsigned char)*++cur; goto yy102; -yy731: +yy737: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy741; + if (yych == 'a') goto yy747; goto yy14; -yy732: +yy738: ++cur; #line 91 "../src/parse/lex_conf.re" { opts.set_state_get_naked (lex_conf_bool()); return; } -#line 3067 "src/parse/lex_conf.cc" -yy734: +#line 3091 "src/parse/lex_conf.cc" +yy740: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy742; + if (yych == 'a') goto yy748; goto yy14; -yy735: +yy741: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy743; + if (yych == 'o') goto yy749; goto yy14; -yy736: +yy742: ++cur; #line 93 "../src/parse/lex_conf.re" { opts.set_state_set_naked (lex_conf_bool()); return; } -#line 3080 "src/parse/lex_conf.cc" -yy738: +#line 3104 "src/parse/lex_conf.cc" +yy744: ++cur; #line 94 "../src/parse/lex_conf.re" { opts.set_state_set_arg (lex_conf_string ()); return; } -#line 3085 "src/parse/lex_conf.cc" -yy740: +#line 3109 "src/parse/lex_conf.cc" +yy746: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy744; + if (yych == 'e') goto yy750; goto yy14; -yy741: +yy747: yych = (unsigned char)*++cur; - if (yych == 'k') goto yy746; + if (yych == 'k') goto yy752; goto yy14; -yy742: +yy748: yych = (unsigned char)*++cur; - if (yych == 'k') goto yy747; + if (yych == 'k') goto yy753; goto yy14; -yy743: +yy749: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy748; + if (yych == 'n') goto yy754; goto yy14; -yy744: +yy750: ++cur; #line 57 "../src/parse/lex_conf.re" { opts.set_bNoGenerationDate(lex_conf_bool()); return; } -#line 3106 "src/parse/lex_conf.cc" -yy746: +#line 3130 "src/parse/lex_conf.cc" +yy752: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy749; + if (yych == 'e') goto yy755; goto yy14; -yy747: +yy753: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy750; + if (yych == 'e') goto yy756; goto yy14; -yy748: +yy754: yych = (unsigned char)*++cur; - if (yych == 'd') goto yy751; + if (yych == 'd') goto yy757; goto yy14; -yy749: +yy755: yych = (unsigned char)*++cur; - if (yych == 'd') goto yy753; + if (yych == 'd') goto yy759; goto yy14; -yy750: +yy756: yych = (unsigned char)*++cur; - if (yych == 'd') goto yy755; + if (yych == 'd') goto yy761; goto yy14; -yy751: +yy757: ++cur; #line 80 "../src/parse/lex_conf.re" { opts.set_cond_set_arg (lex_conf_string ()); return; } -#line 3131 "src/parse/lex_conf.cc" -yy753: +#line 3155 "src/parse/lex_conf.cc" +yy759: ++cur; #line 78 "../src/parse/lex_conf.re" { opts.set_cond_get_naked (lex_conf_bool()); return; } -#line 3136 "src/parse/lex_conf.cc" -yy755: +#line 3160 "src/parse/lex_conf.cc" +yy761: ++cur; #line 81 "../src/parse/lex_conf.re" { opts.set_cond_set_naked (lex_conf_bool()); return; } -#line 3141 "src/parse/lex_conf.cc" +#line 3165 "src/parse/lex_conf.cc" } #line 167 "../src/parse/lex_conf.re" @@ -3147,100 +3171,100 @@ void Scanner::lex_conf_encoding_policy() { lex_conf_assign (); -#line 3151 "src/parse/lex_conf.cc" +#line 3175 "src/parse/lex_conf.cc" { unsigned char yych; if ((lim - cur) < 10) fill(10); yych = (unsigned char)*cur; if (yych <= 'h') { - if (yych == 'f') goto yy761; + if (yych == 'f') goto yy767; } else { - if (yych <= 'i') goto yy762; - if (yych == 's') goto yy763; + if (yych <= 'i') goto yy768; + if (yych == 's') goto yy769; } ++cur; -yy760: +yy766: #line 174 "../src/parse/lex_conf.re" { fatal("bad configuration value" " (expected: 'ignore', 'substitute', 'fail')"); } -#line 3167 "src/parse/lex_conf.cc" -yy761: +#line 3191 "src/parse/lex_conf.cc" +yy767: yych = (unsigned char)*(ptr = ++cur); - if (yych == 'a') goto yy764; - goto yy760; -yy762: + if (yych == 'a') goto yy770; + goto yy766; +yy768: yych = (unsigned char)*(ptr = ++cur); - if (yych == 'g') goto yy766; - goto yy760; -yy763: + if (yych == 'g') goto yy772; + goto yy766; +yy769: yych = (unsigned char)*(ptr = ++cur); - if (yych == 'u') goto yy767; - goto yy760; -yy764: + if (yych == 'u') goto yy773; + goto yy766; +yy770: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy768; -yy765: + if (yych == 'i') goto yy774; +yy771: cur = ptr; - goto yy760; -yy766: + goto yy766; +yy772: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy769; - goto yy765; -yy767: + if (yych == 'n') goto yy775; + goto yy771; +yy773: yych = (unsigned char)*++cur; - if (yych == 'b') goto yy770; - goto yy765; -yy768: + if (yych == 'b') goto yy776; + goto yy771; +yy774: yych = (unsigned char)*++cur; - if (yych == 'l') goto yy771; - goto yy765; -yy769: + if (yych == 'l') goto yy777; + goto yy771; +yy775: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy773; - goto yy765; -yy770: + if (yych == 'o') goto yy779; + goto yy771; +yy776: yych = (unsigned char)*++cur; - if (yych == 's') goto yy774; - goto yy765; -yy771: + if (yych == 's') goto yy780; + goto yy771; +yy777: ++cur; #line 178 "../src/parse/lex_conf.re" { opts.set_encoding_policy(Enc::POLICY_FAIL); goto end; } -#line 3210 "src/parse/lex_conf.cc" -yy773: +#line 3234 "src/parse/lex_conf.cc" +yy779: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy775; - goto yy765; -yy774: + if (yych == 'r') goto yy781; + goto yy771; +yy780: yych = (unsigned char)*++cur; - if (yych == 't') goto yy776; - goto yy765; -yy775: + if (yych == 't') goto yy782; + goto yy771; +yy781: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy777; - goto yy765; -yy776: + if (yych == 'e') goto yy783; + goto yy771; +yy782: yych = (unsigned char)*++cur; - if (yych == 'i') goto yy779; - goto yy765; -yy777: + if (yych == 'i') goto yy785; + goto yy771; +yy783: ++cur; #line 176 "../src/parse/lex_conf.re" { opts.set_encoding_policy(Enc::POLICY_IGNORE); goto end; } -#line 3231 "src/parse/lex_conf.cc" -yy779: +#line 3255 "src/parse/lex_conf.cc" +yy785: yych = (unsigned char)*++cur; - if (yych != 't') goto yy765; + if (yych != 't') goto yy771; yych = (unsigned char)*++cur; - if (yych != 'u') goto yy765; + if (yych != 'u') goto yy771; yych = (unsigned char)*++cur; - if (yych != 't') goto yy765; + if (yych != 't') goto yy771; yych = (unsigned char)*++cur; - if (yych != 'e') goto yy765; + if (yych != 'e') goto yy771; ++cur; #line 177 "../src/parse/lex_conf.re" { opts.set_encoding_policy(Enc::POLICY_SUBSTITUTE); goto end; } -#line 3244 "src/parse/lex_conf.cc" +#line 3268 "src/parse/lex_conf.cc" } #line 179 "../src/parse/lex_conf.re" @@ -3252,75 +3276,75 @@ void Scanner::lex_conf_input() { lex_conf_assign (); -#line 3256 "src/parse/lex_conf.cc" +#line 3280 "src/parse/lex_conf.cc" { unsigned char yych; if ((lim - cur) < 7) fill(7); yych = (unsigned char)*cur; - if (yych <= 'b') goto yy787; - if (yych <= 'c') goto yy789; - if (yych <= 'd') goto yy790; -yy787: + if (yych <= 'b') goto yy793; + if (yych <= 'c') goto yy795; + if (yych <= 'd') goto yy796; +yy793: ++cur; -yy788: +yy794: #line 188 "../src/parse/lex_conf.re" { fatal("bad configuration value" " (expected: 'default', 'custom')"); } -#line 3270 "src/parse/lex_conf.cc" -yy789: +#line 3294 "src/parse/lex_conf.cc" +yy795: yych = (unsigned char)*(ptr = ++cur); - if (yych == 'u') goto yy791; - goto yy788; -yy790: + if (yych == 'u') goto yy797; + goto yy794; +yy796: yych = (unsigned char)*(ptr = ++cur); - if (yych == 'e') goto yy793; - goto yy788; -yy791: + if (yych == 'e') goto yy799; + goto yy794; +yy797: yych = (unsigned char)*++cur; - if (yych == 's') goto yy794; -yy792: + if (yych == 's') goto yy800; +yy798: cur = ptr; - goto yy788; -yy793: + goto yy794; +yy799: yych = (unsigned char)*++cur; - if (yych == 'f') goto yy795; - goto yy792; -yy794: + if (yych == 'f') goto yy801; + goto yy798; +yy800: yych = (unsigned char)*++cur; - if (yych == 't') goto yy796; - goto yy792; -yy795: + if (yych == 't') goto yy802; + goto yy798; +yy801: yych = (unsigned char)*++cur; - if (yych == 'a') goto yy797; - goto yy792; -yy796: + if (yych == 'a') goto yy803; + goto yy798; +yy802: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy798; - goto yy792; -yy797: + if (yych == 'o') goto yy804; + goto yy798; +yy803: yych = (unsigned char)*++cur; - if (yych == 'u') goto yy799; - goto yy792; -yy798: + if (yych == 'u') goto yy805; + goto yy798; +yy804: yych = (unsigned char)*++cur; - if (yych == 'm') goto yy800; - goto yy792; -yy799: + if (yych == 'm') goto yy806; + goto yy798; +yy805: yych = (unsigned char)*++cur; - if (yych == 'l') goto yy802; - goto yy792; -yy800: + if (yych == 'l') goto yy808; + goto yy798; +yy806: ++cur; #line 191 "../src/parse/lex_conf.re" { opts.set_input_api(InputAPI::CUSTOM); goto end; } -#line 3317 "src/parse/lex_conf.cc" -yy802: +#line 3341 "src/parse/lex_conf.cc" +yy808: yych = (unsigned char)*++cur; - if (yych != 't') goto yy792; + if (yych != 't') goto yy798; ++cur; #line 190 "../src/parse/lex_conf.re" { opts.set_input_api(InputAPI::DEFAULT); goto end; } -#line 3324 "src/parse/lex_conf.cc" +#line 3348 "src/parse/lex_conf.cc" } #line 192 "../src/parse/lex_conf.re" @@ -3332,103 +3356,103 @@ void Scanner::lex_conf_empty_class() { lex_conf_assign (); -#line 3336 "src/parse/lex_conf.cc" +#line 3360 "src/parse/lex_conf.cc" { unsigned char yych; if ((lim - cur) < 11) fill(11); yych = (unsigned char)*cur; - if (yych == 'e') goto yy809; - if (yych == 'm') goto yy810; + if (yych == 'e') goto yy815; + if (yych == 'm') goto yy816; ++cur; -yy808: +yy814: #line 201 "../src/parse/lex_conf.re" { fatal("bad configuration value" " (expected: 'match-empty', 'match-none', 'error')"); } -#line 3348 "src/parse/lex_conf.cc" -yy809: +#line 3372 "src/parse/lex_conf.cc" +yy815: yych = (unsigned char)*(ptr = ++cur); - if (yych == 'r') goto yy811; - goto yy808; -yy810: + if (yych == 'r') goto yy817; + goto yy814; +yy816: yych = (unsigned char)*(ptr = ++cur); - if (yych == 'a') goto yy813; - goto yy808; -yy811: + if (yych == 'a') goto yy819; + goto yy814; +yy817: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy814; -yy812: + if (yych == 'r') goto yy820; +yy818: cur = ptr; - goto yy808; -yy813: + goto yy814; +yy819: yych = (unsigned char)*++cur; - if (yych == 't') goto yy815; - goto yy812; -yy814: + if (yych == 't') goto yy821; + goto yy818; +yy820: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy816; - goto yy812; -yy815: + if (yych == 'o') goto yy822; + goto yy818; +yy821: yych = (unsigned char)*++cur; - if (yych == 'c') goto yy817; - goto yy812; -yy816: + if (yych == 'c') goto yy823; + goto yy818; +yy822: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy818; - goto yy812; -yy817: + if (yych == 'r') goto yy824; + goto yy818; +yy823: yych = (unsigned char)*++cur; - if (yych == 'h') goto yy820; - goto yy812; -yy818: + if (yych == 'h') goto yy826; + goto yy818; +yy824: ++cur; #line 205 "../src/parse/lex_conf.re" { opts.set_empty_class_policy(EMPTY_CLASS_ERROR); goto end; } -#line 3387 "src/parse/lex_conf.cc" -yy820: +#line 3411 "src/parse/lex_conf.cc" +yy826: yych = (unsigned char)*++cur; - if (yych != '-') goto yy812; + if (yych != '-') goto yy818; yych = (unsigned char)*++cur; - if (yych == 'e') goto yy822; - if (yych == 'n') goto yy823; - goto yy812; -yy822: + if (yych == 'e') goto yy828; + if (yych == 'n') goto yy829; + goto yy818; +yy828: yych = (unsigned char)*++cur; - if (yych == 'm') goto yy824; - goto yy812; -yy823: + if (yych == 'm') goto yy830; + goto yy818; +yy829: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy825; - goto yy812; -yy824: + if (yych == 'o') goto yy831; + goto yy818; +yy830: yych = (unsigned char)*++cur; - if (yych == 'p') goto yy826; - goto yy812; -yy825: + if (yych == 'p') goto yy832; + goto yy818; +yy831: yych = (unsigned char)*++cur; - if (yych == 'n') goto yy827; - goto yy812; -yy826: + if (yych == 'n') goto yy833; + goto yy818; +yy832: yych = (unsigned char)*++cur; - if (yych == 't') goto yy828; - goto yy812; -yy827: + if (yych == 't') goto yy834; + goto yy818; +yy833: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy829; - goto yy812; -yy828: + if (yych == 'e') goto yy835; + goto yy818; +yy834: yych = (unsigned char)*++cur; - if (yych == 'y') goto yy831; - goto yy812; -yy829: + if (yych == 'y') goto yy837; + goto yy818; +yy835: ++cur; #line 204 "../src/parse/lex_conf.re" { opts.set_empty_class_policy(EMPTY_CLASS_MATCH_NONE); goto end; } -#line 3427 "src/parse/lex_conf.cc" -yy831: +#line 3451 "src/parse/lex_conf.cc" +yy837: ++cur; #line 203 "../src/parse/lex_conf.re" { opts.set_empty_class_policy(EMPTY_CLASS_MATCH_EMPTY); goto end; } -#line 3432 "src/parse/lex_conf.cc" +#line 3456 "src/parse/lex_conf.cc" } #line 206 "../src/parse/lex_conf.re" @@ -3440,63 +3464,63 @@ void Scanner::lex_conf_dfa_minimization() { lex_conf_assign (); -#line 3444 "src/parse/lex_conf.cc" +#line 3468 "src/parse/lex_conf.cc" { unsigned char yych; if ((lim - cur) < 5) fill(5); yych = (unsigned char)*cur; - if (yych == 'm') goto yy837; - if (yych == 't') goto yy838; + if (yych == 'm') goto yy843; + if (yych == 't') goto yy844; ++cur; -yy836: +yy842: #line 215 "../src/parse/lex_conf.re" { fatal("bad configuration value" " (expected: 'table', 'moore')"); } -#line 3456 "src/parse/lex_conf.cc" -yy837: +#line 3480 "src/parse/lex_conf.cc" +yy843: yych = (unsigned char)*(ptr = ++cur); - if (yych == 'o') goto yy839; - goto yy836; -yy838: + if (yych == 'o') goto yy845; + goto yy842; +yy844: yych = (unsigned char)*(ptr = ++cur); - if (yych == 'a') goto yy841; - goto yy836; -yy839: + if (yych == 'a') goto yy847; + goto yy842; +yy845: yych = (unsigned char)*++cur; - if (yych == 'o') goto yy842; -yy840: + if (yych == 'o') goto yy848; +yy846: cur = ptr; - goto yy836; -yy841: + goto yy842; +yy847: yych = (unsigned char)*++cur; - if (yych == 'b') goto yy843; - goto yy840; -yy842: + if (yych == 'b') goto yy849; + goto yy846; +yy848: yych = (unsigned char)*++cur; - if (yych == 'r') goto yy844; - goto yy840; -yy843: + if (yych == 'r') goto yy850; + goto yy846; +yy849: yych = (unsigned char)*++cur; - if (yych == 'l') goto yy845; - goto yy840; -yy844: + if (yych == 'l') goto yy851; + goto yy846; +yy850: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy846; - goto yy840; -yy845: + if (yych == 'e') goto yy852; + goto yy846; +yy851: yych = (unsigned char)*++cur; - if (yych == 'e') goto yy848; - goto yy840; -yy846: + if (yych == 'e') goto yy854; + goto yy846; +yy852: ++cur; #line 218 "../src/parse/lex_conf.re" { opts.set_dfa_minimization(DFA_MINIMIZATION_MOORE); goto end; } -#line 3495 "src/parse/lex_conf.cc" -yy848: +#line 3519 "src/parse/lex_conf.cc" +yy854: ++cur; #line 217 "../src/parse/lex_conf.re" { opts.set_dfa_minimization(DFA_MINIMIZATION_TABLE); goto end; } -#line 3500 "src/parse/lex_conf.cc" +#line 3524 "src/parse/lex_conf.cc" } #line 219 "../src/parse/lex_conf.re" @@ -3519,7 +3543,7 @@ void Scanner::lex_conf_enc(Enc::type_t enc) void Scanner::lex_conf_assign () { -#line 3523 "src/parse/lex_conf.cc" +#line 3547 "src/parse/lex_conf.cc" { unsigned char yych; static const unsigned char yybm[] = { @@ -3559,47 +3583,47 @@ void Scanner::lex_conf_assign () if ((lim - cur) < 2) fill(2); yych = (unsigned char)*cur; if (yych <= 0x1F) { - if (yych == '\t') goto yy854; + if (yych == '\t') goto yy860; } else { - if (yych <= ' ') goto yy854; - if (yych == '=') goto yy855; + if (yych <= ' ') goto yy860; + if (yych == '=') goto yy861; } ++cur; -yy853: +yy859: #line 239 "../src/parse/lex_conf.re" { fatal ("missing '=' in configuration"); } -#line 3572 "src/parse/lex_conf.cc" -yy854: +#line 3596 "src/parse/lex_conf.cc" +yy860: yych = (unsigned char)*(ptr = ++cur); if (yych <= 0x1F) { - if (yych == '\t') goto yy858; - goto yy853; + if (yych == '\t') goto yy864; + goto yy859; } else { - if (yych <= ' ') goto yy858; - if (yych != '=') goto yy853; + if (yych <= ' ') goto yy864; + if (yych != '=') goto yy859; } -yy855: +yy861: ++cur; if (lim <= cur) fill(1); yych = (unsigned char)*cur; if (yybm[0+yych] & 128) { - goto yy855; + goto yy861; } #line 240 "../src/parse/lex_conf.re" { return; } -#line 3591 "src/parse/lex_conf.cc" -yy858: +#line 3615 "src/parse/lex_conf.cc" +yy864: ++cur; if (lim <= cur) fill(1); yych = (unsigned char)*cur; if (yych <= 0x1F) { - if (yych == '\t') goto yy858; + if (yych == '\t') goto yy864; } else { - if (yych <= ' ') goto yy858; - if (yych == '=') goto yy855; + if (yych <= ' ') goto yy864; + if (yych == '=') goto yy861; } cur = ptr; - goto yy853; + goto yy859; } #line 241 "../src/parse/lex_conf.re" @@ -3608,7 +3632,7 @@ yy858: void Scanner::lex_conf_semicolon () { -#line 3612 "src/parse/lex_conf.cc" +#line 3636 "src/parse/lex_conf.cc" { unsigned char yych; static const unsigned char yybm[] = { @@ -3648,37 +3672,37 @@ void Scanner::lex_conf_semicolon () if ((lim - cur) < 2) fill(2); yych = (unsigned char)*cur; if (yych <= 0x1F) { - if (yych == '\t') goto yy865; + if (yych == '\t') goto yy871; } else { - if (yych <= ' ') goto yy865; - if (yych == ';') goto yy866; + if (yych <= ' ') goto yy871; + if (yych == ';') goto yy872; } ++cur; -yy864: +yy870: #line 247 "../src/parse/lex_conf.re" { fatal ("missing ending ';' in configuration"); } -#line 3661 "src/parse/lex_conf.cc" -yy865: +#line 3685 "src/parse/lex_conf.cc" +yy871: yych = (unsigned char)*(ptr = ++cur); if (yybm[0+yych] & 128) { - goto yy868; + goto yy874; } - if (yych != ';') goto yy864; -yy866: + if (yych != ';') goto yy870; +yy872: ++cur; #line 248 "../src/parse/lex_conf.re" { return; } -#line 3672 "src/parse/lex_conf.cc" -yy868: +#line 3696 "src/parse/lex_conf.cc" +yy874: ++cur; if (lim <= cur) fill(1); yych = (unsigned char)*cur; if (yybm[0+yych] & 128) { - goto yy868; + goto yy874; } - if (yych == ';') goto yy866; + if (yych == ';') goto yy872; cur = ptr; - goto yy864; + goto yy870; } #line 249 "../src/parse/lex_conf.re" @@ -3694,7 +3718,7 @@ int32_t Scanner::lex_conf_number () lex_conf_assign (); tok = cur; -#line 3698 "src/parse/lex_conf.cc" +#line 3722 "src/parse/lex_conf.cc" { unsigned char yych; static const unsigned char yybm[] = { @@ -3734,20 +3758,20 @@ int32_t Scanner::lex_conf_number () if ((lim - cur) < 2) fill(2); yych = (unsigned char)*cur; if (yych <= '/') { - if (yych == '-') goto yy874; + if (yych == '-') goto yy880; } else { - if (yych <= '0') goto yy875; - if (yych <= '9') goto yy877; + if (yych <= '0') goto yy881; + if (yych <= '9') goto yy883; } -yy873: -yy874: +yy879: +yy880: yych = (unsigned char)*++cur; - if (yych <= '0') goto yy873; - if (yych <= '9') goto yy877; - goto yy873; -yy875: + if (yych <= '0') goto yy879; + if (yych <= '9') goto yy883; + goto yy879; +yy881: ++cur; -yy876: +yy882: #line 263 "../src/parse/lex_conf.re" { int32_t n = 0; @@ -3758,15 +3782,15 @@ yy876: lex_conf_semicolon (); return n; } -#line 3762 "src/parse/lex_conf.cc" -yy877: +#line 3786 "src/parse/lex_conf.cc" +yy883: ++cur; if (lim <= cur) fill(1); yych = (unsigned char)*cur; if (yybm[0+yych] & 128) { - goto yy877; + goto yy883; } - goto yy876; + goto yy882; } #line 272 "../src/parse/lex_conf.re" @@ -3778,7 +3802,7 @@ std::string Scanner::lex_conf_string () std::string s; tok = cur; -#line 3782 "src/parse/lex_conf.cc" +#line 3806 "src/parse/lex_conf.cc" { unsigned char yych; static const unsigned char yybm[] = { @@ -3819,36 +3843,36 @@ std::string Scanner::lex_conf_string () yych = (unsigned char)*cur; if (yych <= '!') { if (yych <= '\n') { - if (yych <= 0x08) goto yy882; + if (yych <= 0x08) goto yy888; } else { - if (yych != ' ') goto yy882; + if (yych != ' ') goto yy888; } } else { if (yych <= '\'') { - if (yych <= '"') goto yy885; - if (yych <= '&') goto yy882; - goto yy885; + if (yych <= '"') goto yy891; + if (yych <= '&') goto yy888; + goto yy891; } else { - if (yych != ';') goto yy882; + if (yych != ';') goto yy888; } } #line 299 "../src/parse/lex_conf.re" { goto end; } -#line 3838 "src/parse/lex_conf.cc" -yy882: +#line 3862 "src/parse/lex_conf.cc" +yy888: ++cur; if (lim <= cur) fill(1); yych = (unsigned char)*cur; if (yybm[0+yych] & 128) { - goto yy882; + goto yy888; } #line 295 "../src/parse/lex_conf.re" { s = std::string(tok, tok_len()); goto end; } -#line 3851 "src/parse/lex_conf.cc" -yy885: +#line 3875 "src/parse/lex_conf.cc" +yy891: ++cur; #line 281 "../src/parse/lex_conf.re" { @@ -3865,7 +3889,7 @@ yy885: } } } -#line 3869 "src/parse/lex_conf.cc" +#line 3893 "src/parse/lex_conf.cc" } #line 300 "../src/parse/lex_conf.re" diff --git a/re2c/src/codegen/emit_dfa.cc b/re2c/src/codegen/emit_dfa.cc index e6146b36..b8cca424 100644 --- a/re2c/src/codegen/emit_dfa.cc +++ b/re2c/src/codegen/emit_dfa.cc @@ -386,7 +386,7 @@ std::string vartag_name(const std::string *name, size_t rule) std::string vartag_expr(const std::string *name, size_t rule) { const std::string s = vartag_name(name, rule); - std::string e = opts->tags_expr; + std::string e = opts->tags_expression; strrreplace(e, "@@", s); return e; } diff --git a/re2c/src/conf/opt.cc b/re2c/src/conf/opt.cc index 42596ea1..e05008eb 100644 --- a/re2c/src/conf/opt.cc +++ b/re2c/src/conf/opt.cc @@ -79,7 +79,7 @@ void opt_t::fix () tags_yytag = Opt::baseopt.tags_yytag; tags_yydist = Opt::baseopt.tags_yydist; tags_prefix = Opt::baseopt.tags_prefix; - tags_expr = Opt::baseopt.tags_expr; + tags_expression = Opt::baseopt.tags_expression; yyfilllabel = Opt::baseopt.yyfilllabel; yynext = Opt::baseopt.yynext; yyaccept = Opt::baseopt.yyaccept; @@ -159,7 +159,7 @@ void opt_t::fix () tags_yytag = Opt::baseopt.tags_yytag; tags_yydist = Opt::baseopt.tags_yydist; tags_prefix = Opt::baseopt.tags_prefix; - tags_expr = Opt::baseopt.tags_expr; + tags_expression = Opt::baseopt.tags_expression; } if (!bFlag) { diff --git a/re2c/src/conf/opt.h b/re2c/src/conf/opt.h index b171e1a8..ceeaebf7 100644 --- a/re2c/src/conf/opt.h +++ b/re2c/src/conf/opt.h @@ -61,7 +61,7 @@ namespace re2c OPT (std::string, tags_yytag, "YYTAG") \ OPT (std::string, tags_yydist, "YYDIST") \ OPT (std::string, tags_prefix, "yyt") \ - OPT (std::string, tags_expr, "@@") \ + OPT (std::string, tags_expression, "@@") \ /* reuse */ \ OPT (bool, rFlag, false) \ /* partial flex syntax support */ \ diff --git a/re2c/src/parse/lex_conf.re b/re2c/src/parse/lex_conf.re index cffd556c..a66ab469 100644 --- a/re2c/src/parse/lex_conf.re +++ b/re2c/src/parse/lex_conf.re @@ -127,8 +127,8 @@ void Scanner::lex_conf () "define:YYTAG" { opts.set_tags_yytag (lex_conf_string ()); return; } "define:YYDIST" { opts.set_tags_yydist (lex_conf_string ()); return; } - "tags:prefix" { opts.set_tags_prefix(lex_conf_string ()); return; } - "tags:expr" { opts.set_tags_expr (lex_conf_string ()); return; } + "tags:prefix" { opts.set_tags_prefix (lex_conf_string ()); return; } + "tags:expression" { opts.set_tags_expression(lex_conf_string ()); return; } "indent:string" { opts.set_indString (lex_conf_string ()); return; } "indent:top" diff --git a/re2c/test/tags/conf4.i--tags--input(custom).re b/re2c/test/tags/conf4.i--tags--input(custom).re index b5f48ab7..ccaac454 100644 --- a/re2c/test/tags/conf4.i--tags--input(custom).re +++ b/re2c/test/tags/conf4.i--tags--input(custom).re @@ -45,7 +45,7 @@ static void lex(const char *s) re2c:define:YYTAG = "ZZ_CTX"; re2c:define:YYDIST = "ZZ_DIST"; re2c:tags:prefix = "zz_"; - re2c:tags:expr = "ctxs.@@"; + re2c:tags:expression = "ctxs.@@"; oct = [0-9]{1,3}; d = "."; diff --git a/re2c/test/tags/conf4.i--tags.re b/re2c/test/tags/conf4.i--tags.re index f538c961..0a4f1382 100644 --- a/re2c/test/tags/conf4.i--tags.re +++ b/re2c/test/tags/conf4.i--tags.re @@ -35,7 +35,7 @@ static void lex(const char *YYCURSOR) re2c:yyfill:enable = 0; re2c:tags:prefix = "zz_"; - re2c:tags:expr = "ctxs.@@"; + re2c:tags:expression = "ctxs.@@"; oct = [0-9]{1,3}; d = "."; diff --git a/re2c/test/tags/conf5.i--tags--input(custom).re b/re2c/test/tags/conf5.i--tags--input(custom).re index 5144f9b3..5f24d7b6 100644 --- a/re2c/test/tags/conf5.i--tags--input(custom).re +++ b/re2c/test/tags/conf5.i--tags--input(custom).re @@ -39,7 +39,7 @@ static void lex(const char *s) re2c:define:YYTAG = "ZZ_CTX"; re2c:define:YYDIST = "ZZ_DIST"; re2c:tags:prefix = "zz_"; - re2c:tags:expr = "ctxs.@@"; + re2c:tags:expression = "ctxs.@@"; oct = [0-9]{1,3}; d = "."; diff --git a/re2c/test/tags/conf5.i--tags.re b/re2c/test/tags/conf5.i--tags.re index 7ea42a53..068ce5aa 100644 --- a/re2c/test/tags/conf5.i--tags.re +++ b/re2c/test/tags/conf5.i--tags.re @@ -29,7 +29,7 @@ static void lex(const char *YYCURSOR) re2c:yyfill:enable = 0; re2c:tags:prefix = "zz_"; - re2c:tags:expr = "ctxs.@@"; + re2c:tags:expression = "ctxs.@@"; oct = [0-9]{1,3}; d = "."; diff --git a/re2c/test/tags/conf6.--tags--input(custom).re b/re2c/test/tags/conf6.--tags--input(custom).re index c9dbcfd4..876b0edf 100644 --- a/re2c/test/tags/conf6.--tags--input(custom).re +++ b/re2c/test/tags/conf6.--tags--input(custom).re @@ -47,7 +47,7 @@ static void lex(const char *s) re2c:define:YYTAG = "ZZ_CTX"; re2c:define:YYDIST = "ZZ_DIST"; re2c:tags:prefix = "zz_"; - re2c:tags:expr = "ctxs.@@"; + re2c:tags:expression = "ctxs.@@"; oct = [0-9]{1,3}; d = "."; diff --git a/re2c/test/tags/conf6.--tags.re b/re2c/test/tags/conf6.--tags.re index dd75d755..73b95dca 100644 --- a/re2c/test/tags/conf6.--tags.re +++ b/re2c/test/tags/conf6.--tags.re @@ -37,7 +37,7 @@ static void lex(const char *YYCURSOR) re2c:yyfill:enable = 0; re2c:tags:prefix = "zz_"; - re2c:tags:expr = "ctxs.@@"; + re2c:tags:expression = "ctxs.@@"; oct = [0-9]{1,3}; d = ".";