summaryrefslogtreecommitdiff
path: root/regexec.c
diff options
context:
space:
mode:
authorIlya Zakharevich <ilya@math.berkeley.edu>1998-06-11 00:03:58 -0400
committerGurusamy Sarathy <gsar@cpan.org>1998-06-12 06:51:08 +0000
commite91177edb0beae74fd07fb1ec08a528ab1fb63c2 (patch)
tree79aec7d520aa282d1ae9d1ea31c65e1d2fd40c87 /regexec.c
parent9c7e81e8284418a8170662b2b8ec04f26145e65e (diff)
downloadperl-e91177edb0beae74fd07fb1ec08a528ab1fb63c2.tar.gz
applied patch, with indentation tweaks
Message-Id: <199806110803.EAA09149@monk.mps.ohio-state.edu> Subject: [PATCH 5.004_66] Remove REG_ALIGN junk p4raw-id: //depot/perl@1120
Diffstat (limited to 'regexec.c')
-rw-r--r--regexec.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/regexec.c b/regexec.c
index 5ef0313870..e73152f404 100644
--- a/regexec.c
+++ b/regexec.c
@@ -776,13 +776,9 @@ regmatch(regnode *prog)
SvPVX(prop));
} );
-#ifdef REGALIGN
next = scan + NEXT_OFF(scan);
if (next == scan)
next = NULL;
-#else
- next = regnext(scan);
-#endif
switch (OP(scan)) {
case BOL:
@@ -1242,15 +1238,11 @@ regmatch(regnode *prog)
regendp[n] = 0;
*reglastparen = n;
scan = next;
-#ifdef REGALIGN
/*SUPPRESS 560*/
if (n = (c1 == BRANCH ? NEXT_OFF(next) : ARG(next)))
next += n;
else
next = NULL;
-#else
- next = regnext(next);
-#endif
inner = NEXTOPER(scan);
if (c1 == BRANCHJ) {
inner = NEXTOPER(inner);
@@ -1274,7 +1266,6 @@ regmatch(regnode *prog)
and has no parenths to influence future backrefs. */
ln = ARG1(scan); /* min to match */
n = ARG2(scan); /* max to match */
-#ifdef REGALIGN_STRUCT
paren = scan->flags;
if (paren) {
if (paren > regsize)
@@ -1282,7 +1273,6 @@ regmatch(regnode *prog)
if (paren > *reglastparen)
*reglastparen = paren;
}
-#endif
scan = NEXTOPER(scan) + NODE_STEP_REGNODE;
if (paren)
scan += NEXT_OFF(scan); /* Skip former OPEN. */