Remove atomic from single repeats; convert possessive atomic to possessive

non-atomic (because they are the same).


git-svn-id: svn://vcs.exim.org/pcre/code/trunk@621 2f5784b3-3f2a-0410-8824-cb99058d5e15

9 files changed, 84 insertions, 77 deletions

diff --git a/testdata/testinput1 b/testdata/testinput1
index 795eb7d..6b72ffd 100644
--- a/testdata/testinput1
+++ b/testdata/testinput1
@@ -4181,4 +4181,13 @@
 /(?(?=(a))a)(b)/
     ab
 
+/^(?:a|ab)++c/
+    aaaabc
+
+/^(?>a|ab)++c/
+    aaaabc
+
+/^(?:a|ab)+c/
+    aaaabc
+
 /-- End of testinput1 --/
diff --git a/testdata/testinput11 b/testdata/testinput11
index d3a3641..691bb00 100644
--- a/testdata/testinput11
+++ b/testdata/testinput11
@@ -633,4 +633,10 @@ however, we need the complication for Perl. ---/
 /(?(?=(a(*ACCEPT)z))a)/
     a
 
+/^(a)(?1)+ab/
+    aaaab
+    
+/^(a)(?1)++ab/
+    aaaab
+
 /-- End of testinput11 --/
diff --git a/testdata/testinput2 b/testdata/testinput2
index 6fdc9be..6260d69 100644
--- a/testdata/testinput2
+++ b/testdata/testinput2
@@ -3771,4 +3771,12 @@ with \Y. ---/
 
 /(abc)(?1)/SI
 
+/^(?>a)++/
+    aa\M
+    aaaaaaaaa\M 
+    
+/(a)(?1)++/
+    aa\M
+    aaaaaaaaa\M  
+
 /-- End of testinput2 --/
diff --git a/testdata/testoutput1 b/testdata/testoutput1
index a6aca71..1f39d4d 100644
--- a/testdata/testoutput1
+++ b/testdata/testoutput1
@@ -6843,4 +6843,16 @@ No match
  1: a
  2: b
 
+/^(?:a|ab)++c/
+    aaaabc
+No match
+
+/^(?>a|ab)++c/
+    aaaabc
+No match
+
+/^(?:a|ab)+c/
+    aaaabc
+ 0: aaaabc
+
 /-- End of testinput1 --/
diff --git a/testdata/testoutput10 b/testdata/testoutput10
index e060356..02c3532 100644
--- a/testdata/testoutput10
+++ b/testdata/testoutput10
@@ -166,18 +166,16 @@ Memory allocation (code space): 816
 ------------------------------------------------------------------
 
 /(a(?1)b)/BM
-Memory allocation (code space): 28
+Memory allocation (code space): 22
 ------------------------------------------------------------------
-  0  24 Bra
-  3  18 CBra 1
+  0  18 Bra
+  3  12 CBra 1
   8     a
- 10   6 Once
- 13   3 Recurse
- 16   6 Ket
- 19     b
- 21  18 Ket
- 24  24 Ket
- 27     End
+ 10   3 Recurse
+ 13     b
+ 15  12 Ket
+ 18  18 Ket
+ 21     End
 ------------------------------------------------------------------
 
 /(a(?1)+b)/BM
@@ -234,9 +232,9 @@ Memory allocation (code space): 54
 ------------------------------------------------------------------
 
 /(?P<a>a)...(?P=a)bbb(?P>a)d/BM
-Memory allocation (code space): 43
+Memory allocation (code space): 37
 ------------------------------------------------------------------
-  0  36 Bra
+  0  30 Bra
   3   7 CBra 1
   8     a
  10   7 Ket
@@ -245,12 +243,10 @@ Memory allocation (code space): 43
  15     Any
  16     \1
  19     bbb
- 25   6 Once
- 28   3 Recurse
- 31   6 Ket
- 34     d
- 36  36 Ket
- 39     End
+ 25   3 Recurse
+ 28     d
+ 30  30 Ket
+ 33     End
 ------------------------------------------------------------------
 
 /abc(?C255)de(?C)f/BM
diff --git a/testdata/testoutput11 b/testdata/testoutput11
index f6a0b2e..a9a16d3 100644
--- a/testdata/testoutput11
+++ b/testdata/testoutput11
@@ -1203,4 +1203,13 @@ No match
  0: a
  1: a
 
+/^(a)(?1)+ab/
+    aaaab
+ 0: aaaab
+ 1: a
+    
+/^(a)(?1)++ab/
+    aaaab
+No match
+
 /-- End of testinput11 --/
diff --git a/testdata/testoutput2 b/testdata/testoutput2
index 49f0b57..82d745f 100644
--- a/testdata/testoutput2
+++ b/testdata/testoutput2
@@ -4004,9 +4004,7 @@ Need char = '<'
         Bra
         CBra 1
         a
-        Once
         Recurse
-        Ket
         b
         Ket
         Ket
@@ -4227,9 +4225,7 @@ Need char = 'a'
         Any
         \1
         bbb
-        Once
         Recurse
-        Ket
         d
         Ket
         End
