From: helly Date: Fri, 30 Dec 2005 18:29:48 +0000 (+0000) Subject: - Fix indendation of generated code X-Git-Tag: 0.13.6~542 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e38c46739f806a0620e613f08bbb4d8c80a1e14b;p=re2c - Fix indendation of generated code --- diff --git a/code.cc b/code.cc index 83d8c00e..cb4f9018 100644 --- a/code.cc +++ b/code.cc @@ -16,6 +16,17 @@ namespace re2c // there must be at least one span in list; all spans must cover // same range +std::string indent(uint ind) +{ + std::string str; + + while (ind-- > 0) + { + str += "\t"; + } + return str; +} + void Go::compact() { // arrange so that adjacent spans have different targets @@ -188,13 +199,13 @@ const BitMap *BitMap::find(const State *x) return NULL; } -void BitMap::gen(std::ostream &o, uint lb, uint ub) +void BitMap::gen(std::ostream &o, uint ind, uint lb, uint ub) { BitMap *b = first; if (b) { - o << "\tstatic unsigned char yybm[] = {"; + o << indent(ind) << "static unsigned char yybm[] = {"; uint n = ub - lb; uint *bm = new uint[n]; memset(bm, 0, n); @@ -212,7 +223,7 @@ void BitMap::gen(std::ostream &o, uint lb, uint ub) { if (j % 8 == 0) { - o << "\n\t"; + o << "\n" << indent(ind+1); ++oline; } @@ -220,7 +231,7 @@ void BitMap::gen(std::ostream &o, uint lb, uint ub) } } - o << "\n\t};\n"; + o << "\n" << indent(ind) << "};\n"; oline += 2; } } @@ -240,46 +251,38 @@ void BitMap::stats() first = NULL; } -void genGoTo(std::ostream &o, const State *from, const State *to, bool & readCh, const char *indent = "\t") +void genGoTo(std::ostream &o, uint ind, const State *from, const State *to, bool & readCh) { if (readCh && from->label + 1 != to->label) { - o << indent << "yych = *YYCURSOR;\n"; + o << indent(ind) << "yych = *YYCURSOR;\n"; ++oline; readCh = false; } - o << indent << "goto yy" << to->label << ";\n"; + o << indent(ind) << "goto yy" << to->label << ";\n"; ++oline; vUsedLabels.append(to->label); } -void genIf(std::ostream &o, char *cmp, uint v, bool &readCh) +void genIf(std::ostream &o, uint ind, char *cmp, uint v, bool &readCh) { if (readCh) { - o << "\tif((yych = *YYCURSOR) "; + o << indent(ind) << "if((yych = *YYCURSOR) "; readCh = false; } else { - o << "\tif(yych "; + o << indent(ind) << "if(yych "; } o << cmp << " "; prtChOrHex(o, v); - o << ")"; -} - -void indent(std::ostream &o, uint i) -{ - while (i-- > 0) - { - o << "\t"; - } + o << ") "; } -static void need(std::ostream &o, uint n, bool & readCh, uint mask) +static void need(std::ostream &o, uint ind, uint n, bool & readCh, uint mask) { uint fillIndex; bool hasFillIndex = (0<=vFillIndexes); @@ -287,18 +290,18 @@ static void need(std::ostream &o, uint n, bool & readCh, uint mask) if ( hasFillIndex == true ) { fillIndex = vFillIndexes++; - o << "\tYYSETSTATE(" << fillIndex << ");\n"; + o << indent(ind) << "YYSETSTATE(" << fillIndex << ");\n"; ++oline; } if (n == 1) { - o << "\tif(YYLIMIT == YYCURSOR) YYFILL(1);\n"; + o << indent(ind) << "if(YYLIMIT == YYCURSOR) YYFILL(1);\n"; ++oline; } else { - o << "\tif((YYLIMIT - YYCURSOR) < " << n << ") YYFILL(" << n << ");\n"; + o << indent(ind) << "if((YYLIMIT - YYCURSOR) < " << n << ") YYFILL(" << n << ");\n"; ++oline; } @@ -308,26 +311,26 @@ static void need(std::ostream &o, uint n, bool & readCh, uint mask) ++oline; } - o << "\tyych = *YYCURSOR;\n"; + o << indent(ind) << "yych = *YYCURSOR;\n"; readCh = false; ++oline; } -void Match::emit(std::ostream &o, bool &readCh) +void Match::emit(std::ostream &o, uint ind, bool &readCh) const { if (state->link) { - o << "\t++YYCURSOR;\n"; + o << indent(ind) << "++YYCURSOR;\n"; } else if (!readAhead()) { /* do not read next char if match */ - o << "\t++YYCURSOR;\n"; + o << indent(ind) << "++YYCURSOR;\n"; readCh = true; } else { - o << "\tyych = *++YYCURSOR;\n"; + o << indent(ind) << "yych = *++YYCURSOR;\n"; readCh = false; } @@ -335,46 +338,46 @@ void Match::emit(std::ostream &o, bool &readCh) if (state->link) { - need(o, state->depth, readCh, 0); + need(o, ind, state->depth, readCh, 0); } } -void Enter::emit(std::ostream &o, bool &readCh) +void Enter::emit(std::ostream &o, uint ind, bool &readCh) const { if (state->link) { - o << "\t++YYCURSOR;\n"; + o << indent(ind) << "++YYCURSOR;\n"; o << "yy" << label << ":\n"; oline += 2; - need(o, state->depth, readCh, 0); + need(o, ind, state->depth, readCh, 0); } else { /* we shouldn't need 'rule-following' protection here */ - o << "\tyych = *++YYCURSOR;\n"; + o << indent(ind) << "yych = *++YYCURSOR;\n"; o << "yy" << label << ":\n"; oline += 2; readCh = false; } } -void Save::emit(std::ostream &o, bool &readCh) +void Save::emit(std::ostream &o, uint ind, bool &readCh) const { if (bUsedYYAccept) { - o << "\tyyaccept = " << selector << ";\n"; + o << indent(ind) << "yyaccept = " << selector << ";\n"; ++oline; } if (state->link) { - o << "\tYYMARKER = ++YYCURSOR;\n"; + o << indent(ind) << "YYMARKER = ++YYCURSOR;\n"; ++oline; - need(o, state->depth, readCh, 0); + need(o, ind, state->depth, readCh, 0); } else { - o << "\tyych = *(YYMARKER = ++YYCURSOR);\n"; + o << indent(ind) << "yych = *(YYMARKER = ++YYCURSOR);\n"; ++oline; readCh = false; } @@ -385,7 +388,7 @@ Move::Move(State *s) : Action(s) ; } -void Move::emit(std::ostream &o, bool &readCh) +void Move::emit(std::ostream &, uint, bool &) const { ; } @@ -396,7 +399,7 @@ Accept::Accept(State *x, uint n, uint *s, State **r) ; } -void Accept::emit(std::ostream &o, bool &readCh) +void Accept::emit(std::ostream &o, uint ind, bool &readCh) const { bool first = true; @@ -407,18 +410,18 @@ void Accept::emit(std::ostream &o, bool &readCh) { first = false; bUsedYYAccept = true; - o << "\tYYCURSOR = YYMARKER;\n"; - o << "\tswitch(yyaccept){\n"; + o << indent(ind) << "YYCURSOR = YYMARKER;\n"; + o << indent(ind) << "switch(yyaccept){\n"; oline += 2; } - o << "\tcase " << saves[i] << ":"; - genGoTo(o, state, rules[i], readCh); + o << indent(ind) << "case " << saves[i] << ":"; + genGoTo(o, 1, state, rules[i], readCh); } if (!first) { - o << "\t}\n"; + o << indent(ind) << "}\n"; ++oline; } } @@ -428,13 +431,13 @@ Rule::Rule(State *s, RuleOp *r) : Action(s), rule(r) ; } -void Rule::emit(std::ostream &o, bool &readCh) +void Rule::emit(std::ostream &o, uint ind, bool &readCh) const { uint back = rule->ctx->fixedLength(); if (back != ~0u && back > 0u) { - o << "\tYYCURSOR -= " << back << ";"; + o << indent(ind) << "YYCURSOR -= " << back << ";"; } o << "\n"; @@ -452,7 +455,7 @@ void Rule::emit(std::ostream &o, bool &readCh) } } -void doLinear(std::ostream &o, uint i, Span *s, uint n, const State *from, const State *next, bool &readCh, uint mask) +void doLinear(std::ostream &o, uint ind, Span *s, uint n, const State *from, const State *next, bool &readCh, uint mask) { for (;;) { @@ -464,21 +467,18 @@ void doLinear(std::ostream &o, uint i, Span *s, uint n, const State *from, const { if (!mask || (s[0].ub > 0x00FF)) { - indent(o, i); - genIf(o, "!=", s[0].ub, readCh); - genGoTo(o, from, bg, readCh); + genIf(o, ind, "!=", s[0].ub, readCh); + genGoTo(o, 0, from, bg, readCh); } - indent(o, i); - genGoTo(o, from, next, readCh); + genGoTo(o, ind, from, next, readCh); return ; } else { if (!mask || (s[0].ub > 0x00FF)) { - indent(o, i); - genIf(o, "==", s[0].ub, readCh); - genGoTo(o, from, s[1].to, readCh); + genIf(o, ind, "==", s[0].ub, readCh); + genGoTo(o, 0, from, s[1].to, readCh); } } @@ -489,8 +489,7 @@ void doLinear(std::ostream &o, uint i, Span *s, uint n, const State *from, const if (n == 1) { // if(bg != next){ - indent(o, i); - genGoTo(o, from, s[0].to, readCh); + genGoTo(o, ind, from, s[0].to, readCh); // } return ; } @@ -498,48 +497,50 @@ void doLinear(std::ostream &o, uint i, Span *s, uint n, const State *from, const { if (!mask || (s[0].ub > 0x00FF)) { - indent(o, i); - genIf(o, ">=", s[0].ub, readCh); - genGoTo(o, from, s[1].to, readCh); + genIf(o, ind, ">=", s[0].ub, readCh); + genGoTo(o, 0, from, s[1].to, readCh); } - indent(o, i); - genGoTo(o, from, next, readCh); + genGoTo(o, ind, from, next, readCh); return ; } else { if (!mask || ((s[0].ub - 1) > 0x00FF)) { - indent(o, i); - genIf(o, "<=", s[0].ub - 1, readCh); - genGoTo(o, from, bg, readCh); + genIf(o, ind, "<=", s[0].ub - 1, readCh); + genGoTo(o, 0, from, bg, readCh); } n -= 1; s += 1; } } - indent(o, i); - genGoTo(o, from, next, readCh); + genGoTo(o, ind, from, next, readCh); } -void Go::genLinear(std::ostream &o, const State *from, const State *next, bool &readCh, uint mask) const +void Go::genLinear(std::ostream &o, uint ind, const State *from, const State *next, bool &readCh, uint mask) const { - doLinear(o, 0, span, nSpans, from, next, readCh, mask); + doLinear(o, ind, span, nSpans, from, next, readCh, mask); } -void genCases(std::ostream &o, uint lb, Span *s) +void genCases(std::ostream &o, uint ind, uint lb, Span *s, bool &newLine) { + if (!newLine) + { + o << "\n"; + } + newLine = true; if (lb < s->ub) { for (;;) { - o << "\tcase "; + o << indent(ind) << "case "; prtChOrHex(o, lb); o << ":"; if (++lb == s->ub) { + newLine = false; break; } @@ -549,11 +550,13 @@ void genCases(std::ostream &o, uint lb, Span *s) } } -void Go::genSwitch(std::ostream &o, const State *from, const State *next, bool &readCh, uint mask) const +void Go::genSwitch(std::ostream &o, uint ind, const State *from, const State *next, bool &readCh, uint mask) const { + bool newLine = true; + if (nSpans <= 2) { - genLinear(o, from, next, readCh, mask); + genLinear(o, ind, from, next, readCh, mask); } else { @@ -572,17 +575,17 @@ void Go::genSwitch(std::ostream &o, const State *from, const State *next, bool & if (dFlag) { - o << "\tYYDEBUG(-1, yych);\n"; + o << indent(ind) << "YYDEBUG(-1, yych);\n"; } if (readCh) { - o << "\tswitch((yych = *YYCURSOR)) {\n"; + o << indent(ind) << "switch((yych = *YYCURSOR)) {\n"; readCh = false; } else { - o << "\tswitch(yych){\n"; + o << indent(ind) << "switch(yych){\n"; } ++oline; @@ -592,9 +595,13 @@ void Go::genSwitch(std::ostream &o, const State *from, const State *next, bool & r = s = &sP[0]; if (*s == &span[0]) - genCases(o, 0, *s); + { + genCases(o, ind, 0, *s, newLine); + } else - genCases(o, (*s)[ -1].ub, *s); + { + genCases(o, ind, (*s)[ -1].ub, *s, newLine); + } State *to = (*s)->to; @@ -602,7 +609,7 @@ void Go::genSwitch(std::ostream &o, const State *from, const State *next, bool & { if ((*s)->to == to) { - genCases(o, (*s)[ -1].ub, *s); + genCases(o, ind, (*s)[ -1].ub, *s, newLine); } else { @@ -610,49 +617,47 @@ void Go::genSwitch(std::ostream &o, const State *from, const State *next, bool & } } - genGoTo(o, from, to, readCh); + genGoTo(o, newLine ? ind+1 : 1, from, to, readCh); + newLine = true; t = r; } - o << "\tdefault:"; - genGoTo(o, from, def, readCh); - o << "\t}\n"; + o << indent(ind) << "default:"; + genGoTo(o, 1, from, def, readCh); + o << indent(ind) << "}\n"; ++oline; delete [] sP; } } -void doBinary(std::ostream &o, uint i, Span *s, uint n, const State *from, const State *next, bool &readCh, uint mask) +void doBinary(std::ostream &o, uint ind, Span *s, uint n, const State *from, const State *next, bool &readCh, uint mask) { if (n <= 4) { - doLinear(o, i, s, n, from, next, readCh, mask); + doLinear(o, ind, s, n, from, next, readCh, mask); } else { uint h = n / 2; - indent(o, i); - genIf(o, "<=", s[h - 1].ub - 1, readCh); + genIf(o, ind, "<=", s[h - 1].ub - 1, readCh); o << "{\n"; ++oline; - doBinary(o, i + 1, &s[0], h, from, next, readCh, mask); - indent(o, i); - o << "\t} else {\n"; + doBinary(o, ind+1, &s[0], h, from, next, readCh, mask); + o << indent(ind) << "} else {\n"; ++oline; - doBinary(o, i + 1, &s[h], n - h, from, next, readCh, mask); - indent(o, i); - o << "\t}\n"; + doBinary(o, ind+1, &s[h], n - h, from, next, readCh, mask); + o << indent(ind) << "}\n"; ++oline; } } -void Go::genBinary(std::ostream &o, const State *from, const State *next, bool &readCh, uint mask) const +void Go::genBinary(std::ostream &o, uint ind, const State *from, const State *next, bool &readCh, uint mask) const { - doBinary(o, 0, span, nSpans, from, next, readCh, mask); + doBinary(o, ind, span, nSpans, from, next, readCh, mask); } -void Go::genBase(std::ostream &o, const State *from, const State *next, bool &readCh, uint mask) const +void Go::genBase(std::ostream &o, uint ind, const State *from, const State *next, bool &readCh, uint mask) const { if (nSpans == 0) { @@ -661,7 +666,7 @@ void Go::genBase(std::ostream &o, const State *from, const State *next, bool &re if (!sFlag) { - genSwitch(o, from, next, readCh, mask); + genSwitch(o, ind, from, next, readCh, mask); return ; } @@ -688,22 +693,22 @@ void Go::genBase(std::ostream &o, const State *from, const State *next, bool &re if (util <= 2) { - genSwitch(o, from, next, readCh, mask); + genSwitch(o, ind, from, next, readCh, mask); return ; } } if (nSpans > 5) { - genBinary(o, from, next, readCh, mask); + genBinary(o, ind, from, next, readCh, mask); } else { - genLinear(o, from, next, readCh, mask); + genLinear(o, ind, from, next, readCh, mask); } } -void Go::genGoto(std::ostream &o, const State *from, const State *next, bool &readCh) +void Go::genGoto(std::ostream &o, uint ind, const State *from, const State *next, bool &readCh) { if (bFlag) { @@ -725,34 +730,34 @@ void Go::genGoto(std::ostream &o, const State *from, const State *next, bool &re { if (readCh) { - o << "\tyych = *YYCURSOR;\n"; + o << indent(ind) << "yych = *YYCURSOR;\n"; oline++; readCh = false; } sYych = "yych"; - o << "\tif (yyh & 0xFF00) {\n"; + o << indent(ind) << "if(yyh & 0xFF00) {\n"; oline++; /* here we need to reduce to those having high byte set */ - genBase(o, from, next, readCh, 1); - o << "\t} else "; + genBase(o, ind+1, from, next, readCh, 1); + o << indent(ind) << "} else "; } else if (readCh) { sYych = "(yych = *YYCURSOR)"; readCh = false; - o << "\t"; + o << indent(ind); } else { sYych = "yych"; - o << "\t"; + o << indent(ind); } o << "if(yybm[" << b->i << "+" << sYych << "] & " << (uint) b->m << ") {\n"; oline++; - genGoTo(o, from, to, readCh, "\t\t"); - o << "\t}\n"; + genGoTo(o, ind+1, from, to, readCh); + o << indent(ind) << "}\n"; oline++; - go.genBase(o, from, next, readCh, 0); + go.genBase(o, ind, from, next, readCh, 0); delete [] go.span; return ; } @@ -760,10 +765,10 @@ void Go::genGoto(std::ostream &o, const State *from, const State *next, bool &re } } - genBase(o, from, next, readCh, 0); + genBase(o, ind, from, next, readCh, 0); } -void State::emit(std::ostream &o, bool &readCh) +void State::emit(std::ostream &o, uint ind, bool &readCh) const { if (vUsedLabels.contains(label)) { @@ -771,9 +776,10 @@ void State::emit(std::ostream &o, bool &readCh) } if (dFlag) { - o << "\n\tYYDEBUG(" << label << ", *YYCURSOR);\n"; + o << "\n" << indent(ind) << "YYDEBUG(" << label << ", *YYCURSOR);\n"; + oline += 2; } - action->emit(o, readCh); + action->emit(o, ind, readCh); } uint merge(Span *x0, State *fg, State *bg) @@ -1075,7 +1081,7 @@ void DFA::emit(std::ostream &o) { static uint label = 0; State *s; - uint i, bitmap_brace = 0; + uint i, ind = 0, bitmap_brace = 0; bool hasFillLabels = (0<=vFillIndexes); if (hasFillLabels==true && label!=0) @@ -1211,10 +1217,10 @@ void DFA::emit(std::ostream &o) if (bFlag) { - o << "{\n"; + o << indent(ind++) << "{\n"; ++oline; bitmap_brace = 1; - BitMap::gen(o, lbChar, ubChar <= 256 ? ubChar : 256); + BitMap::gen(o, ind, lbChar, ubChar <= 256 ? ubChar : 256); } bUsedYYAccept = false; @@ -1237,8 +1243,8 @@ void DFA::emit(std::ostream &o) for (s = head; s; s = s->next) { bool readCh = false; - s->emit(noWhere, readCh); - s->go.genGoto(noWhere, s, s->next, readCh); + s->emit(noWhere, ind, readCh); + s->go.genGoto(noWhere, ind, s, s->next, readCh); } maxFillIndexes = vFillIndexes; vFillIndexes = orgVFillIndexes; @@ -1253,39 +1259,40 @@ void DFA::emit(std::ostream &o) if ( hasFillLabels == false ) { - o << "{\n\tYYCTYPE yych;\n"; + o << indent(ind++) << "{\n"; + o << indent(ind) << "YYCTYPE yych;\n"; oline += 2; if (bUsedYYAccept) { - o << "\tunsigned int yyaccept = 0;\n"; + o << indent(ind) << "unsigned int yyaccept = 0;\n"; oline++; } } else { - o << "{\n\n"; + o << indent(ind++) << "{\n\n"; oline += 2; } if ( hasFillLabels == false ) { - o << "\tgoto yy" << start_label << ";\n"; + o << indent(ind) << "goto yy" << start_label << ";\n"; ++oline; } if (hasFillLabels == true ) { - o << " switch(YYGETSTATE())\n"; - o << " {\n"; - o << " case -1: goto yy0;\n"; + o << indent(ind) << "switch(YYGETSTATE())\n"; + o << indent(ind) << "{\n"; + o << indent(ind) << "case -1: goto yy0;\n"; for (size_t i=0; inext) { bool readCh = false; - s->emit(o, readCh); - s->go.genGoto(o, s, s->next, readCh); + s->emit(o, ind, readCh); + s->go.genGoto(o, ind, s, s->next, readCh); } - o << "}\n"; + o << indent(--ind) << "}\n"; if (bitmap_brace) { - o << "}\n"; + o << indent(--ind) << "}\n"; ++oline; } ++oline; diff --git a/code.h b/code.h index c8d0c1f3..89ea7f8e 100755 --- a/code.h +++ b/code.h @@ -22,7 +22,7 @@ public: public: static const BitMap *find(const Go*, const State*); static const BitMap *find(const State*); - static void gen(std::ostream&, uint, uint); + static void gen(std::ostream&, uint ind, uint, uint); static void stats(); BitMap(const Go*, const State*); ~BitMap(); diff --git a/dfa.h b/dfa.h index 821bdab9..7375e83f 100644 --- a/dfa.h +++ b/dfa.h @@ -24,7 +24,7 @@ public: public: Action(State*); - virtual void emit(std::ostream&, bool&) = 0; + virtual void emit(std::ostream&, uint, bool&) const = 0; virtual bool isRule() const; virtual bool isMatch() const; virtual bool readAhead() const; @@ -35,7 +35,7 @@ class Match: public Action public: Match(State*); - void emit(std::ostream&, bool&); + void emit(std::ostream&, uint, bool&) const; bool isMatch() const; }; @@ -47,7 +47,7 @@ public: public: Enter(State*, uint); - void emit(std::ostream&, bool&); + void emit(std::ostream&, uint, bool&) const; }; class Save: public Match @@ -58,7 +58,7 @@ public: public: Save(State*, uint); - void emit(std::ostream&, bool&); + void emit(std::ostream&, uint, bool&) const; bool isMatch() const; }; @@ -67,7 +67,7 @@ class Move: public Action public: Move(State*); - void emit(std::ostream&, bool&); + void emit(std::ostream&, uint, bool&) const; }; class Accept: public Action @@ -80,7 +80,7 @@ public: public: Accept(State*, uint, uint*, State**); - void emit(std::ostream&, bool&); + void emit(std::ostream&, uint, bool&) const; }; class Rule: public Action @@ -91,7 +91,7 @@ public: public: Rule(State*, RuleOp*); - void emit(std::ostream&, bool&); + void emit(std::ostream&, uint, bool&) const; bool isRule() const; }; @@ -114,11 +114,11 @@ public: Span *span; public: - void genGoto( std::ostream&, const State *from, const State *next, bool &readCh); - void genBase( std::ostream&, const State *from, const State *next, bool &readCh, uint mask) const; - void genLinear(std::ostream&, const State *from, const State *next, bool &readCh, uint mask) const; - void genBinary(std::ostream&, const State *from, const State *next, bool &readCh, uint mask) const; - void genSwitch(std::ostream&, const State *from, const State *next, bool &readCh, uint mask) const; + void genGoto( std::ostream&, uint ind, const State *from, const State *next, bool &readCh); + void genBase( std::ostream&, uint ind, const State *from, const State *next, bool &readCh, uint mask) const; + void genLinear(std::ostream&, uint ind, const State *from, const State *next, bool &readCh, uint mask) const; + void genBinary(std::ostream&, uint ind, const State *from, const State *next, bool &readCh, uint mask) const; + void genSwitch(std::ostream&, uint ind, const State *from, const State *next, bool &readCh, uint mask) const; void compact(); void unmap(Go*, const State*); }; @@ -142,7 +142,7 @@ public: public: State(); ~State(); - void emit(std::ostream&, bool&); + void emit(std::ostream&, uint, bool&) const; friend std::ostream& operator<<(std::ostream&, const State&); friend std::ostream& operator<<(std::ostream&, const State*); }; diff --git a/test/bug1054496.c b/test/bug1054496.c index af43f826..d0a0eab8 100755 --- a/test/bug1054496.c +++ b/test/bug1054496.c @@ -35,7 +35,8 @@ yy0: } yy2: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case 'A': case 'a': goto yy7; + case 'A': + case 'a': goto yy7; case 'B': case 'C': case 'D': @@ -60,7 +61,8 @@ yy2: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'b': + case 'Z': + case 'b': case 'c': case 'd': case 'e': @@ -126,7 +128,8 @@ yy7: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -188,7 +191,8 @@ yy10: switch(yych){ case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': diff --git a/test/bug1163046.c b/test/bug1163046.c index 9827759d..faba9e7e 100755 --- a/test/bug1163046.c +++ b/test/bug1163046.c @@ -33,7 +33,8 @@ yy0: yy2: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case 'T': case 't': goto yy7; + case 'T': + case 't': goto yy7; default: goto yy3; } yy3: @@ -50,7 +51,8 @@ yy6: #line 51 "" yy7: yych = *++YYCURSOR; switch(yych){ - case 'H': case 'h': goto yy9; + case 'H': + case 'h': goto yy9; default: goto yy8; } yy8: YYCURSOR = YYMARKER; @@ -59,12 +61,14 @@ yy8: YYCURSOR = YYMARKER; } yy9: yych = *++YYCURSOR; switch(yych){ - case 'I': case 'i': goto yy10; + case 'I': + case 'i': goto yy10; default: goto yy8; } yy10: yych = *++YYCURSOR; switch(yych){ - case 'S': case 's': goto yy11; + case 'S': + case 's': goto yy11; default: goto yy8; } yy11: yych = *++YYCURSOR; @@ -74,22 +78,26 @@ yy11: yych = *++YYCURSOR; } yy12: yych = *++YYCURSOR; switch(yych){ - case 'F': case 'f': goto yy13; + case 'F': + case 'f': goto yy13; default: goto yy8; } yy13: yych = *++YYCURSOR; switch(yych){ - case 'I': case 'i': goto yy14; + case 'I': + case 'i': goto yy14; default: goto yy8; } yy14: yych = *++YYCURSOR; switch(yych){ - case 'L': case 'l': goto yy15; + case 'L': + case 'l': goto yy15; default: goto yy8; } yy15: yych = *++YYCURSOR; switch(yych){ - case 'E': case 'e': goto yy16; + case 'E': + case 'e': goto yy16; default: goto yy8; } yy16: yych = *++YYCURSOR; @@ -99,22 +107,26 @@ yy16: yych = *++YYCURSOR; } yy17: yych = *++YYCURSOR; switch(yych){ - case 'M': case 'm': goto yy18; + case 'M': + case 'm': goto yy18; default: goto yy8; } yy18: yych = *++YYCURSOR; switch(yych){ - case 'U': case 'u': goto yy19; + case 'U': + case 'u': goto yy19; default: goto yy8; } yy19: yych = *++YYCURSOR; switch(yych){ - case 'S': case 's': goto yy20; + case 'S': + case 's': goto yy20; default: goto yy8; } yy20: yych = *++YYCURSOR; switch(yych){ - case 'T': case 't': goto yy21; + case 'T': + case 't': goto yy21; default: goto yy8; } yy21: yych = *++YYCURSOR; @@ -124,12 +136,14 @@ yy21: yych = *++YYCURSOR; } yy22: yych = *++YYCURSOR; switch(yych){ - case 'B': case 'b': goto yy23; + case 'B': + case 'b': goto yy23; default: goto yy8; } yy23: yych = *++YYCURSOR; switch(yych){ - case 'E': case 'e': goto yy24; + case 'E': + case 'e': goto yy24; default: goto yy8; } yy24: yych = *++YYCURSOR; @@ -139,47 +153,56 @@ yy24: yych = *++YYCURSOR; } yy25: yych = *++YYCURSOR; switch(yych){ - case 'C': case 'c': goto yy26; + case 'C': + case 'c': goto yy26; default: goto yy8; } yy26: yych = *++YYCURSOR; switch(yych){ - case 'O': case 'o': goto yy27; + case 'O': + case 'o': goto yy27; default: goto yy8; } yy27: yych = *++YYCURSOR; switch(yych){ - case 'N': case 'n': goto yy28; + case 'N': + case 'n': goto yy28; default: goto yy8; } yy28: yych = *++YYCURSOR; switch(yych){ - case 'V': case 'v': goto yy29; + case 'V': + case 'v': goto yy29; default: goto yy8; } yy29: yych = *++YYCURSOR; switch(yych){ - case 'E': case 'e': goto yy30; + case 'E': + case 'e': goto yy30; default: goto yy8; } yy30: yych = *++YYCURSOR; switch(yych){ - case 'R': case 'r': goto yy31; + case 'R': + case 'r': goto yy31; default: goto yy8; } yy31: yych = *++YYCURSOR; switch(yych){ - case 'T': case 't': goto yy32; + case 'T': + case 't': goto yy32; default: goto yy8; } yy32: yych = *++YYCURSOR; switch(yych){ - case 'E': case 'e': goto yy33; + case 'E': + case 'e': goto yy33; default: goto yy8; } yy33: yych = *++YYCURSOR; switch(yych){ - case 'D': case 'd': goto yy34; + case 'D': + case 'd': goto yy34; default: goto yy8; } yy34: yych = *++YYCURSOR; @@ -189,22 +212,26 @@ yy34: yych = *++YYCURSOR; } yy35: yych = *++YYCURSOR; switch(yych){ - case 'W': case 'w': goto yy36; + case 'W': + case 'w': goto yy36; default: goto yy8; } yy36: yych = *++YYCURSOR; switch(yych){ - case 'I': case 'i': goto yy37; + case 'I': + case 'i': goto yy37; default: goto yy8; } yy37: yych = *++YYCURSOR; switch(yych){ - case 'T': case 't': goto yy38; + case 'T': + case 't': goto yy38; default: goto yy8; } yy38: yych = *++YYCURSOR; switch(yych){ - case 'H': case 'h': goto yy39; + case 'H': + case 'h': goto yy39; default: goto yy8; } yy39: yych = *++YYCURSOR; @@ -214,32 +241,38 @@ yy39: yych = *++YYCURSOR; } yy40: yych = *++YYCURSOR; switch(yych){ - case 'B': case 'b': goto yy41; + case 'B': + case 'b': goto yy41; default: goto yy8; } yy41: yych = *++YYCURSOR; switch(yych){ - case 'I': case 'i': goto yy42; + case 'I': + case 'i': goto yy42; default: goto yy8; } yy42: yych = *++YYCURSOR; switch(yych){ - case 'N': case 'n': goto yy43; + case 'N': + case 'n': goto yy43; default: goto yy8; } yy43: yych = *++YYCURSOR; switch(yych){ - case 'H': case 'h': goto yy44; + case 'H': + case 'h': goto yy44; default: goto yy8; } yy44: yych = *++YYCURSOR; switch(yych){ - case 'E': case 'e': goto yy45; + case 'E': + case 'e': goto yy45; default: goto yy8; } yy45: yych = *++YYCURSOR; switch(yych){ - case 'X': case 'x': goto yy46; + case 'X': + case 'x': goto yy46; default: goto yy8; } yy46: yych = *++YYCURSOR; diff --git a/test/bug1187785.c b/test/bug1187785.c index 952d9e0a..913f0b8c 100755 --- a/test/bug1187785.c +++ b/test/bug1187785.c @@ -69,7 +69,8 @@ yy2: yyaccept = 0; case 0x1E: case 0x1F: case ' ': - case '!': case '#': + case '!': + case '#': case '$': case '%': case '&': @@ -335,7 +336,8 @@ yy6: switch(yych){ case 0x1E: case 0x1F: case ' ': - case '!': case '#': + case '!': + case '#': case '$': case '%': case '&': diff --git a/test/bug1390174.c b/test/bug1390174.c index 80a14ad6..b58df133 100755 --- a/test/bug1390174.c +++ b/test/bug1390174.c @@ -26,14 +26,16 @@ yy0: yych = *YYCURSOR; switch(yych){ case 0x0A: goto yy4; - case 'A': case 'a': goto yy2; + case 'A': + case 'a': goto yy2; default: goto yy6; } yy2: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ case 0x0A: goto yy7; - case 'A': case 'a': goto yy8; + case 'A': + case 'a': goto yy8; default: goto yy3; } yy3: @@ -56,7 +58,8 @@ yy8: ++YYCURSOR; goto yy9; yy9: switch(yych){ case 0x0A: goto yy7; - case 'A': case 'a': goto yy8; + case 'A': + case 'a': goto yy8; default: goto yy10; } yy10: YYCURSOR = YYMARKER; diff --git a/test/c.c b/test/c.c index 88c89005..f8c93ed3 100644 --- a/test/c.c +++ b/test/c.c @@ -136,8 +136,10 @@ yy0: if((YYLIMIT - YYCURSOR) < 9) YYFILL(9); yych = *YYCURSOR; switch(yych){ - case 0x09: case 0x0B: - case 0x0C: case ' ': goto yy73; + case 0x09: + case 0x0B: + case 0x0C: + case ' ': goto yy73; case 0x0A: goto yy75; case '!': goto yy49; case '"': goto yy28; @@ -193,12 +195,17 @@ yy0: case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'h': case 'j': - case 'k': case 'm': + case 'Z': + case '_': + case 'h': + case 'j': + case 'k': + case 'm': case 'n': case 'o': case 'p': - case 'q': case 'x': + case 'q': + case 'x': case 'y': case 'z': goto yy20; case '[': goto yy65; @@ -329,8 +336,12 @@ yy20: yych = *++YYCURSOR; yy21: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case 'L': case 'U': case 'l': case 'u': goto yy155; - case 'X': case 'x': goto yy172; + case 'L': + case 'U': + case 'l': + case 'u': goto yy155; + case 'X': + case 'x': goto yy172; default: goto yy171; } yy22: @@ -575,8 +586,10 @@ yy78: ++YYCURSOR; yych = *YYCURSOR; goto yy79; yy79: switch(yych){ - case 0x09: case 0x0B: - case 0x0C: case ' ': goto yy78; + case 0x09: + case 0x0B: + case 0x0C: + case ' ': goto yy78; default: goto yy74; } yy80: ++YYCURSOR; @@ -726,8 +739,17 @@ yy123: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '"': case '\'': case '?': case '\\': case 'a': - case 'b': case 'f': case 'n': case 'r': case 't': case 'v': goto yy120; + case '"': + case '\'': + case '?': + case '\\': + case 'a': + case 'b': + case 'f': + case 'n': + case 'r': + case 't': + case 'v': goto yy120; case '0': case '1': case '2': @@ -758,12 +780,14 @@ yy126: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -805,12 +829,14 @@ yy130: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -840,8 +866,12 @@ yy133: switch(yych){ case '7': case '8': case '9': goto yy132; - case 'E': case 'e': goto yy135; - case 'F': case 'L': case 'f': case 'l': goto yy136; + case 'E': + case 'e': goto yy135; + case 'F': + case 'L': + case 'f': + case 'l': goto yy136; default: goto yy134; } yy134: @@ -850,7 +880,8 @@ yy134: #line 851 "" yy135: yych = *++YYCURSOR; switch(yych){ - case '+': case '-': goto yy137; + case '+': + case '-': goto yy137; case '0': case '1': case '2': @@ -894,7 +925,10 @@ yy139: switch(yych){ case '7': case '8': case '9': goto yy138; - case 'F': case 'L': case 'f': case 'l': goto yy136; + case 'F': + case 'L': + case 'f': + case 'l': goto yy136; default: goto yy134; } yy140: ++YYCURSOR; @@ -917,8 +951,17 @@ yy144: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '"': case '\'': case '?': case '\\': case 'a': - case 'b': case 'f': case 'n': case 'r': case 't': case 'v': goto yy142; + case '"': + case '\'': + case '?': + case '\\': + case 'a': + case 'b': + case 'f': + case 'n': + case 'r': + case 't': + case 'v': goto yy142; case '0': case '1': case '2': @@ -945,12 +988,14 @@ yy146: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -992,12 +1037,14 @@ yy150: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -1009,7 +1056,8 @@ yy150: switch(yych){ yy151: yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case 'E': case 'e': goto yy162; + case 'E': + case 'e': goto yy162; default: goto yy161; } yy152: yyaccept = 0; @@ -1029,13 +1077,18 @@ yy153: switch(yych){ case '7': case '8': case '9': goto yy152; - case 'E': case 'e': goto yy154; - case 'L': case 'U': case 'l': case 'u': goto yy155; + case 'E': + case 'e': goto yy154; + case 'L': + case 'U': + case 'l': + case 'u': goto yy155; default: goto yy22; } yy154: yych = *++YYCURSOR; switch(yych){ - case '+': case '-': goto yy157; + case '+': + case '-': goto yy157; case '0': case '1': case '2': @@ -1053,7 +1106,10 @@ yy155: ++YYCURSOR; yych = *YYCURSOR; goto yy156; yy156: switch(yych){ - case 'L': case 'U': case 'l': case 'u': goto yy155; + case 'L': + case 'U': + case 'l': + case 'u': goto yy155; default: goto yy22; } yy157: yych = *++YYCURSOR; @@ -1085,7 +1141,10 @@ yy159: switch(yych){ case '7': case '8': case '9': goto yy158; - case 'F': case 'L': case 'f': case 'l': goto yy136; + case 'F': + case 'L': + case 'f': + case 'l': goto yy136; default: goto yy134; } yy160: yyaccept = 3; @@ -1104,13 +1163,18 @@ yy161: switch(yych){ case '7': case '8': case '9': goto yy160; - case 'E': case 'e': goto yy166; - case 'F': case 'L': case 'f': case 'l': goto yy136; + case 'E': + case 'e': goto yy166; + case 'F': + case 'L': + case 'f': + case 'l': goto yy136; default: goto yy134; } yy162: yych = *++YYCURSOR; switch(yych){ - case '+': case '-': goto yy163; + case '+': + case '-': goto yy163; case '0': case '1': case '2': @@ -1152,12 +1216,16 @@ yy165: switch(yych){ case '7': case '8': case '9': goto yy164; - case 'F': case 'L': case 'f': case 'l': goto yy136; + case 'F': + case 'L': + case 'f': + case 'l': goto yy136; default: goto yy134; } yy166: yych = *++YYCURSOR; switch(yych){ - case '+': case '-': goto yy167; + case '+': + case '-': goto yy167; case '0': case '1': case '2': @@ -1199,7 +1267,10 @@ yy169: switch(yych){ case '7': case '8': case '9': goto yy168; - case 'F': case 'L': case 'f': case 'l': goto yy136; + case 'F': + case 'L': + case 'f': + case 'l': goto yy136; default: goto yy134; } yy170: yyaccept = 0; @@ -1219,8 +1290,12 @@ yy171: switch(yych){ case '7': case '8': case '9': goto yy170; - case 'E': case 'e': goto yy154; - case 'L': case 'U': case 'l': case 'u': goto yy177; + case 'E': + case 'e': goto yy154; + case 'L': + case 'U': + case 'l': + case 'u': goto yy177; default: goto yy22; } yy172: yych = *++YYCURSOR; @@ -1234,12 +1309,14 @@ yy172: yych = *++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -1261,18 +1338,23 @@ yy174: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': goto yy173; - case 'L': case 'U': case 'l': case 'u': goto yy175; + case 'L': + case 'U': + case 'l': + case 'u': goto yy175; default: goto yy22; } yy175: ++YYCURSOR; @@ -1280,7 +1362,10 @@ yy175: ++YYCURSOR; yych = *YYCURSOR; goto yy176; yy176: switch(yych){ - case 'L': case 'U': case 'l': case 'u': goto yy175; + case 'L': + case 'U': + case 'l': + case 'u': goto yy175; default: goto yy22; } yy177: ++YYCURSOR; @@ -1288,7 +1373,10 @@ yy177: ++YYCURSOR; yych = *YYCURSOR; goto yy178; yy178: switch(yych){ - case 'L': case 'U': case 'l': case 'u': goto yy177; + case 'L': + case 'U': + case 'l': + case 'u': goto yy177; default: goto yy22; } yy179: ++YYCURSOR; @@ -1305,7 +1393,8 @@ yy180: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1330,7 +1419,9 @@ yy180: switch(yych){ case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1384,7 +1475,8 @@ yy184: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1409,7 +1501,9 @@ yy184: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1488,7 +1582,8 @@ yy193: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1513,7 +1608,9 @@ yy193: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1556,7 +1653,8 @@ yy195: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1581,7 +1679,9 @@ yy195: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1660,7 +1760,8 @@ yy204: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1685,7 +1786,9 @@ yy204: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1733,7 +1836,8 @@ yy207: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1758,7 +1862,9 @@ yy207: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1826,7 +1932,8 @@ yy214: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1851,7 +1958,9 @@ yy214: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1931,7 +2040,8 @@ yy223: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1956,7 +2066,9 @@ yy223: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2019,7 +2131,8 @@ yy229: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2044,7 +2157,9 @@ yy229: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2097,7 +2212,8 @@ yy233: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2122,7 +2238,9 @@ yy233: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2185,7 +2303,8 @@ yy239: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2210,7 +2329,9 @@ yy239: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2263,7 +2384,8 @@ yy243: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2288,7 +2410,9 @@ yy243: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2341,7 +2465,8 @@ yy247: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2366,7 +2491,9 @@ yy247: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2435,7 +2562,8 @@ yy254: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2460,7 +2588,9 @@ yy254: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2523,7 +2653,8 @@ yy260: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2548,7 +2679,9 @@ yy260: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2601,7 +2734,8 @@ yy264: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2626,7 +2760,9 @@ yy264: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2669,7 +2805,8 @@ yy266: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2694,7 +2831,9 @@ yy266: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2742,7 +2881,8 @@ yy269: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2767,7 +2907,9 @@ yy269: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2820,7 +2962,8 @@ yy273: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2845,7 +2988,9 @@ yy273: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2898,7 +3043,8 @@ yy277: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2923,7 +3069,9 @@ yy277: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2976,7 +3124,8 @@ yy281: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3001,7 +3150,9 @@ yy281: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3074,7 +3225,8 @@ yy289: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3099,7 +3251,9 @@ yy289: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3147,7 +3301,8 @@ yy292: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3172,7 +3327,9 @@ yy292: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3220,7 +3377,8 @@ yy295: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3245,7 +3403,9 @@ yy295: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3293,7 +3453,8 @@ yy298: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3318,7 +3479,9 @@ yy298: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3337,7 +3500,8 @@ yy298: ++YYCURSOR; case 'q': case 'r': case 's': - case 't': case 'v': + case 't': + case 'v': case 'w': case 'x': case 'y': @@ -3375,7 +3539,8 @@ yy303: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3400,7 +3565,9 @@ yy303: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3463,7 +3630,8 @@ yy309: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3488,7 +3656,9 @@ yy309: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3577,7 +3747,8 @@ yy320: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3602,7 +3773,9 @@ yy320: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3645,7 +3818,8 @@ yy322: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3670,7 +3844,9 @@ yy322: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3718,7 +3894,8 @@ yy325: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3743,7 +3920,9 @@ yy325: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3791,7 +3970,8 @@ yy328: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3816,7 +3996,9 @@ yy328: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3874,7 +4056,8 @@ yy333: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3899,7 +4082,9 @@ yy333: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3952,7 +4137,8 @@ yy337: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3977,7 +4163,9 @@ yy337: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': diff --git a/test/cmmap.c b/test/cmmap.c index 5217b69b..3edc2d75 100644 --- a/test/cmmap.c +++ b/test/cmmap.c @@ -119,8 +119,10 @@ yy0: if((YYLIMIT - YYCURSOR) < 9) YYFILL(9); yych = *YYCURSOR; switch(yych){ - case 0x09: case 0x0B: - case 0x0C: case ' ': goto yy73; + case 0x09: + case 0x0B: + case 0x0C: + case ' ': goto yy73; case 0x0A: goto yy75; case '!': goto yy49; case '"': goto yy28; @@ -176,12 +178,17 @@ yy0: case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'h': case 'j': - case 'k': case 'm': + case 'Z': + case '_': + case 'h': + case 'j': + case 'k': + case 'm': case 'n': case 'o': case 'p': - case 'q': case 'x': + case 'q': + case 'x': case 'y': case 'z': goto yy20; case '[': goto yy65; @@ -312,8 +319,12 @@ yy20: yych = *++YYCURSOR; yy21: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case 'L': case 'U': case 'l': case 'u': goto yy155; - case 'X': case 'x': goto yy172; + case 'L': + case 'U': + case 'l': + case 'u': goto yy155; + case 'X': + case 'x': goto yy172; default: goto yy171; } yy22: @@ -558,8 +569,10 @@ yy78: ++YYCURSOR; yych = *YYCURSOR; goto yy79; yy79: switch(yych){ - case 0x09: case 0x0B: - case 0x0C: case ' ': goto yy78; + case 0x09: + case 0x0B: + case 0x0C: + case ' ': goto yy78; default: goto yy74; } yy80: ++YYCURSOR; @@ -709,8 +722,17 @@ yy123: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '"': case '\'': case '?': case '\\': case 'a': - case 'b': case 'f': case 'n': case 'r': case 't': case 'v': goto yy120; + case '"': + case '\'': + case '?': + case '\\': + case 'a': + case 'b': + case 'f': + case 'n': + case 'r': + case 't': + case 'v': goto yy120; case '0': case '1': case '2': @@ -741,12 +763,14 @@ yy126: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -788,12 +812,14 @@ yy130: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -823,8 +849,12 @@ yy133: switch(yych){ case '7': case '8': case '9': goto yy132; - case 'E': case 'e': goto yy135; - case 'F': case 'L': case 'f': case 'l': goto yy136; + case 'E': + case 'e': goto yy135; + case 'F': + case 'L': + case 'f': + case 'l': goto yy136; default: goto yy134; } yy134: @@ -833,7 +863,8 @@ yy134: #line 834 "" yy135: yych = *++YYCURSOR; switch(yych){ - case '+': case '-': goto yy137; + case '+': + case '-': goto yy137; case '0': case '1': case '2': @@ -877,7 +908,10 @@ yy139: switch(yych){ case '7': case '8': case '9': goto yy138; - case 'F': case 'L': case 'f': case 'l': goto yy136; + case 'F': + case 'L': + case 'f': + case 'l': goto yy136; default: goto yy134; } yy140: ++YYCURSOR; @@ -900,8 +934,17 @@ yy144: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '"': case '\'': case '?': case '\\': case 'a': - case 'b': case 'f': case 'n': case 'r': case 't': case 'v': goto yy142; + case '"': + case '\'': + case '?': + case '\\': + case 'a': + case 'b': + case 'f': + case 'n': + case 'r': + case 't': + case 'v': goto yy142; case '0': case '1': case '2': @@ -928,12 +971,14 @@ yy146: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -975,12 +1020,14 @@ yy150: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -992,7 +1039,8 @@ yy150: switch(yych){ yy151: yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case 'E': case 'e': goto yy162; + case 'E': + case 'e': goto yy162; default: goto yy161; } yy152: yyaccept = 0; @@ -1012,13 +1060,18 @@ yy153: switch(yych){ case '7': case '8': case '9': goto yy152; - case 'E': case 'e': goto yy154; - case 'L': case 'U': case 'l': case 'u': goto yy155; + case 'E': + case 'e': goto yy154; + case 'L': + case 'U': + case 'l': + case 'u': goto yy155; default: goto yy22; } yy154: yych = *++YYCURSOR; switch(yych){ - case '+': case '-': goto yy157; + case '+': + case '-': goto yy157; case '0': case '1': case '2': @@ -1036,7 +1089,10 @@ yy155: ++YYCURSOR; yych = *YYCURSOR; goto yy156; yy156: switch(yych){ - case 'L': case 'U': case 'l': case 'u': goto yy155; + case 'L': + case 'U': + case 'l': + case 'u': goto yy155; default: goto yy22; } yy157: yych = *++YYCURSOR; @@ -1068,7 +1124,10 @@ yy159: switch(yych){ case '7': case '8': case '9': goto yy158; - case 'F': case 'L': case 'f': case 'l': goto yy136; + case 'F': + case 'L': + case 'f': + case 'l': goto yy136; default: goto yy134; } yy160: yyaccept = 3; @@ -1087,13 +1146,18 @@ yy161: switch(yych){ case '7': case '8': case '9': goto yy160; - case 'E': case 'e': goto yy166; - case 'F': case 'L': case 'f': case 'l': goto yy136; + case 'E': + case 'e': goto yy166; + case 'F': + case 'L': + case 'f': + case 'l': goto yy136; default: goto yy134; } yy162: yych = *++YYCURSOR; switch(yych){ - case '+': case '-': goto yy163; + case '+': + case '-': goto yy163; case '0': case '1': case '2': @@ -1135,12 +1199,16 @@ yy165: switch(yych){ case '7': case '8': case '9': goto yy164; - case 'F': case 'L': case 'f': case 'l': goto yy136; + case 'F': + case 'L': + case 'f': + case 'l': goto yy136; default: goto yy134; } yy166: yych = *++YYCURSOR; switch(yych){ - case '+': case '-': goto yy167; + case '+': + case '-': goto yy167; case '0': case '1': case '2': @@ -1182,7 +1250,10 @@ yy169: switch(yych){ case '7': case '8': case '9': goto yy168; - case 'F': case 'L': case 'f': case 'l': goto yy136; + case 'F': + case 'L': + case 'f': + case 'l': goto yy136; default: goto yy134; } yy170: yyaccept = 0; @@ -1202,8 +1273,12 @@ yy171: switch(yych){ case '7': case '8': case '9': goto yy170; - case 'E': case 'e': goto yy154; - case 'L': case 'U': case 'l': case 'u': goto yy177; + case 'E': + case 'e': goto yy154; + case 'L': + case 'U': + case 'l': + case 'u': goto yy177; default: goto yy22; } yy172: yych = *++YYCURSOR; @@ -1217,12 +1292,14 @@ yy172: yych = *++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -1244,18 +1321,23 @@ yy174: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': goto yy173; - case 'L': case 'U': case 'l': case 'u': goto yy175; + case 'L': + case 'U': + case 'l': + case 'u': goto yy175; default: goto yy22; } yy175: ++YYCURSOR; @@ -1263,7 +1345,10 @@ yy175: ++YYCURSOR; yych = *YYCURSOR; goto yy176; yy176: switch(yych){ - case 'L': case 'U': case 'l': case 'u': goto yy175; + case 'L': + case 'U': + case 'l': + case 'u': goto yy175; default: goto yy22; } yy177: ++YYCURSOR; @@ -1271,7 +1356,10 @@ yy177: ++YYCURSOR; yych = *YYCURSOR; goto yy178; yy178: switch(yych){ - case 'L': case 'U': case 'l': case 'u': goto yy177; + case 'L': + case 'U': + case 'l': + case 'u': goto yy177; default: goto yy22; } yy179: ++YYCURSOR; @@ -1288,7 +1376,8 @@ yy180: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1313,7 +1402,9 @@ yy180: switch(yych){ case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1367,7 +1458,8 @@ yy184: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1392,7 +1484,9 @@ yy184: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1471,7 +1565,8 @@ yy193: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1496,7 +1591,9 @@ yy193: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1539,7 +1636,8 @@ yy195: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1564,7 +1662,9 @@ yy195: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1643,7 +1743,8 @@ yy204: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1668,7 +1769,9 @@ yy204: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1716,7 +1819,8 @@ yy207: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1741,7 +1845,9 @@ yy207: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1809,7 +1915,8 @@ yy214: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1834,7 +1941,9 @@ yy214: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1914,7 +2023,8 @@ yy223: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1939,7 +2049,9 @@ yy223: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2002,7 +2114,8 @@ yy229: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2027,7 +2140,9 @@ yy229: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2080,7 +2195,8 @@ yy233: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2105,7 +2221,9 @@ yy233: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2168,7 +2286,8 @@ yy239: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2193,7 +2312,9 @@ yy239: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2246,7 +2367,8 @@ yy243: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2271,7 +2393,9 @@ yy243: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2324,7 +2448,8 @@ yy247: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2349,7 +2474,9 @@ yy247: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2418,7 +2545,8 @@ yy254: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2443,7 +2571,9 @@ yy254: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2506,7 +2636,8 @@ yy260: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2531,7 +2662,9 @@ yy260: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2584,7 +2717,8 @@ yy264: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2609,7 +2743,9 @@ yy264: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2652,7 +2788,8 @@ yy266: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2677,7 +2814,9 @@ yy266: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2725,7 +2864,8 @@ yy269: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2750,7 +2890,9 @@ yy269: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2803,7 +2945,8 @@ yy273: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2828,7 +2971,9 @@ yy273: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2881,7 +3026,8 @@ yy277: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2906,7 +3052,9 @@ yy277: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -2959,7 +3107,8 @@ yy281: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2984,7 +3133,9 @@ yy281: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3057,7 +3208,8 @@ yy289: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3082,7 +3234,9 @@ yy289: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3130,7 +3284,8 @@ yy292: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3155,7 +3310,9 @@ yy292: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3203,7 +3360,8 @@ yy295: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3228,7 +3386,9 @@ yy295: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3276,7 +3436,8 @@ yy298: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3301,7 +3462,9 @@ yy298: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3320,7 +3483,8 @@ yy298: ++YYCURSOR; case 'q': case 'r': case 's': - case 't': case 'v': + case 't': + case 'v': case 'w': case 'x': case 'y': @@ -3358,7 +3522,8 @@ yy303: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3383,7 +3548,9 @@ yy303: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3446,7 +3613,8 @@ yy309: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3471,7 +3639,9 @@ yy309: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3560,7 +3730,8 @@ yy320: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3585,7 +3756,9 @@ yy320: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3628,7 +3801,8 @@ yy322: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3653,7 +3827,9 @@ yy322: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3701,7 +3877,8 @@ yy325: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3726,7 +3903,9 @@ yy325: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3774,7 +3953,8 @@ yy328: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3799,7 +3979,9 @@ yy328: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3857,7 +4039,8 @@ yy333: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3882,7 +4065,9 @@ yy333: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -3935,7 +4120,8 @@ yy337: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3960,7 +4146,9 @@ yy337: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': diff --git a/test/cnokw.c b/test/cnokw.c index 3a576e35..f671da0d 100644 --- a/test/cnokw.c +++ b/test/cnokw.c @@ -136,8 +136,10 @@ yy0: if((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; switch(yych){ - case 0x09: case 0x0B: - case 0x0C: case ' ': goto yy58; + case 0x09: + case 0x0B: + case 0x0C: + case ' ': goto yy58; case 0x0A: goto yy60; case '!': goto yy34; case '"': goto yy13; @@ -193,7 +195,9 @@ yy0: case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -248,8 +252,12 @@ yy5: yy6: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case 'L': case 'U': case 'l': case 'u': goto yy140; - case 'X': case 'x': goto yy157; + case 'L': + case 'U': + case 'l': + case 'u': goto yy140; + case 'X': + case 'x': goto yy157; default: goto yy156; } yy7: @@ -494,8 +502,10 @@ yy63: ++YYCURSOR; yych = *YYCURSOR; goto yy64; yy64: switch(yych){ - case 0x09: case 0x0B: - case 0x0C: case ' ': goto yy63; + case 0x09: + case 0x0B: + case 0x0C: + case ' ': goto yy63; default: goto yy59; } yy65: ++YYCURSOR; @@ -645,8 +655,17 @@ yy108: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '"': case '\'': case '?': case '\\': case 'a': - case 'b': case 'f': case 'n': case 'r': case 't': case 'v': goto yy105; + case '"': + case '\'': + case '?': + case '\\': + case 'a': + case 'b': + case 'f': + case 'n': + case 'r': + case 't': + case 'v': goto yy105; case '0': case '1': case '2': @@ -677,12 +696,14 @@ yy111: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -724,12 +745,14 @@ yy115: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -759,8 +782,12 @@ yy118: switch(yych){ case '7': case '8': case '9': goto yy117; - case 'E': case 'e': goto yy120; - case 'F': case 'L': case 'f': case 'l': goto yy121; + case 'E': + case 'e': goto yy120; + case 'F': + case 'L': + case 'f': + case 'l': goto yy121; default: goto yy119; } yy119: @@ -769,7 +796,8 @@ yy119: #line 770 "" yy120: yych = *++YYCURSOR; switch(yych){ - case '+': case '-': goto yy122; + case '+': + case '-': goto yy122; case '0': case '1': case '2': @@ -813,7 +841,10 @@ yy124: switch(yych){ case '7': case '8': case '9': goto yy123; - case 'F': case 'L': case 'f': case 'l': goto yy121; + case 'F': + case 'L': + case 'f': + case 'l': goto yy121; default: goto yy119; } yy125: ++YYCURSOR; @@ -836,8 +867,17 @@ yy129: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '"': case '\'': case '?': case '\\': case 'a': - case 'b': case 'f': case 'n': case 'r': case 't': case 'v': goto yy127; + case '"': + case '\'': + case '?': + case '\\': + case 'a': + case 'b': + case 'f': + case 'n': + case 'r': + case 't': + case 'v': goto yy127; case '0': case '1': case '2': @@ -864,12 +904,14 @@ yy131: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -911,12 +953,14 @@ yy135: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -928,7 +972,8 @@ yy135: switch(yych){ yy136: yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case 'E': case 'e': goto yy147; + case 'E': + case 'e': goto yy147; default: goto yy146; } yy137: yyaccept = 0; @@ -948,13 +993,18 @@ yy138: switch(yych){ case '7': case '8': case '9': goto yy137; - case 'E': case 'e': goto yy139; - case 'L': case 'U': case 'l': case 'u': goto yy140; + case 'E': + case 'e': goto yy139; + case 'L': + case 'U': + case 'l': + case 'u': goto yy140; default: goto yy7; } yy139: yych = *++YYCURSOR; switch(yych){ - case '+': case '-': goto yy142; + case '+': + case '-': goto yy142; case '0': case '1': case '2': @@ -972,7 +1022,10 @@ yy140: ++YYCURSOR; yych = *YYCURSOR; goto yy141; yy141: switch(yych){ - case 'L': case 'U': case 'l': case 'u': goto yy140; + case 'L': + case 'U': + case 'l': + case 'u': goto yy140; default: goto yy7; } yy142: yych = *++YYCURSOR; @@ -1004,7 +1057,10 @@ yy144: switch(yych){ case '7': case '8': case '9': goto yy143; - case 'F': case 'L': case 'f': case 'l': goto yy121; + case 'F': + case 'L': + case 'f': + case 'l': goto yy121; default: goto yy119; } yy145: yyaccept = 3; @@ -1023,13 +1079,18 @@ yy146: switch(yych){ case '7': case '8': case '9': goto yy145; - case 'E': case 'e': goto yy151; - case 'F': case 'L': case 'f': case 'l': goto yy121; + case 'E': + case 'e': goto yy151; + case 'F': + case 'L': + case 'f': + case 'l': goto yy121; default: goto yy119; } yy147: yych = *++YYCURSOR; switch(yych){ - case '+': case '-': goto yy148; + case '+': + case '-': goto yy148; case '0': case '1': case '2': @@ -1071,12 +1132,16 @@ yy150: switch(yych){ case '7': case '8': case '9': goto yy149; - case 'F': case 'L': case 'f': case 'l': goto yy121; + case 'F': + case 'L': + case 'f': + case 'l': goto yy121; default: goto yy119; } yy151: yych = *++YYCURSOR; switch(yych){ - case '+': case '-': goto yy152; + case '+': + case '-': goto yy152; case '0': case '1': case '2': @@ -1118,7 +1183,10 @@ yy154: switch(yych){ case '7': case '8': case '9': goto yy153; - case 'F': case 'L': case 'f': case 'l': goto yy121; + case 'F': + case 'L': + case 'f': + case 'l': goto yy121; default: goto yy119; } yy155: yyaccept = 0; @@ -1138,8 +1206,12 @@ yy156: switch(yych){ case '7': case '8': case '9': goto yy155; - case 'E': case 'e': goto yy139; - case 'L': case 'U': case 'l': case 'u': goto yy162; + case 'E': + case 'e': goto yy139; + case 'L': + case 'U': + case 'l': + case 'u': goto yy162; default: goto yy7; } yy157: yych = *++YYCURSOR; @@ -1153,12 +1225,14 @@ yy157: yych = *++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -1180,18 +1254,23 @@ yy159: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': goto yy158; - case 'L': case 'U': case 'l': case 'u': goto yy160; + case 'L': + case 'U': + case 'l': + case 'u': goto yy160; default: goto yy7; } yy160: ++YYCURSOR; @@ -1199,7 +1278,10 @@ yy160: ++YYCURSOR; yych = *YYCURSOR; goto yy161; yy161: switch(yych){ - case 'L': case 'U': case 'l': case 'u': goto yy160; + case 'L': + case 'U': + case 'l': + case 'u': goto yy160; default: goto yy7; } yy162: ++YYCURSOR; @@ -1207,7 +1289,10 @@ yy162: ++YYCURSOR; yych = *YYCURSOR; goto yy163; yy163: switch(yych){ - case 'L': case 'U': case 'l': case 'u': goto yy162; + case 'L': + case 'U': + case 'l': + case 'u': goto yy162; default: goto yy7; } yy164: ++YYCURSOR; @@ -1224,7 +1309,8 @@ yy165: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1249,7 +1335,9 @@ yy165: switch(yych){ case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': diff --git a/test/cunroll.c b/test/cunroll.c index 3bbd74f8..af43bbd4 100644 --- a/test/cunroll.c +++ b/test/cunroll.c @@ -136,8 +136,10 @@ yy0: if((YYLIMIT - YYCURSOR) < 9) YYFILL(9); yych = *YYCURSOR; switch(yych){ - case 0x09: case 0x0B: - case 0x0C: case ' ': goto yy58; + case 0x09: + case 0x0B: + case 0x0C: + case ' ': goto yy58; case 0x0A: goto yy60; case '!': goto yy34; case '"': goto yy13; @@ -193,7 +195,9 @@ yy0: case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -249,7 +253,8 @@ yy4: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -274,7 +279,9 @@ yy4: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -309,8 +316,12 @@ yy5: yy6: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case 'L': case 'U': case 'l': case 'u': goto yy140; - case 'X': case 'x': goto yy157; + case 'L': + case 'U': + case 'l': + case 'u': goto yy140; + case 'X': + case 'x': goto yy157; default: goto yy156; } yy7: @@ -555,8 +566,10 @@ yy63: ++YYCURSOR; yych = *YYCURSOR; goto yy64; yy64: switch(yych){ - case 0x09: case 0x0B: - case 0x0C: case ' ': goto yy63; + case 0x09: + case 0x0B: + case 0x0C: + case ' ': goto yy63; default: goto yy59; } yy65: ++YYCURSOR; @@ -706,8 +719,17 @@ yy108: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '"': case '\'': case '?': case '\\': case 'a': - case 'b': case 'f': case 'n': case 'r': case 't': case 'v': goto yy105; + case '"': + case '\'': + case '?': + case '\\': + case 'a': + case 'b': + case 'f': + case 'n': + case 'r': + case 't': + case 'v': goto yy105; case '0': case '1': case '2': @@ -738,12 +760,14 @@ yy111: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -785,12 +809,14 @@ yy115: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -820,8 +846,12 @@ yy118: switch(yych){ case '7': case '8': case '9': goto yy117; - case 'E': case 'e': goto yy120; - case 'F': case 'L': case 'f': case 'l': goto yy121; + case 'E': + case 'e': goto yy120; + case 'F': + case 'L': + case 'f': + case 'l': goto yy121; default: goto yy119; } yy119: @@ -830,7 +860,8 @@ yy119: #line 831 "" yy120: yych = *++YYCURSOR; switch(yych){ - case '+': case '-': goto yy122; + case '+': + case '-': goto yy122; case '0': case '1': case '2': @@ -874,7 +905,10 @@ yy124: switch(yych){ case '7': case '8': case '9': goto yy123; - case 'F': case 'L': case 'f': case 'l': goto yy121; + case 'F': + case 'L': + case 'f': + case 'l': goto yy121; default: goto yy119; } yy125: ++YYCURSOR; @@ -897,8 +931,17 @@ yy129: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; switch(yych){ - case '"': case '\'': case '?': case '\\': case 'a': - case 'b': case 'f': case 'n': case 'r': case 't': case 'v': goto yy127; + case '"': + case '\'': + case '?': + case '\\': + case 'a': + case 'b': + case 'f': + case 'n': + case 'r': + case 't': + case 'v': goto yy127; case '0': case '1': case '2': @@ -925,12 +968,14 @@ yy131: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -972,12 +1017,14 @@ yy135: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -989,7 +1036,8 @@ yy135: switch(yych){ yy136: yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ - case 'E': case 'e': goto yy147; + case 'E': + case 'e': goto yy147; default: goto yy146; } yy137: yyaccept = 0; @@ -1009,13 +1057,18 @@ yy138: switch(yych){ case '7': case '8': case '9': goto yy137; - case 'E': case 'e': goto yy139; - case 'L': case 'U': case 'l': case 'u': goto yy140; + case 'E': + case 'e': goto yy139; + case 'L': + case 'U': + case 'l': + case 'u': goto yy140; default: goto yy7; } yy139: yych = *++YYCURSOR; switch(yych){ - case '+': case '-': goto yy142; + case '+': + case '-': goto yy142; case '0': case '1': case '2': @@ -1033,7 +1086,10 @@ yy140: ++YYCURSOR; yych = *YYCURSOR; goto yy141; yy141: switch(yych){ - case 'L': case 'U': case 'l': case 'u': goto yy140; + case 'L': + case 'U': + case 'l': + case 'u': goto yy140; default: goto yy7; } yy142: yych = *++YYCURSOR; @@ -1065,7 +1121,10 @@ yy144: switch(yych){ case '7': case '8': case '9': goto yy143; - case 'F': case 'L': case 'f': case 'l': goto yy121; + case 'F': + case 'L': + case 'f': + case 'l': goto yy121; default: goto yy119; } yy145: yyaccept = 3; @@ -1084,13 +1143,18 @@ yy146: switch(yych){ case '7': case '8': case '9': goto yy145; - case 'E': case 'e': goto yy151; - case 'F': case 'L': case 'f': case 'l': goto yy121; + case 'E': + case 'e': goto yy151; + case 'F': + case 'L': + case 'f': + case 'l': goto yy121; default: goto yy119; } yy147: yych = *++YYCURSOR; switch(yych){ - case '+': case '-': goto yy148; + case '+': + case '-': goto yy148; case '0': case '1': case '2': @@ -1132,12 +1196,16 @@ yy150: switch(yych){ case '7': case '8': case '9': goto yy149; - case 'F': case 'L': case 'f': case 'l': goto yy121; + case 'F': + case 'L': + case 'f': + case 'l': goto yy121; default: goto yy119; } yy151: yych = *++YYCURSOR; switch(yych){ - case '+': case '-': goto yy152; + case '+': + case '-': goto yy152; case '0': case '1': case '2': @@ -1179,7 +1247,10 @@ yy154: switch(yych){ case '7': case '8': case '9': goto yy153; - case 'F': case 'L': case 'f': case 'l': goto yy121; + case 'F': + case 'L': + case 'f': + case 'l': goto yy121; default: goto yy119; } yy155: yyaccept = 0; @@ -1199,8 +1270,12 @@ yy156: switch(yych){ case '7': case '8': case '9': goto yy155; - case 'E': case 'e': goto yy139; - case 'L': case 'U': case 'l': case 'u': goto yy162; + case 'E': + case 'e': goto yy139; + case 'L': + case 'U': + case 'l': + case 'u': goto yy162; default: goto yy7; } yy157: yych = *++YYCURSOR; @@ -1214,12 +1289,14 @@ yy157: yych = *++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': @@ -1241,18 +1318,23 @@ yy159: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': - case 'F': case 'a': + case 'F': + case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': goto yy158; - case 'L': case 'U': case 'l': case 'u': goto yy160; + case 'L': + case 'U': + case 'l': + case 'u': goto yy160; default: goto yy7; } yy160: ++YYCURSOR; @@ -1260,7 +1342,10 @@ yy160: ++YYCURSOR; yych = *YYCURSOR; goto yy161; yy161: switch(yych){ - case 'L': case 'U': case 'l': case 'u': goto yy160; + case 'L': + case 'U': + case 'l': + case 'u': goto yy160; default: goto yy7; } yy162: ++YYCURSOR; @@ -1268,7 +1353,10 @@ yy162: ++YYCURSOR; yych = *YYCURSOR; goto yy163; yy163: switch(yych){ - case 'L': case 'U': case 'l': case 'u': goto yy162; + case 'L': + case 'U': + case 'l': + case 'u': goto yy162; default: goto yy7; } yy164: ++YYCURSOR; @@ -1282,7 +1370,8 @@ yy164: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1307,7 +1396,9 @@ yy164: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1350,7 +1441,8 @@ yy166: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1375,7 +1467,9 @@ yy166: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1418,7 +1512,8 @@ yy168: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1443,7 +1538,9 @@ yy168: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1486,7 +1583,8 @@ yy170: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1511,7 +1609,9 @@ yy170: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1554,7 +1654,8 @@ yy172: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1579,7 +1680,9 @@ yy172: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1622,7 +1725,8 @@ yy174: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1647,7 +1751,9 @@ yy174: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1690,7 +1796,8 @@ yy176: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1715,7 +1822,9 @@ yy176: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1761,7 +1870,8 @@ yy179: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1786,7 +1896,9 @@ yy179: switch(yych){ case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1861,7 +1973,8 @@ yy188: #line 1862 "" yy189: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '*': case '/': goto yy190; + case '*': + case '/': goto yy190; default: goto yy194; } yy190: @@ -1874,7 +1987,8 @@ yy190: #line 1875 "" yy191: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '*': case '/': goto yy192; + case '*': + case '/': goto yy192; default: goto yy194; } yy192: @@ -1885,7 +1999,8 @@ yy193: yych = *++YYCURSOR; goto yy188; yy194: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '*': case '/': goto yy195; + case '*': + case '/': goto yy195; default: goto yy196; } yy195: @@ -1894,7 +2009,8 @@ yy195: #line 1895 "" yy196: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '*': case '/': goto yy197; + case '*': + case '/': goto yy197; default: goto yy198; } yy197: @@ -1903,7 +2019,8 @@ yy197: #line 1904 "" yy198: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '*': case '/': goto yy199; + case '*': + case '/': goto yy199; default: goto yy200; } yy199: @@ -1912,7 +2029,8 @@ yy199: #line 1913 "" yy200: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '*': case '/': goto yy201; + case '*': + case '/': goto yy201; default: goto yy202; } yy201: @@ -1921,7 +2039,8 @@ yy201: #line 1922 "" yy202: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '*': case '/': goto yy203; + case '*': + case '/': goto yy203; default: goto yy204; } yy203: @@ -1930,7 +2049,8 @@ yy203: #line 1931 "" yy204: ++YYCURSOR; switch((yych = *YYCURSOR)) { - case '*': case '/': goto yy205; + case '*': + case '/': goto yy205; default: goto yy206; } yy205: diff --git a/test/cvsignore.b.c b/test/cvsignore.b.c index 909095ae..3ce16f27 100755 --- a/test/cvsignore.b.c +++ b/test/cvsignore.b.c @@ -40,228 +40,228 @@ void scan(YYCTYPE *pText, size_t *pSize, int *pbChanged) loop: { static unsigned char yybm[] = { - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 0, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 0, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 0, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 0, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, }; #line 78 "" -{ - YYCTYPE yych; - unsigned int yyaccept = 0; - goto yy0; - ++YYCURSOR; + { + YYCTYPE yych; + unsigned int yyaccept = 0; + goto yy0; + ++YYCURSOR; yy0: - if((YYLIMIT - YYCURSOR) < 11) YYFILL(11); - yych = *YYCURSOR; - if(yych != '$') goto yy4; - goto yy2; -yy2: yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - switch(yych){ - case 'D': goto yy10; - case 'I': goto yy9; - case 'L': goto yy8; - case 'R': goto yy7; - case 'S': goto yy5; - default: goto yy3; - } + if((YYLIMIT - YYCURSOR) < 11) YYFILL(11); + yych = *YYCURSOR; + if(yych != '$') goto yy4; + goto yy2; +yy2: yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + switch(yych){ + case 'D': goto yy10; + case 'I': goto yy9; + case 'L': goto yy8; + case 'R': goto yy7; + case 'S': goto yy5; + default: goto yy3; + } yy3: #line 53 "cvsignore.b.re" { output[outsize++] = cursor[-1]; if (cursor >= limit) break; goto loop; } #line 102 "" -yy4: yych = *++YYCURSOR; - goto yy3; -yy5: yych = *++YYCURSOR; - if(yych == 'o') goto yy44; - goto yy6; -yy6: YYCURSOR = YYMARKER; - switch(yyaccept){ - case 0: goto yy3; - } -yy7: yych = *++YYCURSOR; - if(yych == 'e') goto yy32; - goto yy6; -yy8: yych = *++YYCURSOR; - if(yych == 'o') goto yy25; - goto yy6; -yy9: yych = *++YYCURSOR; - if(yych == 'd') goto yy19; - goto yy6; -yy10: yych = *++YYCURSOR; - if(yych != 'a') goto yy6; - goto yy11; -yy11: yych = *++YYCURSOR; - if(yych != 't') goto yy6; - goto yy12; -yy12: yych = *++YYCURSOR; - if(yych != 'e') goto yy6; - goto yy13; -yy13: yych = *++YYCURSOR; - if(yych == '$') goto yy15; - if(yych != ':') goto yy6; - goto yy14; -yy14: yych = *++YYCURSOR; - if(yych == '$') goto yy6; - goto yy18; -yy15: ++YYCURSOR; - goto yy16; +yy4: yych = *++YYCURSOR; + goto yy3; +yy5: yych = *++YYCURSOR; + if(yych == 'o') goto yy44; + goto yy6; +yy6: YYCURSOR = YYMARKER; + switch(yyaccept){ + case 0: goto yy3; + } +yy7: yych = *++YYCURSOR; + if(yych == 'e') goto yy32; + goto yy6; +yy8: yych = *++YYCURSOR; + if(yych == 'o') goto yy25; + goto yy6; +yy9: yych = *++YYCURSOR; + if(yych == 'd') goto yy19; + goto yy6; +yy10: yych = *++YYCURSOR; + if(yych != 'a') goto yy6; + goto yy11; +yy11: yych = *++YYCURSOR; + if(yych != 't') goto yy6; + goto yy12; +yy12: yych = *++YYCURSOR; + if(yych != 'e') goto yy6; + goto yy13; +yy13: yych = *++YYCURSOR; + if(yych == '$') goto yy15; + if(yych != ':') goto yy6; + goto yy14; +yy14: yych = *++YYCURSOR; + if(yych == '$') goto yy6; + goto yy18; +yy15: ++YYCURSOR; + goto yy16; yy16: #line 48 "cvsignore.b.re" { APPEND(L"$" L"Date$"); goto loop; } #line 142 "" -yy17: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - goto yy18; -yy18: if(yybm[0+yych] & 128) { - goto yy17; - } - if(yych <= '#') goto yy6; - goto yy15; -yy19: yych = *++YYCURSOR; - if(yych == '$') goto yy21; - if(yych != ':') goto yy6; - goto yy20; -yy20: yych = *++YYCURSOR; - if(yych == '$') goto yy6; - goto yy24; -yy21: ++YYCURSOR; - goto yy22; +yy17: ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + goto yy18; +yy18: if(yybm[0+yych] & 128) { + goto yy17; + } + if(yych <= '#') goto yy6; + goto yy15; +yy19: yych = *++YYCURSOR; + if(yych == '$') goto yy21; + if(yych != ':') goto yy6; + goto yy20; +yy20: yych = *++YYCURSOR; + if(yych == '$') goto yy6; + goto yy24; +yy21: ++YYCURSOR; + goto yy22; yy22: #line 49 "cvsignore.b.re" { APPEND(L"$" L"Id$"); goto loop; } #line 164 "" -yy23: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - goto yy24; -yy24: if(yych == 0x0A) goto yy6; - if(yych == '$') goto yy21; - goto yy23; -yy25: yych = *++YYCURSOR; - if(yych != 'g') goto yy6; - goto yy26; -yy26: yych = *++YYCURSOR; - if(yych == '$') goto yy28; - if(yych != ':') goto yy6; - goto yy27; -yy27: yych = *++YYCURSOR; - if(yych == '$') goto yy6; - goto yy31; -yy28: ++YYCURSOR; - goto yy29; +yy23: ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + goto yy24; +yy24: if(yych == 0x0A) goto yy6; + if(yych == '$') goto yy21; + goto yy23; +yy25: yych = *++YYCURSOR; + if(yych != 'g') goto yy6; + goto yy26; +yy26: yych = *++YYCURSOR; + if(yych == '$') goto yy28; + if(yych != ':') goto yy6; + goto yy27; +yy27: yych = *++YYCURSOR; + if(yych == '$') goto yy6; + goto yy31; +yy28: ++YYCURSOR; + goto yy29; yy29: #line 50 "cvsignore.b.re" { APPEND(L"$" L"Log$"); goto loop; } #line 187 "" -yy30: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - goto yy31; -yy31: if(yych == 0x0A) goto yy6; - if(yych == '$') goto yy28; - goto yy30; -yy32: yych = *++YYCURSOR; - if(yych != 'v') goto yy6; - goto yy33; -yy33: yych = *++YYCURSOR; - if(yych != 'i') goto yy6; - goto yy34; -yy34: yych = *++YYCURSOR; - if(yych != 's') goto yy6; - goto yy35; -yy35: yych = *++YYCURSOR; - if(yych != 'i') goto yy6; - goto yy36; -yy36: yych = *++YYCURSOR; - if(yych != 'o') goto yy6; - goto yy37; -yy37: yych = *++YYCURSOR; - if(yych != 'n') goto yy6; - goto yy38; -yy38: yych = *++YYCURSOR; - if(yych == '$') goto yy40; - if(yych != ':') goto yy6; - goto yy39; -yy39: yych = *++YYCURSOR; - if(yych == '$') goto yy6; - goto yy43; -yy40: ++YYCURSOR; - goto yy41; +yy30: ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + goto yy31; +yy31: if(yych == 0x0A) goto yy6; + if(yych == '$') goto yy28; + goto yy30; +yy32: yych = *++YYCURSOR; + if(yych != 'v') goto yy6; + goto yy33; +yy33: yych = *++YYCURSOR; + if(yych != 'i') goto yy6; + goto yy34; +yy34: yych = *++YYCURSOR; + if(yych != 's') goto yy6; + goto yy35; +yy35: yych = *++YYCURSOR; + if(yych != 'i') goto yy6; + goto yy36; +yy36: yych = *++YYCURSOR; + if(yych != 'o') goto yy6; + goto yy37; +yy37: yych = *++YYCURSOR; + if(yych != 'n') goto yy6; + goto yy38; +yy38: yych = *++YYCURSOR; + if(yych == '$') goto yy40; + if(yych != ':') goto yy6; + goto yy39; +yy39: yych = *++YYCURSOR; + if(yych == '$') goto yy6; + goto yy43; +yy40: ++YYCURSOR; + goto yy41; yy41: #line 51 "cvsignore.b.re" { APPEND(L"$" L"Revision$"); goto loop; } #line 225 "" -yy42: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - goto yy43; -yy43: if(yych == 0x0A) goto yy6; - if(yych == '$') goto yy40; - goto yy42; -yy44: yych = *++YYCURSOR; - if(yych != 'u') goto yy6; - goto yy45; -yy45: yych = *++YYCURSOR; - if(yych != 'r') goto yy6; - goto yy46; -yy46: yych = *++YYCURSOR; - if(yych != 'c') goto yy6; - goto yy47; -yy47: yych = *++YYCURSOR; - if(yych != 'e') goto yy6; - goto yy48; -yy48: yych = *++YYCURSOR; - if(yych == '$') goto yy50; - if(yych != ':') goto yy6; - goto yy49; -yy49: yych = *++YYCURSOR; - if(yych == '$') goto yy6; - goto yy53; -yy50: ++YYCURSOR; - goto yy51; +yy42: ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + goto yy43; +yy43: if(yych == 0x0A) goto yy6; + if(yych == '$') goto yy40; + goto yy42; +yy44: yych = *++YYCURSOR; + if(yych != 'u') goto yy6; + goto yy45; +yy45: yych = *++YYCURSOR; + if(yych != 'r') goto yy6; + goto yy46; +yy46: yych = *++YYCURSOR; + if(yych != 'c') goto yy6; + goto yy47; +yy47: yych = *++YYCURSOR; + if(yych != 'e') goto yy6; + goto yy48; +yy48: yych = *++YYCURSOR; + if(yych == '$') goto yy50; + if(yych != ':') goto yy6; + goto yy49; +yy49: yych = *++YYCURSOR; + if(yych == '$') goto yy6; + goto yy53; +yy50: ++YYCURSOR; + goto yy51; yy51: #line 52 "cvsignore.b.re" { APPEND(L"$" L"Source$"); goto loop; } #line 257 "" -yy52: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - goto yy53; -yy53: if(yych == 0x0A) goto yy6; - if(yych == '$') goto yy50; - goto yy52; -} +yy52: ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + goto yy53; +yy53: if(yych == 0x0A) goto yy6; + if(yych == '$') goto yy50; + goto yy52; + } } #line 55 "cvsignore.b.re" diff --git a/test/cvsignore.s.c b/test/cvsignore.s.c index 5765696e..0d73f108 100755 --- a/test/cvsignore.s.c +++ b/test/cvsignore.s.c @@ -48,7 +48,7 @@ loop: yy0: if((YYLIMIT - YYCURSOR) < 11) YYFILL(11); yych = *YYCURSOR; - if(yych != '$') goto yy4; + if(yych != '$') goto yy4; goto yy2; yy2: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -67,36 +67,36 @@ yy3: yy4: yych = *++YYCURSOR; goto yy3; yy5: yych = *++YYCURSOR; - if(yych == 'o') goto yy44; + if(yych == 'o') goto yy44; goto yy6; yy6: YYCURSOR = YYMARKER; switch(yyaccept){ case 0: goto yy3; } yy7: yych = *++YYCURSOR; - if(yych == 'e') goto yy32; + if(yych == 'e') goto yy32; goto yy6; yy8: yych = *++YYCURSOR; - if(yych == 'o') goto yy25; + if(yych == 'o') goto yy25; goto yy6; yy9: yych = *++YYCURSOR; - if(yych == 'd') goto yy19; + if(yych == 'd') goto yy19; goto yy6; yy10: yych = *++YYCURSOR; - if(yych != 'a') goto yy6; + if(yych != 'a') goto yy6; goto yy11; yy11: yych = *++YYCURSOR; - if(yych != 't') goto yy6; + if(yych != 't') goto yy6; goto yy12; yy12: yych = *++YYCURSOR; - if(yych != 'e') goto yy6; + if(yych != 'e') goto yy6; goto yy13; yy13: yych = *++YYCURSOR; - if(yych == '$') goto yy15; - if(yych != ':') goto yy6; + if(yych == '$') goto yy15; + if(yych != ':') goto yy6; goto yy14; yy14: yych = *++YYCURSOR; - if(yych == '$') goto yy6; + if(yych == '$') goto yy6; goto yy18; yy15: ++YYCURSOR; goto yy16; @@ -108,15 +108,15 @@ yy17: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy18; -yy18: if(yych == 0x0A) goto yy6; - if(yych == '$') goto yy15; +yy18: if(yych == 0x0A) goto yy6; + if(yych == '$') goto yy15; goto yy17; yy19: yych = *++YYCURSOR; - if(yych == '$') goto yy21; - if(yych != ':') goto yy6; + if(yych == '$') goto yy21; + if(yych != ':') goto yy6; goto yy20; yy20: yych = *++YYCURSOR; - if(yych == '$') goto yy6; + if(yych == '$') goto yy6; goto yy24; yy21: ++YYCURSOR; goto yy22; @@ -128,18 +128,18 @@ yy23: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy24; -yy24: if(yych == 0x0A) goto yy6; - if(yych == '$') goto yy21; +yy24: if(yych == 0x0A) goto yy6; + if(yych == '$') goto yy21; goto yy23; yy25: yych = *++YYCURSOR; - if(yych != 'g') goto yy6; + if(yych != 'g') goto yy6; goto yy26; yy26: yych = *++YYCURSOR; - if(yych == '$') goto yy28; - if(yych != ':') goto yy6; + if(yych == '$') goto yy28; + if(yych != ':') goto yy6; goto yy27; yy27: yych = *++YYCURSOR; - if(yych == '$') goto yy6; + if(yych == '$') goto yy6; goto yy31; yy28: ++YYCURSOR; goto yy29; @@ -151,33 +151,33 @@ yy30: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy31; -yy31: if(yych == 0x0A) goto yy6; - if(yych == '$') goto yy28; +yy31: if(yych == 0x0A) goto yy6; + if(yych == '$') goto yy28; goto yy30; yy32: yych = *++YYCURSOR; - if(yych != 'v') goto yy6; + if(yych != 'v') goto yy6; goto yy33; yy33: yych = *++YYCURSOR; - if(yych != 'i') goto yy6; + if(yych != 'i') goto yy6; goto yy34; yy34: yych = *++YYCURSOR; - if(yych != 's') goto yy6; + if(yych != 's') goto yy6; goto yy35; yy35: yych = *++YYCURSOR; - if(yych != 'i') goto yy6; + if(yych != 'i') goto yy6; goto yy36; yy36: yych = *++YYCURSOR; - if(yych != 'o') goto yy6; + if(yych != 'o') goto yy6; goto yy37; yy37: yych = *++YYCURSOR; - if(yych != 'n') goto yy6; + if(yych != 'n') goto yy6; goto yy38; yy38: yych = *++YYCURSOR; - if(yych == '$') goto yy40; - if(yych != ':') goto yy6; + if(yych == '$') goto yy40; + if(yych != ':') goto yy6; goto yy39; yy39: yych = *++YYCURSOR; - if(yych == '$') goto yy6; + if(yych == '$') goto yy6; goto yy43; yy40: ++YYCURSOR; goto yy41; @@ -189,27 +189,27 @@ yy42: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy43; -yy43: if(yych == 0x0A) goto yy6; - if(yych == '$') goto yy40; +yy43: if(yych == 0x0A) goto yy6; + if(yych == '$') goto yy40; goto yy42; yy44: yych = *++YYCURSOR; - if(yych != 'u') goto yy6; + if(yych != 'u') goto yy6; goto yy45; yy45: yych = *++YYCURSOR; - if(yych != 'r') goto yy6; + if(yych != 'r') goto yy6; goto yy46; yy46: yych = *++YYCURSOR; - if(yych != 'c') goto yy6; + if(yych != 'c') goto yy6; goto yy47; yy47: yych = *++YYCURSOR; - if(yych != 'e') goto yy6; + if(yych != 'e') goto yy6; goto yy48; yy48: yych = *++YYCURSOR; - if(yych == '$') goto yy50; - if(yych != ':') goto yy6; + if(yych == '$') goto yy50; + if(yych != ':') goto yy6; goto yy49; yy49: yych = *++YYCURSOR; - if(yych == '$') goto yy6; + if(yych == '$') goto yy6; goto yy53; yy50: ++YYCURSOR; goto yy51; @@ -221,8 +221,8 @@ yy52: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy53; -yy53: if(yych == 0x0A) goto yy6; - if(yych == '$') goto yy50; +yy53: if(yych == 0x0A) goto yy6; + if(yych == '$') goto yy50; goto yy52; } #line 55 "cvsignore.s.re" diff --git a/test/cvsignore.w.c b/test/cvsignore.w.c index 06ec279b..266ce40f 100755 --- a/test/cvsignore.w.c +++ b/test/cvsignore.w.c @@ -48,7 +48,7 @@ loop: yy0: if((YYLIMIT - YYCURSOR) < 11) YYFILL(11); yych = *YYCURSOR; - if(yych != '$') goto yy4; + if(yych != '$') goto yy4; goto yy2; yy2: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); @@ -67,36 +67,36 @@ yy3: yy4: yych = *++YYCURSOR; goto yy3; yy5: yych = *++YYCURSOR; - if(yych == 'o') goto yy44; + if(yych == 'o') goto yy44; goto yy6; yy6: YYCURSOR = YYMARKER; switch(yyaccept){ case 0: goto yy3; } yy7: yych = *++YYCURSOR; - if(yych == 'e') goto yy32; + if(yych == 'e') goto yy32; goto yy6; yy8: yych = *++YYCURSOR; - if(yych == 'o') goto yy25; + if(yych == 'o') goto yy25; goto yy6; yy9: yych = *++YYCURSOR; - if(yych == 'd') goto yy19; + if(yych == 'd') goto yy19; goto yy6; yy10: yych = *++YYCURSOR; - if(yych != 'a') goto yy6; + if(yych != 'a') goto yy6; goto yy11; yy11: yych = *++YYCURSOR; - if(yych != 't') goto yy6; + if(yych != 't') goto yy6; goto yy12; yy12: yych = *++YYCURSOR; - if(yych != 'e') goto yy6; + if(yych != 'e') goto yy6; goto yy13; yy13: yych = *++YYCURSOR; - if(yych == '$') goto yy15; - if(yych != ':') goto yy6; + if(yych == '$') goto yy15; + if(yych != ':') goto yy6; goto yy14; yy14: yych = *++YYCURSOR; - if(yych == '$') goto yy6; + if(yych == '$') goto yy6; goto yy18; yy15: ++YYCURSOR; goto yy16; @@ -108,15 +108,15 @@ yy17: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy18; -yy18: if(yych == 0x000A) goto yy6; - if(yych == '$') goto yy15; +yy18: if(yych == 0x000A) goto yy6; + if(yych == '$') goto yy15; goto yy17; yy19: yych = *++YYCURSOR; - if(yych == '$') goto yy21; - if(yych != ':') goto yy6; + if(yych == '$') goto yy21; + if(yych != ':') goto yy6; goto yy20; yy20: yych = *++YYCURSOR; - if(yych == '$') goto yy6; + if(yych == '$') goto yy6; goto yy24; yy21: ++YYCURSOR; goto yy22; @@ -128,18 +128,18 @@ yy23: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy24; -yy24: if(yych == 0x000A) goto yy6; - if(yych == '$') goto yy21; +yy24: if(yych == 0x000A) goto yy6; + if(yych == '$') goto yy21; goto yy23; yy25: yych = *++YYCURSOR; - if(yych != 'g') goto yy6; + if(yych != 'g') goto yy6; goto yy26; yy26: yych = *++YYCURSOR; - if(yych == '$') goto yy28; - if(yych != ':') goto yy6; + if(yych == '$') goto yy28; + if(yych != ':') goto yy6; goto yy27; yy27: yych = *++YYCURSOR; - if(yych == '$') goto yy6; + if(yych == '$') goto yy6; goto yy31; yy28: ++YYCURSOR; goto yy29; @@ -151,33 +151,33 @@ yy30: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy31; -yy31: if(yych == 0x000A) goto yy6; - if(yych == '$') goto yy28; +yy31: if(yych == 0x000A) goto yy6; + if(yych == '$') goto yy28; goto yy30; yy32: yych = *++YYCURSOR; - if(yych != 'v') goto yy6; + if(yych != 'v') goto yy6; goto yy33; yy33: yych = *++YYCURSOR; - if(yych != 'i') goto yy6; + if(yych != 'i') goto yy6; goto yy34; yy34: yych = *++YYCURSOR; - if(yych != 's') goto yy6; + if(yych != 's') goto yy6; goto yy35; yy35: yych = *++YYCURSOR; - if(yych != 'i') goto yy6; + if(yych != 'i') goto yy6; goto yy36; yy36: yych = *++YYCURSOR; - if(yych != 'o') goto yy6; + if(yych != 'o') goto yy6; goto yy37; yy37: yych = *++YYCURSOR; - if(yych != 'n') goto yy6; + if(yych != 'n') goto yy6; goto yy38; yy38: yych = *++YYCURSOR; - if(yych == '$') goto yy40; - if(yych != ':') goto yy6; + if(yych == '$') goto yy40; + if(yych != ':') goto yy6; goto yy39; yy39: yych = *++YYCURSOR; - if(yych == '$') goto yy6; + if(yych == '$') goto yy6; goto yy43; yy40: ++YYCURSOR; goto yy41; @@ -189,27 +189,27 @@ yy42: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy43; -yy43: if(yych == 0x000A) goto yy6; - if(yych == '$') goto yy40; +yy43: if(yych == 0x000A) goto yy6; + if(yych == '$') goto yy40; goto yy42; yy44: yych = *++YYCURSOR; - if(yych != 'u') goto yy6; + if(yych != 'u') goto yy6; goto yy45; yy45: yych = *++YYCURSOR; - if(yych != 'r') goto yy6; + if(yych != 'r') goto yy6; goto yy46; yy46: yych = *++YYCURSOR; - if(yych != 'c') goto yy6; + if(yych != 'c') goto yy6; goto yy47; yy47: yych = *++YYCURSOR; - if(yych != 'e') goto yy6; + if(yych != 'e') goto yy6; goto yy48; yy48: yych = *++YYCURSOR; - if(yych == '$') goto yy50; - if(yych != ':') goto yy6; + if(yych == '$') goto yy50; + if(yych != ':') goto yy6; goto yy49; yy49: yych = *++YYCURSOR; - if(yych == '$') goto yy6; + if(yych == '$') goto yy6; goto yy53; yy50: ++YYCURSOR; goto yy51; @@ -221,8 +221,8 @@ yy52: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; goto yy53; -yy53: if(yych == 0x000A) goto yy6; - if(yych == '$') goto yy50; +yy53: if(yych == 0x000A) goto yy6; + if(yych == '$') goto yy50; goto yy52; } #line 55 "cvsignore.w.re" diff --git a/test/cvsignore.wb.c b/test/cvsignore.wb.c index 9e61d803..d7131439 100755 --- a/test/cvsignore.wb.c +++ b/test/cvsignore.wb.c @@ -40,230 +40,230 @@ void scan(YYCTYPE *pText, size_t *pSize, int *pbChanged) loop: { static unsigned char yybm[] = { - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 0, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 0, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, - 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 0, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 0, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, }; #line 78 "" -{ - YYCTYPE yych; - unsigned int yyaccept = 0; - goto yy0; - ++YYCURSOR; + { + YYCTYPE yych; + unsigned int yyaccept = 0; + goto yy0; + ++YYCURSOR; yy0: - if((YYLIMIT - YYCURSOR) < 11) YYFILL(11); - yych = *YYCURSOR; - if(yych != '$') goto yy4; - goto yy2; -yy2: yyaccept = 0; - yych = *(YYMARKER = ++YYCURSOR); - switch(yych){ - case 'D': goto yy10; - case 'I': goto yy9; - case 'L': goto yy8; - case 'R': goto yy7; - case 'S': goto yy5; - default: goto yy3; - } + if((YYLIMIT - YYCURSOR) < 11) YYFILL(11); + yych = *YYCURSOR; + if(yych != '$') goto yy4; + goto yy2; +yy2: yyaccept = 0; + yych = *(YYMARKER = ++YYCURSOR); + switch(yych){ + case 'D': goto yy10; + case 'I': goto yy9; + case 'L': goto yy8; + case 'R': goto yy7; + case 'S': goto yy5; + default: goto yy3; + } yy3: #line 53 "cvsignore.wb.re" { output[outsize++] = cursor[-1]; if (cursor >= limit) break; goto loop; } #line 102 "" -yy4: yych = *++YYCURSOR; - goto yy3; -yy5: yych = *++YYCURSOR; - if(yych == 'o') goto yy44; - goto yy6; -yy6: YYCURSOR = YYMARKER; - switch(yyaccept){ - case 0: goto yy3; - } -yy7: yych = *++YYCURSOR; - if(yych == 'e') goto yy32; - goto yy6; -yy8: yych = *++YYCURSOR; - if(yych == 'o') goto yy25; - goto yy6; -yy9: yych = *++YYCURSOR; - if(yych == 'd') goto yy19; - goto yy6; -yy10: yych = *++YYCURSOR; - if(yych != 'a') goto yy6; - goto yy11; -yy11: yych = *++YYCURSOR; - if(yych != 't') goto yy6; - goto yy12; -yy12: yych = *++YYCURSOR; - if(yych != 'e') goto yy6; - goto yy13; -yy13: yych = *++YYCURSOR; - if(yych == '$') goto yy15; - if(yych != ':') goto yy6; - goto yy14; -yy14: yych = *++YYCURSOR; - if(yych == '$') goto yy6; - goto yy18; -yy15: ++YYCURSOR; - goto yy16; +yy4: yych = *++YYCURSOR; + goto yy3; +yy5: yych = *++YYCURSOR; + if(yych == 'o') goto yy44; + goto yy6; +yy6: YYCURSOR = YYMARKER; + switch(yyaccept){ + case 0: goto yy3; + } +yy7: yych = *++YYCURSOR; + if(yych == 'e') goto yy32; + goto yy6; +yy8: yych = *++YYCURSOR; + if(yych == 'o') goto yy25; + goto yy6; +yy9: yych = *++YYCURSOR; + if(yych == 'd') goto yy19; + goto yy6; +yy10: yych = *++YYCURSOR; + if(yych != 'a') goto yy6; + goto yy11; +yy11: yych = *++YYCURSOR; + if(yych != 't') goto yy6; + goto yy12; +yy12: yych = *++YYCURSOR; + if(yych != 'e') goto yy6; + goto yy13; +yy13: yych = *++YYCURSOR; + if(yych == '$') goto yy15; + if(yych != ':') goto yy6; + goto yy14; +yy14: yych = *++YYCURSOR; + if(yych == '$') goto yy6; + goto yy18; +yy15: ++YYCURSOR; + goto yy16; yy16: #line 48 "cvsignore.wb.re" { APPEND(L"$" L"Date$"); goto loop; } #line 142 "" -yy17: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - goto yy18; -yy18: if (yyh & 0xFF00) { - goto yy17; - } else if(yybm[0+yych] & 128) { - goto yy17; - } - if(yych <= '#') goto yy6; - goto yy15; -yy19: yych = *++YYCURSOR; - if(yych == '$') goto yy21; - if(yych != ':') goto yy6; - goto yy20; -yy20: yych = *++YYCURSOR; - if(yych == '$') goto yy6; - goto yy24; -yy21: ++YYCURSOR; - goto yy22; +yy17: ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + goto yy18; +yy18: if(yyh & 0xFF00) { + goto yy17; + } else if(yybm[0+yych] & 128) { + goto yy17; + } + if(yych <= '#') goto yy6; + goto yy15; +yy19: yych = *++YYCURSOR; + if(yych == '$') goto yy21; + if(yych != ':') goto yy6; + goto yy20; +yy20: yych = *++YYCURSOR; + if(yych == '$') goto yy6; + goto yy24; +yy21: ++YYCURSOR; + goto yy22; yy22: #line 49 "cvsignore.wb.re" { APPEND(L"$" L"Id$"); goto loop; } #line 166 "" -yy23: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - goto yy24; -yy24: if(yych == 0x000A) goto yy6; - if(yych == '$') goto yy21; - goto yy23; -yy25: yych = *++YYCURSOR; - if(yych != 'g') goto yy6; - goto yy26; -yy26: yych = *++YYCURSOR; - if(yych == '$') goto yy28; - if(yych != ':') goto yy6; - goto yy27; -yy27: yych = *++YYCURSOR; - if(yych == '$') goto yy6; - goto yy31; -yy28: ++YYCURSOR; - goto yy29; +yy23: ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + goto yy24; +yy24: if(yych == 0x000A) goto yy6; + if(yych == '$') goto yy21; + goto yy23; +yy25: yych = *++YYCURSOR; + if(yych != 'g') goto yy6; + goto yy26; +yy26: yych = *++YYCURSOR; + if(yych == '$') goto yy28; + if(yych != ':') goto yy6; + goto yy27; +yy27: yych = *++YYCURSOR; + if(yych == '$') goto yy6; + goto yy31; +yy28: ++YYCURSOR; + goto yy29; yy29: #line 50 "cvsignore.wb.re" { APPEND(L"$" L"Log$"); goto loop; } #line 189 "" -yy30: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - goto yy31; -yy31: if(yych == 0x000A) goto yy6; - if(yych == '$') goto yy28; - goto yy30; -yy32: yych = *++YYCURSOR; - if(yych != 'v') goto yy6; - goto yy33; -yy33: yych = *++YYCURSOR; - if(yych != 'i') goto yy6; - goto yy34; -yy34: yych = *++YYCURSOR; - if(yych != 's') goto yy6; - goto yy35; -yy35: yych = *++YYCURSOR; - if(yych != 'i') goto yy6; - goto yy36; -yy36: yych = *++YYCURSOR; - if(yych != 'o') goto yy6; - goto yy37; -yy37: yych = *++YYCURSOR; - if(yych != 'n') goto yy6; - goto yy38; -yy38: yych = *++YYCURSOR; - if(yych == '$') goto yy40; - if(yych != ':') goto yy6; - goto yy39; -yy39: yych = *++YYCURSOR; - if(yych == '$') goto yy6; - goto yy43; -yy40: ++YYCURSOR; - goto yy41; +yy30: ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + goto yy31; +yy31: if(yych == 0x000A) goto yy6; + if(yych == '$') goto yy28; + goto yy30; +yy32: yych = *++YYCURSOR; + if(yych != 'v') goto yy6; + goto yy33; +yy33: yych = *++YYCURSOR; + if(yych != 'i') goto yy6; + goto yy34; +yy34: yych = *++YYCURSOR; + if(yych != 's') goto yy6; + goto yy35; +yy35: yych = *++YYCURSOR; + if(yych != 'i') goto yy6; + goto yy36; +yy36: yych = *++YYCURSOR; + if(yych != 'o') goto yy6; + goto yy37; +yy37: yych = *++YYCURSOR; + if(yych != 'n') goto yy6; + goto yy38; +yy38: yych = *++YYCURSOR; + if(yych == '$') goto yy40; + if(yych != ':') goto yy6; + goto yy39; +yy39: yych = *++YYCURSOR; + if(yych == '$') goto yy6; + goto yy43; +yy40: ++YYCURSOR; + goto yy41; yy41: #line 51 "cvsignore.wb.re" { APPEND(L"$" L"Revision$"); goto loop; } #line 227 "" -yy42: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - goto yy43; -yy43: if(yych == 0x000A) goto yy6; - if(yych == '$') goto yy40; - goto yy42; -yy44: yych = *++YYCURSOR; - if(yych != 'u') goto yy6; - goto yy45; -yy45: yych = *++YYCURSOR; - if(yych != 'r') goto yy6; - goto yy46; -yy46: yych = *++YYCURSOR; - if(yych != 'c') goto yy6; - goto yy47; -yy47: yych = *++YYCURSOR; - if(yych != 'e') goto yy6; - goto yy48; -yy48: yych = *++YYCURSOR; - if(yych == '$') goto yy50; - if(yych != ':') goto yy6; - goto yy49; -yy49: yych = *++YYCURSOR; - if(yych == '$') goto yy6; - goto yy53; -yy50: ++YYCURSOR; - goto yy51; +yy42: ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + goto yy43; +yy43: if(yych == 0x000A) goto yy6; + if(yych == '$') goto yy40; + goto yy42; +yy44: yych = *++YYCURSOR; + if(yych != 'u') goto yy6; + goto yy45; +yy45: yych = *++YYCURSOR; + if(yych != 'r') goto yy6; + goto yy46; +yy46: yych = *++YYCURSOR; + if(yych != 'c') goto yy6; + goto yy47; +yy47: yych = *++YYCURSOR; + if(yych != 'e') goto yy6; + goto yy48; +yy48: yych = *++YYCURSOR; + if(yych == '$') goto yy50; + if(yych != ':') goto yy6; + goto yy49; +yy49: yych = *++YYCURSOR; + if(yych == '$') goto yy6; + goto yy53; +yy50: ++YYCURSOR; + goto yy51; yy51: #line 52 "cvsignore.wb.re" { APPEND(L"$" L"Source$"); goto loop; } #line 259 "" -yy52: ++YYCURSOR; - if(YYLIMIT == YYCURSOR) YYFILL(1); - yych = *YYCURSOR; - goto yy53; -yy53: if(yych == 0x000A) goto yy6; - if(yych == '$') goto yy50; - goto yy52; -} +yy52: ++YYCURSOR; + if(YYLIMIT == YYCURSOR) YYFILL(1); + yych = *YYCURSOR; + goto yy53; +yy53: if(yych == 0x000A) goto yy6; + if(yych == '$') goto yy50; + goto yy52; + } } #line 55 "cvsignore.wb.re" diff --git a/test/input8.c b/test/input8.c index 7d7876e8..26bca05e 100755 --- a/test/input8.c +++ b/test/input8.c @@ -54,10 +54,10 @@ yy9: YYCURSOR = YYMARKER; case 0: goto yy3; } yy10: yych = *++YYCURSOR; - if(yych <= 0x00) goto yy12; + if(yych <= 0x00) goto yy12; goto yy7; yy11: yych = *++YYCURSOR; - if(yych >= 0x01) goto yy9; + if(yych >= 0x01) goto yy9; goto yy12; yy12: ++YYCURSOR; yych = *YYCURSOR; diff --git a/test/modula.c b/test/modula.c index ef07515e..17070fef 100644 --- a/test/modula.c +++ b/test/modula.c @@ -73,7 +73,8 @@ yy0: if((YYLIMIT - YYCURSOR) < 15) YYFILL(15); yych = *YYCURSOR; switch(yych){ - case 0x09: case ' ': goto yy73; + case 0x09: + case ' ': goto yy73; case 0x0A: goto yy75; case '"': goto yy9; case '#': goto yy10; @@ -109,10 +110,13 @@ yy0: case 'E': goto yy57; case 'F': goto yy58; case 'G': - case 'H': case 'J': - case 'K': case 'X': + case 'H': + case 'J': + case 'K': + case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -477,7 +481,8 @@ yy78: ++YYCURSOR; yych = *YYCURSOR; goto yy79; yy79: switch(yych){ - case 0x09: case ' ': goto yy78; + case 0x09: + case ' ': goto yy78; default: goto yy74; } yy80: ++YYCURSOR; @@ -494,7 +499,8 @@ yy81: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -519,7 +525,8 @@ yy81: switch(yych){ case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -573,7 +580,8 @@ yy85: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -598,7 +606,8 @@ yy85: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -651,7 +660,8 @@ yy89: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -676,7 +686,8 @@ yy89: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -724,7 +735,8 @@ yy92: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -749,7 +761,8 @@ yy92: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -807,7 +820,8 @@ yy97: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -832,7 +846,8 @@ yy97: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -880,7 +895,8 @@ yy100: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -905,7 +921,8 @@ yy100: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -958,7 +975,8 @@ yy104: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -983,7 +1001,8 @@ yy104: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -1031,7 +1050,8 @@ yy107: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1056,7 +1076,8 @@ yy107: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -1104,7 +1125,8 @@ yy110: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1129,7 +1151,8 @@ yy110: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -1204,7 +1227,8 @@ yy118: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1229,7 +1253,8 @@ yy118: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -1282,7 +1307,8 @@ yy122: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1307,7 +1333,8 @@ yy122: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -1360,7 +1387,8 @@ yy126: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1385,7 +1413,8 @@ yy126: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -1463,7 +1492,8 @@ yy135: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1488,7 +1518,8 @@ yy135: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -1571,7 +1602,8 @@ yy145: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1596,7 +1628,8 @@ yy145: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -1659,7 +1692,8 @@ yy151: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1684,7 +1718,8 @@ yy151: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -1727,7 +1762,8 @@ yy153: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1752,7 +1788,8 @@ yy153: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -1795,7 +1832,8 @@ yy155: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1820,7 +1858,8 @@ yy155: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -1868,7 +1907,8 @@ yy158: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1893,7 +1933,8 @@ yy158: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -1941,7 +1982,8 @@ yy161: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1960,11 +2002,13 @@ yy161: ++YYCURSOR; case 'Q': case 'R': case 'S': - case 'T': case 'V': + case 'T': + case 'V': case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -2018,7 +2062,8 @@ yy165: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2043,7 +2088,8 @@ yy165: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -2096,7 +2142,8 @@ yy169: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2121,7 +2168,8 @@ yy169: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -2164,7 +2212,8 @@ yy171: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2189,7 +2238,8 @@ yy171: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -2237,7 +2287,8 @@ yy174: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2262,7 +2313,8 @@ yy174: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -2326,7 +2378,8 @@ yy180: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2351,7 +2404,8 @@ yy180: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -2439,7 +2493,8 @@ yy191: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2464,7 +2519,8 @@ yy191: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -2522,7 +2578,8 @@ yy196: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2547,7 +2604,8 @@ yy196: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -2590,7 +2648,8 @@ yy198: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2615,7 +2674,8 @@ yy198: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -2694,7 +2754,8 @@ yy207: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2719,7 +2780,8 @@ yy207: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -2762,7 +2824,8 @@ yy209: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2787,7 +2850,8 @@ yy209: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -2830,7 +2894,8 @@ yy211: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2855,7 +2920,8 @@ yy211: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -2904,7 +2970,8 @@ yy214: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -2929,7 +2996,8 @@ yy214: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -2977,7 +3045,8 @@ yy217: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3002,7 +3071,8 @@ yy217: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -3055,7 +3125,8 @@ yy221: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3080,7 +3151,8 @@ yy221: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -3123,7 +3195,8 @@ yy223: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3148,7 +3221,8 @@ yy223: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -3226,7 +3300,8 @@ yy232: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3251,7 +3326,8 @@ yy232: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -3314,7 +3390,8 @@ yy238: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3339,7 +3416,8 @@ yy238: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -3387,7 +3465,8 @@ yy241: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3412,7 +3491,8 @@ yy241: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -3460,7 +3540,8 @@ yy244: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3485,7 +3566,8 @@ yy244: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -3538,7 +3620,8 @@ yy248: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3563,7 +3646,8 @@ yy248: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -3626,7 +3710,8 @@ yy254: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3651,7 +3736,8 @@ yy254: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -3694,7 +3780,8 @@ yy256: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3719,7 +3806,8 @@ yy256: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -3863,7 +3951,8 @@ yy280: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -3905,7 +3994,8 @@ yy286: switch(yych){ } yy287: yych = *++YYCURSOR; switch(yych){ - case '+': case '-': goto yy288; + case '+': + case '-': goto yy288; case '0': case '1': case '2': @@ -3966,7 +4056,8 @@ yy292: switch(yych){ case '7': goto yy291; case '8': case '9': goto yy277; - case 'A': case 'D': + case 'A': + case 'D': case 'E': case 'F': goto yy279; case 'B': goto yy293; @@ -3986,7 +4077,8 @@ yy293: yyaccept = 3; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -4011,7 +4103,8 @@ yy295: yyaccept = 4; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': diff --git a/test/push.c b/test/push.c index 6f9b4150..3823b364 100755 --- a/test/push.c +++ b/test/push.c @@ -239,9 +239,11 @@ yy0: yych = *YYCURSOR; switch(yych){ case 0x00: goto yy32; - case 0x09: case 0x0B: + case 0x09: + case 0x0B: case 0x0C: - case 0x0D: case ' ': goto yy30; + case 0x0D: + case ' ': goto yy30; case 0x0A: goto yy28; case '(': goto yy16; case ')': goto yy18; @@ -285,18 +287,24 @@ yy0: case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': case 'c': - case 'd': case 'j': + case 'Z': + case '_': + case 'a': + case 'c': + case 'd': + case 'j': case 'k': case 'l': case 'm': case 'n': case 'o': case 'p': - case 'q': case 's': + case 'q': + case 's': case 't': case 'u': - case 'v': case 'x': + case 'v': + case 'x': case 'y': case 'z': goto yy10; case 'b': goto yy7; @@ -456,7 +464,8 @@ yy39: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -481,7 +490,9 @@ yy39: switch(yych){ case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -540,7 +551,8 @@ yy44: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -565,7 +577,9 @@ yy44: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -623,7 +637,8 @@ yy49: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -648,7 +663,9 @@ yy49: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -706,7 +723,8 @@ yy54: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -731,7 +749,9 @@ yy54: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -784,7 +804,8 @@ yy58: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -809,7 +830,9 @@ yy58: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -862,7 +885,8 @@ yy62: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -887,7 +911,9 @@ yy62: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -935,7 +961,8 @@ yy65: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -960,7 +987,9 @@ yy65: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': @@ -1003,7 +1032,8 @@ yy67: ++YYCURSOR; case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -1028,7 +1058,9 @@ yy67: ++YYCURSOR; case 'W': case 'X': case 'Y': - case 'Z': case '_': case 'a': + case 'Z': + case '_': + case 'a': case 'b': case 'c': case 'd': diff --git a/test/repeater.c b/test/repeater.c index 38e16694..8f680864 100644 --- a/test/repeater.c +++ b/test/repeater.c @@ -25,7 +25,8 @@ yy0: if((YYLIMIT - YYCURSOR) < 7) YYFILL(7); yych = *YYCURSOR; switch(yych){ - case 0x0A: case 'q': goto yy7; + case 0x0A: + case 'q': goto yy7; case 'A': goto yy2; case 'a': goto yy4; default: goto yy6; @@ -34,7 +35,8 @@ yy2: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ case 0x0A: goto yy10; - case 'A': case 'a': goto yy8; + case 'A': + case 'a': goto yy8; default: goto yy3; } yy3: @@ -45,7 +47,8 @@ yy4: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch(yych){ case 0x0A: goto yy10; - case 'A': case 'a': goto yy8; + case 'A': + case 'a': goto yy8; default: goto yy5; } yy5: @@ -59,7 +62,8 @@ yy7: yych = *++YYCURSOR; yy8: yych = *++YYCURSOR; switch(yych){ case 0x0A: goto yy13; - case 'A': case 'a': goto yy12; + case 'A': + case 'a': goto yy12; default: goto yy9; } yy9: YYCURSOR = YYMARKER; @@ -76,7 +80,8 @@ yy11: yy12: yych = *++YYCURSOR; switch(yych){ case 0x0A: goto yy13; - case 'A': case 'a': goto yy15; + case 'A': + case 'a': goto yy15; default: goto yy9; } yy13: ++YYCURSOR; @@ -88,13 +93,15 @@ yy14: yy15: yych = *++YYCURSOR; switch(yych){ case 0x0A: goto yy17; - case 'A': case 'a': goto yy16; + case 'A': + case 'a': goto yy16; default: goto yy9; } yy16: yych = *++YYCURSOR; switch(yych){ case 0x0A: goto yy17; - case 'A': case 'a': goto yy19; + case 'A': + case 'a': goto yy19; default: goto yy9; } yy17: ++YYCURSOR; @@ -120,7 +127,8 @@ yy22: ++YYCURSOR; goto yy23; yy23: switch(yych){ case 0x0A: goto yy17; - case 'A': case 'a': goto yy22; + case 'A': + case 'a': goto yy22; default: goto yy9; } } diff --git a/test/sample.c b/test/sample.c index b8550ae8..ae92984d 100644 --- a/test/sample.c +++ b/test/sample.c @@ -35,7 +35,8 @@ yy0: case 'l': case 'm': case 'n': - case 'o': case 'q': + case 'o': + case 'q': case 'r': case 's': case 't': @@ -105,7 +106,8 @@ yy12: yych = *++YYCURSOR; case '6': case '7': case '8': - case '9': case 'a': + case '9': + case 'a': case 'b': case 'c': case 'd': @@ -131,7 +133,8 @@ yy15: switch(yych){ case '6': case '7': case '8': - case '9': case 'a': + case '9': + case 'a': case 'b': case 'c': case 'd': diff --git a/test/scanner.c b/test/scanner.c index 5bbcbe33..4ee81313 100644 --- a/test/scanner.c +++ b/test/scanner.c @@ -172,14 +172,20 @@ yy15: if((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; switch(yych){ - case 0x09: case ' ': goto yy33; + case 0x09: + case ' ': goto yy33; case 0x0A: goto yy35; case '"': goto yy23; case '\'': goto yy25; case '(': - case ')': case ';': case '=': case '\\': case '|': goto yy29; + case ')': + case ';': + case '=': + case '\\': + case '|': goto yy29; case '*': goto yy21; - case '+': case '?': goto yy30; + case '+': + case '?': goto yy30; case '/': goto yy19; case 'A': case 'B': @@ -206,7 +212,8 @@ yy15: case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd': @@ -348,7 +355,8 @@ yy39: ++YYCURSOR; yych = *YYCURSOR; goto yy40; yy40: switch(yych){ - case 0x09: case ' ': goto yy39; + case 0x09: + case ' ': goto yy39; default: goto yy34; } yy41: ++YYCURSOR; @@ -365,7 +373,8 @@ yy42: switch(yych){ case '6': case '7': case '8': - case '9': case 'A': + case '9': + case 'A': case 'B': case 'C': case 'D': @@ -390,7 +399,8 @@ yy42: switch(yych){ case 'W': case 'X': case 'Y': - case 'Z': case 'a': + case 'Z': + case 'a': case 'b': case 'c': case 'd':