MFH (Import PCRE 6.6)

1 files changed, 178 insertions, 58 deletions

diff --git a/ext/pcre/pcrelib/testdata/testoutput2 b/ext/pcre/pcrelib/testdata/testoutput2
index 8f078b8464..55adba0b9d 100644
--- a/ext/pcre/pcrelib/testdata/testoutput2
+++ b/ext/pcre/pcrelib/testdata/testoutput2
@@ -1,5 +1,3 @@
-PCRE version 6.2 01-Aug-2005
-
 /(a)b|/
 Capturing subpattern count = 1
 No options
@@ -1945,6 +1943,14 @@ Options: anchored
 No first char
 No need char
              
+/[_[:alpha:]]/IS
+Capturing subpattern count = 0
+No options
+No first char
+No need char
+Starting byte set: A B C D E F G H I J K L M N O P Q R S T U V W X Y Z 
+  _ a b c d e f g h i j k l m n o p q r s t u v w x y z 
+
 /^[[:ascii:]]/D
 ------------------------------------------------------------------
   0  37 Bra 0
@@ -1984,6 +1990,26 @@ Options: anchored
 No first char
 No need char
 
+/^[[:^blank:]]/D
+------------------------------------------------------------------
+  0  37 Bra 0
+  3     ^
+  4     [\x00-\x08\x0a-\x1f!-\xff]
+ 37  37 Ket
+ 40     End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Options: anchored
+No first char
+No need char
+
+/[\n\x0b\x0c\x0d[:blank:]]/IS
+Capturing subpattern count = 0
+No options
+No first char
+No need char
+Starting byte set: \x09 \x0a \x0b \x0c \x0d \x20 
+
 /^[[:cntrl:]]/D
 ------------------------------------------------------------------
   0  37 Bra 0
@@ -3995,14 +4021,16 @@ Need char = '<'
 
 /(a(?1)b)/D
 ------------------------------------------------------------------
-  0  16 Bra 0
-  3  10 Bra 1
+  0  22 Bra 0
+  3  16 Bra 1
   6     a
-  8   3 Recurse
- 11     b
- 13  10 Ket
- 16  16 Ket
- 19     End
+  8   6 Once
+ 11   3 Recurse
+ 14   6 Ket
+ 17     b
+ 19  16 Ket
+ 22  22 Ket
+ 25     End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 No options
@@ -4014,7 +4042,7 @@ Need char = 'b'
   0  22 Bra 0
   3  16 Bra 1
   6     a
-  8   6 Bra 0
+  8   6 Once
  11   3 Recurse
  14   6 KetRmax
  17     b
@@ -4246,7 +4274,7 @@ Need char = 'a'
 
 /(?P<a>a)...(?P=a)bbb(?P>a)d/D
 ------------------------------------------------------------------
-  0  28 Bra 0
+  0  34 Bra 0
   3   5 Bra 1
   6     a
   8   5 Ket
@@ -4255,10 +4283,12 @@ Need char = 'a'
  13     Any
  14     \1
  17     bbb
- 23   3 Recurse
- 26     d
- 28  28 Ket
- 31     End
+ 23   6 Once
+ 26   3 Recurse
+ 29   6 Ket
+ 32     d
+ 34  34 Ket
+ 37     End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
 Max back reference = 1
@@ -4418,7 +4448,7 @@ No need char
  24     End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Options:
+Options: no_auto_capture
 First char = 'a'
 Need char = 'c'
   abc
@@ -4439,7 +4469,7 @@ Need char = 'c'
 Capturing subpattern count = 1
 Named capturing subpatterns:
   one   1
-Options:
+Options: no_auto_capture
 First char = 'a'
 Need char = 'c'
   abc
@@ -4461,7 +4491,7 @@ Need char = 'c'
 Capturing subpattern count = 1
 Named capturing subpatterns:
   named   1
-Options:
+Options: no_auto_capture
 First char = 'a'
 Need char = 'c'
 
@@ -4472,11 +4502,13 @@ No options
 No first char
 Need char = 'z'
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazzbbbbbb\M
-Minimum match limit = 8
+Minimum match() limit = 8
+Minimum match() recursion limit = 7
  0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazz
  1: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   aaaaaaaaaaaaaz\M
-Minimum match limit = 32768
+Minimum match() limit = 32768
+Minimum match() recursion limit = 43
 No match
 
 /(aaa(?C1)bbb|ab)/
@@ -4633,18 +4665,20 @@ Need char = ']'
 
 /(a(b(?2)c))?/D
 ------------------------------------------------------------------
-  0  25 Bra 0
+  0  31 Bra 0
   3     Brazero
-  4  18 Bra 1
+  4  24 Bra 1
   7     a
