summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo van der Sanden <hv@crypt.org>2001-11-23 15:15:24 +0000
committerJarkko Hietaniemi <jhi@iki.fi>2001-11-23 14:58:40 +0000
commita1917ab96472a0f938aee4646d539e070dc12cd3 (patch)
tree4d35bf29ff86d87260b1026dd452e78b068e120b
parent2a5a0c38d81f8514d109f773aaadbf70b29e85b9 (diff)
downloadperl-a1917ab96472a0f938aee4646d539e070dc12cd3.tar.gz
Re: regex oddness with \Z and $&
Message-Id: <200111231515.fANFFOR10341@crypt.compulink.co.uk> p4raw-id: //depot/perl@13198
-rw-r--r--regcomp.c1
-rw-r--r--t/op/re_tests8
2 files changed, 5 insertions, 4 deletions
diff --git a/regcomp.c b/regcomp.c
index 12e03959fd..3eb4e3937d 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -2795,6 +2795,7 @@ tryagain:
case 'Z':
ret = reg_node(pRExC_state, SEOL);
*flagp |= SIMPLE;
+ RExC_seen_zerolen++; /* Do not optimize RE away */
nextchar(pRExC_state);
break;
case 'z':
diff --git a/t/op/re_tests b/t/op/re_tests
index 1e80f5031c..c7ab5ad814 100644
--- a/t/op/re_tests
+++ b/t/op/re_tests
@@ -537,7 +537,7 @@ a$ b\na\n y $-[0] 2
a\Z b\na y $-[0] 2
a\z b\na y $-[0] 2
a$ b\na y $-[0] 2
-'a\Z'm a\nb\n bn - -
+'a\Z'm a\nb\n n - -
'a\z'm a\nb\n n - -
'a$'m a\nb\n y $-[0] 0
'a\Z'm b\na\n y $-[0] 2
@@ -555,7 +555,7 @@ aa$ b\naa\n y $-[0] 2
aa\Z b\naa y $-[0] 2
aa\z b\naa y $-[0] 2
aa$ b\naa y $-[0] 2
-'aa\Z'm aa\nb\n bn - -
+'aa\Z'm aa\nb\n n - -
'aa\z'm aa\nb\n n - -
'aa$'m aa\nb\n y $-[0] 0
'aa\Z'm b\naa\n y $-[0] 2
@@ -609,7 +609,7 @@ ab$ b\nab\n y $-[0] 2
ab\Z b\nab y $-[0] 2
ab\z b\nab y $-[0] 2
ab$ b\nab y $-[0] 2
-'ab\Z'm ab\nb\n bn - -
+'ab\Z'm ab\nb\n n - -
'ab\z'm ab\nb\n n - -
'ab$'m ab\nb\n y $-[0] 0
'ab\Z'm b\nab\n y $-[0] 2
@@ -663,7 +663,7 @@ abb$ b\nabb\n y $-[0] 2
abb\Z b\nabb y $-[0] 2
abb\z b\nabb y $-[0] 2
abb$ b\nabb y $-[0] 2
-'abb\Z'm abb\nb\n bn - -
+'abb\Z'm abb\nb\n n - -
'abb\z'm abb\nb\n n - -
'abb$'m abb\nb\n y $-[0] 0
'abb\Z'm b\nabb\n y $-[0] 2