aboutsummaryrefslogtreecommitdiff
path: root/lib/Support/regengine.inc
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Support/regengine.inc')
-rw-r--r--lib/Support/regengine.inc15
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/Support/regengine.inc b/lib/Support/regengine.inc
index ac848bcec8..f1ba56b02b 100644
--- a/lib/Support/regengine.inc
+++ b/lib/Support/regengine.inc
@@ -302,7 +302,6 @@ dissect(struct match *m, char *start, char *stop, sopno startst, sopno stopst)
char *ssp; /* start of string matched by subsubRE */
char *sep; /* end of string matched by subsubRE */
char *oldssp; /* previous ssp */
- char *dp;
AT("diss", start, stop, startst, stopst);
sp = start;
@@ -361,7 +360,7 @@ dissect(struct match *m, char *start, char *stop, sopno startst, sopno stopst)
esub = es - 1;
/* did innards match? */
if (slow(m, sp, rest, ssub, esub) != NULL) {
- dp = dissect(m, sp, rest, ssub, esub);
+ char *dp = dissect(m, sp, rest, ssub, esub);
assert(dp == rest);
} else /* no */
assert(sp == rest);
@@ -399,8 +398,10 @@ dissect(struct match *m, char *start, char *stop, sopno startst, sopno stopst)
}
assert(sep == rest); /* must exhaust substring */
assert(slow(m, ssp, sep, ssub, esub) == rest);
- dp = dissect(m, ssp, sep, ssub, esub);
- assert(dp == sep);
+ {
+ char *dp = dissect(m, ssp, sep, ssub, esub);
+ assert(dp == sep);
+ }
sp = rest;
break;
case OCH_:
@@ -434,8 +435,10 @@ dissect(struct match *m, char *start, char *stop, sopno startst, sopno stopst)
else
assert(OP(m->g->strip[esub]) == O_CH);
}
- dp = dissect(m, sp, rest, ssub, esub);
- assert(dp == rest);
+ {
+ char *dp = dissect(m, sp, rest, ssub, esub);
+ assert(dp == rest);
+ }
sp = rest;
break;
case O_PLUS: