Re: lookbehind broken with latest bleedperl

Message-Id: <200201131806.g0DI6Mp20089@crypt.compulink.co.uk>

p4raw-id: //depot/perl@14240

diff --git a/regexec.c b/regexec.c
index 3380ad5..c3948ac 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -140,13 +140,18 @@
     PL_regkind[(U8)OP(rn)] == EXACT || PL_regkind[(U8)OP(rn)] == REF \
 )
 
+/*
+  Search for mandatory following text node; for lookahead, the text must
+  follow but for lookbehind (rn->flags != 0) we skip to the next step.
+*/
 #define FIND_NEXT_IMPT(rn) STMT_START { \
     while (JUMPABLE(rn)) \
-       if (OP(rn) == SUSPEND || OP(rn) == IFMATCH || \
-           PL_regkind[(U8)OP(rn)] == CURLY) \
+       if (OP(rn) == SUSPEND || PL_regkind[(U8)OP(rn)] == CURLY) \
            rn = NEXTOPER(NEXTOPER(rn)); \
        else if (OP(rn) == PLUS) \
            rn = NEXTOPER(rn); \
+       else if (OP(rn) == IFMATCH) \
+           rn = (rn->flags == 0) ? NEXTOPER(NEXTOPER(rn)) : rn + ARG(rn); \
        else rn += NEXT_OFF(rn); \
 } STMT_END 
 

diff --git a/t/op/re_tests b/t/op/re_tests
index 5816601..88f69f2 100644 (file)
--- a/t/op/re_tests
+++ b/t/op/re_tests
@@ -799,3 +799,37 @@ ab(?i)cd   abCd    y       -       -
 '^(o)(?!.*\1)'i        Oo      n       -       -
 (.*)\d+\1      abc12bc y       $1      bc
 (?m:(foo\s*$)) foo\n bar       y       $1      foo
+(.*)c  abcd    y       $1      ab
+(.*)(?=c)      abcd    y       $1      ab
+(.*)(?=c)c     abcd    yB      $1      ab
+(.*)(?=b|c)    abcd    y       $1      ab
+(.*)(?=b|c)c   abcd    y       $1      ab
+(.*)(?=c|b)    abcd    y       $1      ab
+(.*)(?=c|b)c   abcd    y       $1      ab
+(.*)(?=[bc])   abcd    y       $1      ab
+(.*)(?=[bc])c  abcd    yB      $1      ab
+(.*)(?<=b)     abcd    y       $1      ab
+(.*)(?<=b)c    abcd    y       $1      ab
+(.*)(?<=b|c)   abcd    y       $1      abc
+(.*)(?<=b|c)c  abcd    y       $1      ab
+(.*)(?<=c|b)   abcd    y       $1      abc
+(.*)(?<=c|b)c  abcd    y       $1      ab
+(.*)(?<=[bc])  abcd    y       $1      abc
+(.*)(?<=[bc])c abcd    y       $1      ab
+(.*?)c abcd    y       $1      ab
+(.*?)(?=c)     abcd    y       $1      ab
+(.*?)(?=c)c    abcd    yB      $1      ab
+(.*?)(?=b|c)   abcd    y       $1      a
+(.*?)(?=b|c)c  abcd    y       $1      ab
+(.*?)(?=c|b)   abcd    y       $1      a
+(.*?)(?=c|b)c  abcd    y       $1      ab
+(.*?)(?=[bc])  abcd    y       $1      a
+(.*?)(?=[bc])c abcd    yB      $1      ab
+(.*?)(?<=b)    abcd    y       $1      ab
+(.*?)(?<=b)c   abcd    y       $1      ab
+(.*?)(?<=b|c)  abcd    y       $1      ab
+(.*?)(?<=b|c)c abcd    y       $1      ab
+(.*?)(?<=c|b)  abcd    y       $1      ab
+(.*?)(?<=c|b)c abcd    y       $1      ab
+(.*?)(?<=[bc]) abcd    y       $1      ab
+(.*?)(?<=[bc])c        abcd    y       $1      ab