regex: \R can match either 1 or 2 chars

Therefore it is not "simple", and should not be compiled as such,
causing things like the test added herein to fail.

diff --git a/regcomp.c b/regcomp.c
index 2df4ce2..d1ee95c 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -10274,7 +10274,7 @@ tryagain:
            goto finish_meta_pat;
        case 'R':
            ret = reg_node(pRExC_state, LNBREAK);
-           *flagp |= HASWIDTH|SIMPLE;
+           *flagp |= HASWIDTH;
            goto finish_meta_pat;
        case 'h':
            ret = reg_node(pRExC_state, HORIZWS);

diff --git a/regexec.c b/regexec.c
index c59743a..f25bce1 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -7022,25 +7022,8 @@ S_regrepeat(pTHX_ const regexp *prog, char **startposp, const regnode *p, I32 ma
        }
        break;
     case LNBREAK:
-        if (utf8_target) {
-           loceol = PL_regeol;
-           while (hardcount < max && scan < loceol &&
-                    (c=is_LNBREAK_utf8_safe(scan, loceol))) {
-               scan += c;
-               hardcount++;
-           }
-       } else {
-           /*
-             LNBREAK can match two latin chars, which is ok,
-             because we have a null terminated string, but we
-             have to use hardcount in this situation
-           */
-           while (scan < loceol && (c=is_LNBREAK_latin1_safe(scan, loceol))) {
-               scan+=c;
-               hardcount++;
-           }
-       }       
-       break;
+        Perl_croak(aTHX_ "panic: regrepeat() should not be called with non-simple: LNBREAK");
+        assert(0); /* NOTREACHED */
     case HORIZWS:
         if (utf8_target) {
            loceol = PL_regeol;

diff --git a/t/re/re_tests b/t/re/re_tests
index a59a6ab..387a74b 100644 (file)
--- a/t/re/re_tests
+++ b/t/re/re_tests
@@ -1709,4 +1709,6 @@ ab[c\\\](??{"x"})]{3}d    ab\\](d y       -       -
 
 (\x{100})      \x{2000}\x{2000}\x{2000}\x{100} y       $-[0]:$-[1]:$+[0]:$+[1] 3:3:4:4
 
+^\R{2}$        \r\n\r\n        y       $&      \r\n\r\n
+
 # vim: softtabstop=0 noexpandtab