@@ -4601,9 +4597,7 @@ Need char = ']'
         a
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
@@ -4623,9 +4617,7 @@ No need char
         a
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         KetRmax
@@ -4646,9 +4638,7 @@ No need char
         a
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
@@ -4657,9 +4647,7 @@ No need char
         a
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
@@ -7765,9 +7753,7 @@ No match
 ------------------------------------------------------------------
         Bra
         ^
-        Once
         Recurse
-        Ket
         [()]
         CBra 1
         Ket
@@ -7801,9 +7787,7 @@ No match
 ------------------------------------------------------------------
         Bra
         ^
-        Once
         Recurse
-        Ket
         ()
         CBra 1
         Ket
@@ -7815,9 +7799,7 @@ No match
 ------------------------------------------------------------------
         Bra
         ^
-        Once
         Recurse
-        Ket
         [(\]a]
         CBra 1
         Ket
@@ -7830,9 +7812,7 @@ No match
 ------------------------------------------------------------------
         Bra
         ^
-        Once
         Recurse
-        Ket
         CBra 1
         Ket
         Ket
@@ -8284,10 +8264,8 @@ No match
         Alt
         c
         Ket
-        Once
         Recurse
         Ket
-        Ket
         End
 ------------------------------------------------------------------
     abc
@@ -8298,9 +8276,7 @@ No match
 ------------------------------------------------------------------
         Bra
         xy
-        Once
         Recurse
-        Ket
         CBra 1
         abc
         Ket
@@ -9928,12 +9904,8 @@ Partial match: +ab
 /(?&word)(?&element)(?(DEFINE)(?<element><[^m][^>]>[^<])(?<word>\w*+))/BZ
 ------------------------------------------------------------------
         Bra
-        Once
         Recurse
-        Ket
-        Once
         Recurse
-        Ket
         Cond
         Cond def
         CBra 1
@@ -9954,12 +9926,8 @@ Partial match: +ab
 /(?&word)(?&element)(?(DEFINE)(?<element><[^\d][^>]>[^<])(?<word>\w*+))/BZ
 ------------------------------------------------------------------
         Bra
-        Once
         Recurse
-        Ket
-        Once
         Recurse
-        Ket
         Cond
         Cond def
         CBra 1
@@ -10700,12 +10668,10 @@ No match
         Cond nrecurse 1
         $
         Alt
-        Once
         Recurse
         Ket
         Ket
         Ket
-        Ket
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 4
@@ -10923,12 +10889,10 @@ No match
 ------------------------------------------------------------------
         Bra
         ^
-        Once
-        Brazero
-        Once
+        Braposzero
+        SBraPos
         Recurse
-        KetRmax
-        Ket
+        KetRpos
         Cond
         Cond def
         CBra 1
@@ -11940,4 +11904,26 @@ Need char = 'c'
 Subject length lower bound = 6
 No set of starting bytes
 
+/^(?>a)++/
+    aa\M
+Minimum match() limit = 5
+Minimum match() recursion limit = 3
+ 0: aa
+    aaaaaaaaa\M 
+Minimum match() limit = 12
+Minimum match() recursion limit = 3
+ 0: aaaaaaaaa
+    
+/(a)(?1)++/
+    aa\M
+Minimum match() limit = 7
+Minimum match() recursion limit = 5
+ 0: aa
+ 1: a
+    aaaaaaaaa\M  
+Minimum match() limit = 21
+Minimum match() recursion limit = 5
+ 0: aaaaaaaaa
+ 1: a
+
 /-- End of testinput2 --/
diff --git a/testdata/testoutput5 b/testdata/testoutput5
index 9b18300..2473911 100644
--- a/testdata/testoutput5
+++ b/testdata/testoutput5
@@ -599,10 +599,8 @@ Need char = 'A'
         Bra
         \x{100}*+
         \d
-        Once
         Recurse
         Ket
-        Ket
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
@@ -906,11 +904,9 @@ No match
         \x{100}abc
         CBra 1
         xyz
-        Once
         Recurse
         Ket
         Ket
-        Ket
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
@@ -925,11 +921,9 @@ Need char = 'z'
         abc
         CBra 1
         xyz
-        Once
         Recurse
         Ket
         Ket
-        Ket
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
@@ -944,11 +938,9 @@ Need char = 'z'
         abc
         CBra 1
         xyz
-        Once
         Recurse
         Ket
         Ket
-        Ket
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
@@ -964,9 +956,7 @@ Need char = 'z'
         \x{100}
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
@@ -987,9 +977,7 @@ No need char
         \x{100}
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
@@ -998,9 +986,7 @@ No need char
         \x{100}
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
@@ -1021,9 +1007,7 @@ No need char
         \x{100}
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
@@ -1044,9 +1028,7 @@ No need char
         \x{100}
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
@@ -1055,9 +1037,7 @@ No need char
         \x{100}
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
diff --git a/testdata/testoutput7 b/testdata/testoutput7
index 45b447a..83d8b5d 100644
--- a/testdata/testoutput7
+++ b/testdata/testoutput7
@@ -676,6 +676,7 @@ No match
 /^(a*\w|ab)=(?1)/
     ab=ab
  0: ab=ab
+ 1: ab=a
 
 /^([^()]|\((?1)*\))*$/
     abc