diff options
| -rw-r--r-- | src/cmd/grep/comp.c | 6 | ||||
| -rw-r--r-- | src/cmd/grep/grep.h | 4 | ||||
| -rw-r--r-- | src/cmd/grep/grep.y | 8 | ||||
| -rw-r--r-- | src/cmd/grep/sub.c | 44 |
4 files changed, 31 insertions, 31 deletions
diff --git a/src/cmd/grep/comp.c b/src/cmd/grep/comp.c index 4a3f3e8f..030e7e3f 100644 --- a/src/cmd/grep/comp.c +++ b/src/cmd/grep/comp.c @@ -96,7 +96,7 @@ loop: case Tcase: if(c >= 0 && c < 256) - if(r1 = r->cases[c]) + if(r1 = r->u.cases[c]) follow[nfollow++] = r1; if(r = r->next) goto loop; @@ -104,7 +104,7 @@ loop: case Talt: case Tor: - fol1(r->alt, c); + fol1(r->u.alt, c); r = r->next; goto loop; @@ -119,7 +119,7 @@ loop: break; case Tclass: - if(c >= r->lo && c <= r->hi) + if(c >= r->u.x.lo && c <= r->u.x.hi) follow[nfollow++] = r->next; break; } diff --git a/src/cmd/grep/grep.h b/src/cmd/grep/grep.h index 8445df54..c90be405 100644 --- a/src/cmd/grep/grep.h +++ b/src/cmd/grep/grep.h @@ -36,9 +36,9 @@ struct Re { Rune lo; Rune hi; - }; + } x; Rune val; /* char */ - }; + } u; Re* next; }; diff --git a/src/cmd/grep/grep.y b/src/cmd/grep/grep.y index 94a744cf..60d83828 100644 --- a/src/cmd/grep/grep.y +++ b/src/cmd/grep/grep.y @@ -66,14 +66,14 @@ expr3: { $$.beg = ral(Talt); patchnext($1.end, $$.beg); - $$.beg->alt = $1.beg; + $$.beg->u.alt = $1.beg; $$.end = $$.beg; $$.beg = $1.beg; } | expr3 LQUES { $$.beg = ral(Talt); - $$.beg->alt = $1.beg; + $$.beg->u.alt = $1.beg; $$.end = $1.end; appendnext($$.end, $$.beg); } @@ -82,8 +82,8 @@ expr4: LCHAR { $$.beg = ral(Tclass); - $$.beg->lo = $1; - $$.beg->hi = $1; + $$.beg->u.x.lo = $1; + $$.beg->u.x.hi = $1; $$.end = $$.beg; } | LBEGIN diff --git a/src/cmd/grep/sub.c b/src/cmd/grep/sub.c index be2acee3..f504b6df 100644 --- a/src/cmd/grep/sub.c +++ b/src/cmd/grep/sub.c @@ -63,11 +63,11 @@ countor(Re *r) loop: switch(r->type) { case Tor: - n += countor(r->alt); + n += countor(r->u.alt); r = r->next; goto loop; case Tclass: - return n + r->hi - r->lo + 1; + return n + r->u.x.hi - r->u.x.lo + 1; } return n; } @@ -80,7 +80,7 @@ oralloc(int t, Re *r, Re *b) if(b == 0) return r; a = ral(t); - a->alt = r; + a->u.alt = r; a->next = b; return a; } @@ -93,13 +93,13 @@ case1(Re *c, Re *r) loop: switch(r->type) { case Tor: - case1(c, r->alt); + case1(c, r->u.alt); r = r->next; goto loop; case Tclass: /* add to character */ - for(n=r->lo; n<=r->hi; n++) - c->cases[n] = oralloc(Tor, r->next, c->cases[n]); + for(n=r->u.x.lo; n<=r->u.x.hi; n++) + c->u.cases[n] = oralloc(Tor, r->next, c->u.cases[n]); break; default: /* add everything unknown to next */ @@ -125,13 +125,13 @@ addcase(Re *r) n = countor(r); if(n >= Caselim) { a = ral(Tcase); - a->cases = mal(256*sizeof(*a->cases)); + a->u.cases = mal(256*sizeof(*a->u.cases)); case1(a, r); for(i=0; i<256; i++) - if(a->cases[i]) { - r = a->cases[i]; + if(a->u.cases[i]) { + r = a->u.cases[i]; if(countor(r) < n) - a->cases[i] = addcase(r); + a->u.cases[i] = addcase(r); } return a; } @@ -139,7 +139,7 @@ addcase(Re *r) case Talt: r->next = addcase(r->next); - r->alt = addcase(r->alt); + r->u.alt = addcase(r->u.alt); return r; case Tbegin: @@ -223,7 +223,7 @@ re2star(Re2 a) Re2 c; c.beg = ral(Talt); - c.beg->alt = a.beg; + c.beg->u.alt = a.beg; patchnext(a.end, c.beg); c.end = c.beg; return c; @@ -235,7 +235,7 @@ re2or(Re2 a, Re2 b) Re2 c; c.beg = ral(Tor); - c.beg->alt = b.beg; + c.beg->u.alt = b.beg; c.beg->next = a.beg; c.end = b.end; appendnext(c.end, a.end); @@ -248,8 +248,8 @@ re2char(int c0, int c1) Re2 c; c.beg = ral(Tclass); - c.beg->lo = c0 & 0xff; - c.beg->hi = c1 & 0xff; + c.beg->u.x.lo = c0 & 0xff; + c.beg->u.x.hi = c1 & 0xff; c.end = c.beg; return c; } @@ -274,15 +274,15 @@ loop: case Tcase: print("case ->%p\n", a->next); for(i=0; i<256; i++) - if(a->cases[i]) { + if(a->u.cases[i]) { for(j=i+1; j<256; j++) - if(a->cases[i] != a->cases[j]) + if(a->u.cases[i] != a->u.cases[j]) break; - print(" [%.2x-%.2x] ->%p\n", i, j-1, a->cases[i]); + print(" [%.2x-%.2x] ->%p\n", i, j-1, a->u.cases[i]); i = j-1; } for(i=0; i<256; i++) - reprint1(a->cases[i]); + reprint1(a->u.cases[i]); break; case Tbegin: @@ -294,13 +294,13 @@ loop: break; case Tclass: - print("[%.2x-%.2x] ->%p\n", a->lo, a->hi, a->next); + print("[%.2x-%.2x] ->%p\n", a->u.x.lo, a->u.x.hi, a->next); break; case Tor: case Talt: - print("| %p ->%p\n", a->alt, a->next); - reprint1(a->alt); + print("| %p ->%p\n", a->u.alt, a->next); + reprint1(a->u.alt); break; } a = a->next; |