Code changes for simpler backtracking handling (docs to follow).

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

1 files changed, 35 insertions, 33 deletions

diff --git a/testdata/testinput1 b/testdata/testinput1
index f643bbb..b7b5934 100644
--- a/testdata/testinput1
+++ b/testdata/testinput1
@@ -4656,16 +4656,10 @@
 /(?<pn> \( ( [^()]++ | (?&pn) )* \) )/x
     (ab(cd)ef)
 
-/^(?!a(*SKIP)b)/
-    ac
-    
 /^(?=a(*SKIP)b|ac)/
     ** Failers
     ac
     
-/^(?=a(*THEN)b|ac)/
-    ac
-    
 /^(?=a(*PRUNE)b)/
     ab  
     ** Failers 
@@ -4674,9 +4668,6 @@
 /^(?=a(*ACCEPT)b)/
     ac
 
-/^(?(?!a(*SKIP)b))/
-    ac
-
 /(?>a\Kb)/
     ab
 
@@ -4899,33 +4890,15 @@ however, we need the complication for Perl. ---/
 /(A (A|B(*ACCEPT)|C) D)(E)/x
     AB
 
-/\A.*?(?:a|b(*THEN)c)/
-    ba
-
-/\A.*?(?:a|bc)/
-    ba
-
-/\A.*?(a|b(*THEN)c)/
-    ba
-
 /\A.*?(a|bc)/
     ba
 
-/\A.*?(?:a|b(*THEN)c)++/
-    ba
-
 /\A.*?(?:a|bc)++/
     ba
 
-/\A.*?(a|b(*THEN)c)++/
-    ba
-
 /\A.*?(a|bc)++/
     ba
 
-/\A.*?(?:a|b(*THEN)c|d)/
-    ba
-
 /\A.*?(?:a|bc|d)/
     ba
 
@@ -5253,9 +5226,6 @@ name were given. ---/
 /(a(*COMMIT)b){0}a(?1)|aac/
     aac
 
-/(?!a(*COMMIT)b)ac|cd/
-    ac
-
 /((?:a?)*)*c/
   aac   
 
@@ -5309,9 +5279,6 @@ name were given. ---/
 /(?:(a(*SKIP)b)){0}(?:(?1)|ac)/
     ac 
 
-/(?:(a(*MARK:X)a+(*SKIP:X)b)){0}(?:(?1)|aac)/
-    aac 
-
 /(?<=(*SKIP)ac)a/
     aa
 
@@ -5442,4 +5409,39 @@ backtracked onto, whether or not it has a label. --/
 /a(*:m)a(*COMMIT)(*SKIP:m)b|a+c/K
     aaaaaac
 
+/.?(a|b(*THEN)c)/
+    ba
+
+/(a(*COMMIT)b)c|abd/
+    abc
+    abd
+
+/(?=a(*COMMIT)b)abc|abd/
+    abc
+    abd
+
+/(?>a(*COMMIT)b)c|abd/
+    abc
+    abd
+
+/a(?=b(*COMMIT)c)[^d]|abd/
+    abd
+    abc 
+
+/a(?=bc).|abd/
+    abd
+    abc 
+    
+/a(?>b(*COMMIT)c)d|abd/
+    abceabd 
+
+/a(?>bc)d|abd/
+    abceabd 
+
+/(?>a(*COMMIT)b)c|abd/
+    abd
+
+/(?>a(*COMMIT)c)d|abd/
+    abd
+
 /-- End of testinput1 --/