-  9  10 Bra 2
+  9  16 Bra 2
  12     b
- 14   9 Recurse
- 17     c
- 19  10 Ket
- 22  18 Ket
- 25  25 Ket
- 28     End
+ 14   6 Once
+ 17   9 Recurse
+ 20   6 Ket
+ 23     c
+ 25  16 Ket
+ 28  24 Ket
+ 31  31 Ket
+ 34     End
 ------------------------------------------------------------------
 Capturing subpattern count = 2
 No options
@@ -4653,18 +4687,20 @@ No need char
 
 /(a(b(?2)c))*/D
 ------------------------------------------------------------------
-  0  25 Bra 0
+  0  31 Bra 0
   3     Brazero
-  4  18 Bra 1
+  4  24 Bra 1
   7     a
-  9  10 Bra 2
+  9  16 Bra 2
  12     b
- 14   9 Recurse
- 17     c
- 19  10 Ket
- 22  18 KetRmax
- 25  25 Ket
- 28     End
+ 14   6 Once
+ 17   9 Recurse
+ 20   6 Ket
+ 23     c
+ 25  16 Ket
+ 28  24 KetRmax
+ 31  31 Ket
+ 34     End
 ------------------------------------------------------------------
 Capturing subpattern count = 2
 No options
@@ -4673,29 +4709,33 @@ No need char
 
 /(a(b(?2)c)){0,2}/D
 ------------------------------------------------------------------
-  0  53 Bra 0
+  0  65 Bra 0
   3     Brazero
-  4  46 Bra 0
-  7  18 Bra 1
+  4  58 Bra 0
+  7  24 Bra 1
  10     a
- 12  10 Bra 2
+ 12  16 Bra 2
  15     b
- 17  12 Recurse
- 20     c
- 22  10 Ket
- 25  18 Ket
- 28     Brazero
- 29  18 Bra 1
- 32     a
- 34  10 Bra 2
- 37     b
- 39  12 Recurse
- 42     c
- 44  10 Ket
- 47  18 Ket
- 50  46 Ket
- 53  53 Ket
- 56     End
+ 17   6 Once
+ 20  12 Recurse
+ 23   6 Ket
+ 26     c
+ 28  16 Ket
+ 31  24 Ket
+ 34     Brazero
+ 35  24 Bra 1
+ 38     a
+ 40  16 Bra 2
+ 43     b
+ 45   6 Once
+ 48  12 Recurse
+ 51   6 Ket
+ 54     c
+ 56  16 Ket
+ 59  24 Ket
+ 62  58 Ket
+ 65  65 Ket
+ 68     End
 ------------------------------------------------------------------
 Capturing subpattern count = 2
 No options
@@ -5939,6 +5979,86 @@ Matched, but too many substrings
 13: a
 14: a
 
+/[^()]*(?:\((?R)\)[^()]*)*/
+Capturing subpattern count = 0
+Partial matching not supported
+No options
+No first char
+No need char
+    (this(and)that
+ 0: 
+    (this(and)that) 
+ 0: (this(and)that)
+    (this(and)that)stuff
+ 0: (this(and)that)stuff
+
+/[^()]*(?:\((?>(?R))\)[^()]*)*/
+Capturing subpattern count = 0
+Partial matching not supported
+No options
+No first char
+No need char
+    (this(and)that
+ 0: 
+    (this(and)that) 
+ 0: (this(and)that)
+    
+/[^()]*(?:\((?R)\))*[^()]*/
+Capturing subpattern count = 0
+Partial matching not supported
+No options
+No first char
+No need char
+    (this(and)that
+ 0: 
+    (this(and)that) 
+ 0: (this(and)that)
+
+/(?:\((?R)\))*[^()]*/
+Capturing subpattern count = 0
+Partial matching not supported
+No options
+No first char
+No need char
+    (this(and)that
+ 0: 
+    (this(and)that) 
+ 0: 
+    ((this)) 
+ 0: ((this))
+
+/(?:\((?R)\))|[^()]*/
+Capturing subpattern count = 0
+Partial matching not supported
+No options
+No first char
+No need char
+    (this(and)that
+ 0: 
+    (this(and)that) 
+ 0: 
+    (this)
+ 0: (this)
+    ((this)) 
+ 0: ((this))
+    
+/a(b)c/PN
+    abc
+Matched with REG_NOSUB
+    
+/a(?P<name>b)c/PN
+    abc  
+Matched with REG_NOSUB
+    
+/\x{100}/ 
+Failed: character value in \x{...} sequence is too large at offset 6
+
+/\x{0000ff}/
+Capturing subpattern count = 0
+No options
+First char = 255
+No need char
+
 / End of testinput2 /
 Capturing subpattern count = 0
 No options