Revision: 333
http://www.exim.org/viewvc/pcre2?view=rev&revision=333
Author: ph10
Date: 2015-08-03 18:25:55 +0100 (Mon, 03 Aug 2015)
Log Message:
-----------
Maintenance on tests for Perl compatibility
Modified Paths:
--------------
code/trunk/perltest.sh
code/trunk/testdata/testinput1
code/trunk/testdata/testinput2
code/trunk/testdata/testinput4
code/trunk/testdata/testinput5
code/trunk/testdata/testoutput1
code/trunk/testdata/testoutput2
code/trunk/testdata/testoutput4
code/trunk/testdata/testoutput5
Modified: code/trunk/perltest.sh
===================================================================
--- code/trunk/perltest.sh 2015-08-03 13:18:49 UTC (rev 332)
+++ code/trunk/perltest.sh 2015-08-03 17:25:55 UTC (rev 333)
@@ -204,7 +204,7 @@
printf "data> " if $interact;
last NEXT_RE if ! ($_ = <$infile>);
chomp;
- printf $outfile "$_\n" if ! $interact;
+ printf $outfile "%s", "$_\n" if ! $interact;
s/\s+$//; # Remove trailing space
s/^\s+//; # Remove leading space
Modified: code/trunk/testdata/testinput1
===================================================================
--- code/trunk/testdata/testinput1 2015-08-03 13:18:49 UTC (rev 332)
+++ code/trunk/testdata/testinput1 2015-08-03 17:25:55 UTC (rev 333)
@@ -1448,18 +1448,6 @@
ABCabc
abcABC
-/ab{3cd/
- ab{3cd
-
-/ab{3,cd/
- ab{3,cd
-
-/ab{3,4a}cd/
- ab{3,4a}cd
-
-/{4,5a}bc/
- {4,5a}bc
-
/abc$/
abc
abc\n
@@ -1931,9 +1919,6 @@
x\nb\n
a\bx\n
-/\x0{ab}/
- \0{ab}
-
/(A|B)*?CD/
CD
@@ -4290,12 +4275,6 @@
** Failers
aaaaaa
-/ab\Cde/
- abXde
-
-/(?<=ab\Cde)X/
- abZdeX
-
/\H\h\V\v/
X X\x0a
X\x09X\x0b
@@ -4351,7 +4330,7 @@
** Failers
defabcxyz
-/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-02}Z/
+/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-2}Z/
ababababbbabZXXXX
/(?<A>tom|bon)-\g{A}/
@@ -5216,18 +5195,6 @@
/(?:.*?a)(?<=ba)/
aba
-/.*?a(*PRUNE)b/
- aab
-
-/.*?a(*PRUNE)b/s
- aab
-
-/^a(*PRUNE)b/s
- aab
-
-/.*?a(*SKIP)b/
- aab
-
/(?>.*?a)b/s
aab
Modified: code/trunk/testdata/testinput2
===================================================================
--- code/trunk/testdata/testinput2 2015-08-03 13:18:49 UTC (rev 332)
+++ code/trunk/testdata/testinput2 2015-08-03 17:25:55 UTC (rev 333)
@@ -4372,4 +4372,40 @@
/(?|(?'a'aaa)|(?'a'b))(?'a'cccc)\k'a'/I,dupnames
+/ab{3cd/
+ ab{3cd
+
+/ab{3,cd/
+ ab{3,cd
+
+/ab{3,4a}cd/
+ ab{3,4a}cd
+
+/{4,5a}bc/
+ {4,5a}bc
+
+/\x0{ab}/
+ \0{ab}
+
+/ab\Cde/
+ abXde
+
+/(?<=ab\Cde)X/
+ abZdeX
+
+/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-02}Z/
+ ababababbbabZXXXX
+
+/.*?a(*PRUNE)b/
+ aab
+
+/.*?a(*PRUNE)b/s
+ aab
+
+/^a(*PRUNE)b/s
+ aab
+
+/.*?a(*SKIP)b/
+ aab
+
# End of testinput2
Modified: code/trunk/testdata/testinput4
===================================================================
--- code/trunk/testdata/testinput4 2015-08-03 13:18:49 UTC (rev 332)
+++ code/trunk/testdata/testinput4 2015-08-03 17:25:55 UTC (rev 333)
@@ -2221,13 +2221,4 @@
"[\S\V\H]"utf
-/\C\X*TӅ;
-{0,6}\v+
-F
-/utf
- Ӆ\x0a
-
-/\C(\W?ſ)'?{{/utf
- \\C(\\W?ſ)'?{{
-
# End of testinput4
Modified: code/trunk/testdata/testinput5
===================================================================
--- code/trunk/testdata/testinput5 2015-08-03 13:18:49 UTC (rev 332)
+++ code/trunk/testdata/testinput5 2015-08-03 17:25:55 UTC (rev 333)
@@ -1655,4 +1655,13 @@
"(*UTF)(*UCP)(.UTF).+X(\V+;\^(\D|)!999}(?(?C{7(?C')\H*\S*/^\x5\xa\\xd3\x85n?(;\D*(?m).[^mH+((*UCP)(*U:F)})(?!^)(?'"
+/\C\X*TӅ;
+{0,6}\v+
+F
+/utf
+ Ӆ\x0a
+
+/\C(\W?ſ)'?{{/utf
+ \\C(\\W?ſ)'?{{
+
# End of testinput5
Modified: code/trunk/testdata/testoutput1
===================================================================
--- code/trunk/testdata/testoutput1 2015-08-03 13:18:49 UTC (rev 332)
+++ code/trunk/testdata/testoutput1 2015-08-03 17:25:55 UTC (rev 333)
@@ -2084,22 +2084,6 @@
0: abcABC
1: abc
-/ab{3cd/
- ab{3cd
- 0: ab{3cd
-
-/ab{3,cd/
- ab{3,cd
- 0: ab{3,cd
-
-/ab{3,4a}cd/
- ab{3,4a}cd
- 0: ab{3,4a}cd
-
-/{4,5a}bc/
- {4,5a}bc
- 0: {4,5a}bc
-
/abc$/
abc
0: abc
@@ -2994,10 +2978,6 @@
a\bx\n
0: x
-/\x0{ab}/
- \0{ab}
- 0: \x00{ab}
-
/(A|B)*?CD/
CD
0: CD
@@ -7017,14 +6997,6 @@
aaaaaa
No match
-/ab\Cde/
- abXde
- 0: abXde
-
-/(?<=ab\Cde)X/
- abZdeX
- 0: X
-
/\H\h\V\v/
X X\x0a
0: X X\x0a
@@ -7125,7 +7097,7 @@
defabcxyz
No match
-/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-02}Z/
+/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-2}Z/
ababababbbabZXXXX
0: ababababbbabZ
1: ab
@@ -8675,22 +8647,6 @@
aba
0: aba
-/.*?a(*PRUNE)b/
- aab
- 0: ab
-
-/.*?a(*PRUNE)b/s
- aab
- 0: ab
-
-/^a(*PRUNE)b/s
- aab
-No match
-
-/.*?a(*SKIP)b/
- aab
- 0: ab
-
/(?>.*?a)b/s
aab
0: ab
Modified: code/trunk/testdata/testoutput2
===================================================================
--- code/trunk/testdata/testoutput2 2015-08-03 13:18:49 UTC (rev 332)
+++ code/trunk/testdata/testoutput2 2015-08-03 17:25:55 UTC (rev 333)
@@ -14611,4 +14611,54 @@
Last code unit = 'c'
Subject length lower bound = 0
+/ab{3cd/
+ ab{3cd
+ 0: ab{3cd
+
+/ab{3,cd/
+ ab{3,cd
+ 0: ab{3,cd
+
+/ab{3,4a}cd/
+ ab{3,4a}cd
+ 0: ab{3,4a}cd
+
+/{4,5a}bc/
+ {4,5a}bc
+ 0: {4,5a}bc
+
+/\x0{ab}/
+ \0{ab}
+ 0: \x00{ab}
+
+/ab\Cde/
+ abXde
+ 0: abXde
+
+/(?<=ab\Cde)X/
+ abZdeX
+ 0: X
+
+/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-02}Z/
+ ababababbbabZXXXX
+ 0: ababababbbabZ
+ 1: ab
+ 2: b
+
+/.*?a(*PRUNE)b/
+ aab
+ 0: ab
+
+/.*?a(*PRUNE)b/s
+ aab
+ 0: ab
+
+/^a(*PRUNE)b/s
+ aab
+No match
+
+/.*?a(*SKIP)b/
+ aab
+ 0: ab
+
# End of testinput2
Modified: code/trunk/testdata/testoutput4
===================================================================
--- code/trunk/testdata/testoutput4 2015-08-03 13:18:49 UTC (rev 332)
+++ code/trunk/testdata/testoutput4 2015-08-03 17:25:55 UTC (rev 333)
@@ -3741,15 +3741,4 @@
"[\S\V\H]"utf
-/\C\X*TӅ;
-{0,6}\v+
-F
-/utf
- Ӆ\x0a
-No match
-
-/\C(\W?ſ)'?{{/utf
- \\C(\\W?ſ)'?{{
-No match
-
# End of testinput4
Modified: code/trunk/testdata/testoutput5
===================================================================
--- code/trunk/testdata/testoutput5 2015-08-03 13:18:49 UTC (rev 332)
+++ code/trunk/testdata/testoutput5 2015-08-03 17:25:55 UTC (rev 333)
@@ -4055,4 +4055,15 @@
"(*UTF)(*UCP)(.UTF).+X(\V+;\^(\D|)!999}(?(?C{7(?C')\H*\S*/^\x5\xa\\xd3\x85n?(;\D*(?m).[^mH+((*UCP)(*U:F)})(?!^)(?'"
Failed: error 124 at offset 113: letter or underscore expected after (?< or (?'
+/\C\X*TӅ;
+{0,6}\v+
+F
+/utf
+ Ӆ\x0a
+No match
+
+/\C(\W?ſ)'?{{/utf
+ \\C(\\W?ſ)'?{{
+No match
+
# End of testinput5