Revision: 1399
http://vcs.pcre.org/viewvc?view=rev&revision=1399
Author: ph10
Date: 2013-11-12 16:03:01 +0000 (Tue, 12 Nov 2013)
Log Message:
-----------
Wrong modifier messages in pcretest to go to stdout; update which modifiers are
forbidden in Perl-compatible tests.
Modified Paths:
--------------
code/trunk/pcretest.c
code/trunk/perltest.pl
code/trunk/testdata/testinput1
code/trunk/testdata/testinput4
code/trunk/testdata/testinput6
code/trunk/testdata/testoutput1
code/trunk/testdata/testoutput4
code/trunk/testdata/testoutput6
Modified: code/trunk/pcretest.c
===================================================================
--- code/trunk/pcretest.c 2013-11-12 15:20:26 UTC (rev 1398)
+++ code/trunk/pcretest.c 2013-11-12 16:03:01 UTC (rev 1399)
@@ -3465,7 +3465,7 @@
}
else
{
- fprintf(outfile, "** Unrecognized special command '%s'\n", p);
+ printf("** Unrecognized special command '%s'\n", p);
yield = 1;
goto EXIT;
}
@@ -3678,8 +3678,7 @@
int y = check_mc_option(ppp+1, outfile, FALSE, "modifier");
if (y == 0)
{
- fprintf(outfile,
- "** Error in modifier forbid data - giving up.\n");
+ printf("** Error in modifier forbid data - giving up.\n");
yield = 1;
goto EXIT;
}
@@ -3687,8 +3686,8 @@
{
ppp = pp;
while (*ppp != '>') ppp++;
- fprintf(outfile, "** The %.*s modifier is locked out - "
- "giving up.\n", ppp - pp + 1, pp);
+ printf("** The %.*s modifier is locked out - giving up.\n",
+ ppp - pp + 1, pp);
yield = 1;
goto EXIT;
}
@@ -3700,7 +3699,7 @@
else
{
- fprintf(outfile, "** The /%c modifier is locked out - giving up.\n", *pp);
+ printf("** The /%c modifier is locked out - giving up.\n", *pp);
yield = 1;
goto EXIT;
}
Modified: code/trunk/perltest.pl
===================================================================
--- code/trunk/perltest.pl 2013-11-12 15:20:26 UTC (rev 1398)
+++ code/trunk/perltest.pl 2013-11-12 16:03:01 UTC (rev 1399)
@@ -111,9 +111,9 @@
$pattern =~ s/S(?=[a-zA-Z]*$)//g;
- # Remove /Y from a pattern (asks pcretest to disable PCRE optimization)
+ # Remove /Y and /O from a pattern (disable PCRE optimizations)
- $pattern =~ s/Y(?=[a-zA-Z]*$)//;
+ $pattern =~ s/[YO](?=[a-zA-Z]*$)//;
# Check that the pattern is valid
Modified: code/trunk/testdata/testinput1
===================================================================
--- code/trunk/testdata/testinput1 2013-11-12 15:20:26 UTC (rev 1398)
+++ code/trunk/testdata/testinput1 2013-11-12 16:03:01 UTC (rev 1399)
@@ -2,7 +2,7 @@
Perl >= 5.10, in non-UTF-8 mode. It should run clean for the 8-bit, 16-bit,
and 32-bit PCRE libraries. --/
-< forbid 8BCDIMOWZ<
+< forbid 89?=ABCDEFfGILMNPTUWXZ<
/the quick brown fox/
the quick brown fox
Modified: code/trunk/testdata/testinput4
===================================================================
--- code/trunk/testdata/testinput4 2013-11-12 15:20:26 UTC (rev 1398)
+++ code/trunk/testdata/testinput4 2013-11-12 16:03:01 UTC (rev 1399)
@@ -2,7 +2,7 @@
compatible with all versions of Perl >= 5.10 and both the 8-bit and 16-bit
PCRE libraries. --/
-< forbid BCDIMWZ<
+< forbid 9?=ABCDEFfGILMNPTUWXZ<
/a.b/8
acb
Modified: code/trunk/testdata/testinput6
===================================================================
--- code/trunk/testdata/testinput6 2013-11-12 15:20:26 UTC (rev 1398)
+++ code/trunk/testdata/testinput6 2013-11-12 16:03:01 UTC (rev 1399)
@@ -1,7 +1,7 @@
/-- This set of tests is for Unicode property support. It is compatible with
Perl >= 5.15. --/
-< forbid BCDIMZ<
+< forbid 9?=ABCDEFfGILMNPTUXZ<
/^\pC\pL\pM\pN\pP\pS\pZ</8
\x7f\x{c0}\x{30f}\x{660}\x{66c}\x{f01}\x{1680}<
Modified: code/trunk/testdata/testoutput1
===================================================================
--- code/trunk/testdata/testoutput1 2013-11-12 15:20:26 UTC (rev 1398)
+++ code/trunk/testdata/testoutput1 2013-11-12 16:03:01 UTC (rev 1399)
@@ -2,7 +2,7 @@
Perl >= 5.10, in non-UTF-8 mode. It should run clean for the 8-bit, 16-bit,
and 32-bit PCRE libraries. --/
-< forbid 8BCDIMOWZ<
+< forbid 89?=ABCDEFfGILMNPTUWXZ<
/the quick brown fox/
the quick brown fox
Modified: code/trunk/testdata/testoutput4
===================================================================
--- code/trunk/testdata/testoutput4 2013-11-12 15:20:26 UTC (rev 1398)
+++ code/trunk/testdata/testoutput4 2013-11-12 16:03:01 UTC (rev 1399)
@@ -2,7 +2,7 @@
compatible with all versions of Perl >= 5.10 and both the 8-bit and 16-bit
PCRE libraries. --/
-< forbid BCDIMWZ<
+< forbid 9?=ABCDEFfGILMNPTUWXZ<
/a.b/8
acb
Modified: code/trunk/testdata/testoutput6
===================================================================
--- code/trunk/testdata/testoutput6 2013-11-12 15:20:26 UTC (rev 1398)
+++ code/trunk/testdata/testoutput6 2013-11-12 16:03:01 UTC (rev 1399)
@@ -1,7 +1,7 @@
/-- This set of tests is for Unicode property support. It is compatible with
Perl >= 5.15. --/
-< forbid BCDIMZ<
+< forbid 9?=ABCDEFfGILMNPTUXZ<
/^\pC\pL\pM\pN\pP\pS\pZ</8
\x7f\x{c0}\x{30f}\x{660}\x{66c}\x{f01}\x{1680}<
