nlopess Tue Jun 19 17:11:30 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre/pcrelib ChangeLog NEWS config.h pcre.h
pcre_exec.c
/php-src/ext/pcre/pcrelib/doc pcre.txt
/php-src/ext/pcre/pcrelib/testdata testinput6 testinput9
testoutput6 testoutput9
Log:
final PCRE 7.2 release :-)
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/ChangeLog?r1=1.12.2.1.2.3&r2=1.12.2.1.2.4&diff_format=u
Index: php-src/ext/pcre/pcrelib/ChangeLog
diff -u php-src/ext/pcre/pcrelib/ChangeLog:1.12.2.1.2.3
php-src/ext/pcre/pcrelib/ChangeLog:1.12.2.1.2.4
--- php-src/ext/pcre/pcrelib/ChangeLog:1.12.2.1.2.3 Fri Jun 15 19:09:24 2007
+++ php-src/ext/pcre/pcrelib/ChangeLog Tue Jun 19 17:11:29 2007
@@ -1,7 +1,7 @@
ChangeLog for PCRE
------------------
-Version 7.2 13-June-07
+Version 7.2 19-June-07
---------------------
1. If the fr_FR locale cannot be found for test 3, try the "french" locale,
@@ -69,6 +69,9 @@
pcrecpp::RE("a*?").FullMatch("aaa") does not, and
pcrecpp::RE("a*?\\z").FullMatch("aaa") does again.
+12. If \p or \P was used in non-UTF-8 mode on a character greater than 127
+ it matched the wrong number of bytes.
+
Version 7.1 24-Apr-07
---------------------
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/NEWS?r1=1.7.2.1.2.3&r2=1.7.2.1.2.4&diff_format=u
Index: php-src/ext/pcre/pcrelib/NEWS
diff -u php-src/ext/pcre/pcrelib/NEWS:1.7.2.1.2.3
php-src/ext/pcre/pcrelib/NEWS:1.7.2.1.2.4
--- php-src/ext/pcre/pcrelib/NEWS:1.7.2.1.2.3 Fri Jun 15 19:09:24 2007
+++ php-src/ext/pcre/pcrelib/NEWS Tue Jun 19 17:11:29 2007
@@ -2,7 +2,7 @@
------------------------
-Release 7.2 13-Jun-07
+Release 7.2 19-Jun-07
---------------------
WARNING: saved patterns that were compiled by earlier versions of PCRE must be
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/config.h?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/pcre/pcrelib/config.h
diff -u php-src/ext/pcre/pcrelib/config.h:1.2.2.2
php-src/ext/pcre/pcrelib/config.h:1.2.2.3
--- php-src/ext/pcre/pcrelib/config.h:1.2.2.2 Fri Jun 15 19:09:24 2007
+++ php-src/ext/pcre/pcrelib/config.h Tue Jun 19 17:11:29 2007
@@ -224,13 +224,13 @@
#define PACKAGE_NAME "PCRE"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PCRE 7.2-RC3"
+#define PACKAGE_STRING "PCRE 7.2"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "pcre"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "7.2-RC3"
+#define PACKAGE_VERSION "7.2"
/* If you are compiling for a system other than a Unix-like system or
@@ -272,7 +272,7 @@
/* Version number of package */
#ifndef VERSION
-#define VERSION "7.2-RC3"
+#define VERSION "7.2"
#endif
/* Define to empty if `const' does not conform to ANSI C. */
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre.h?r1=1.18.2.1.2.5&r2=1.18.2.1.2.6&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre.h
diff -u php-src/ext/pcre/pcrelib/pcre.h:1.18.2.1.2.5
php-src/ext/pcre/pcrelib/pcre.h:1.18.2.1.2.6
--- php-src/ext/pcre/pcrelib/pcre.h:1.18.2.1.2.5 Fri Jun 15 19:09:24 2007
+++ php-src/ext/pcre/pcrelib/pcre.h Tue Jun 19 17:11:29 2007
@@ -43,8 +43,8 @@
#define PCRE_MAJOR 7
#define PCRE_MINOR 2
-#define PCRE_PRERELEASE -RC3
-#define PCRE_DATE 2007-06-13
+#define PCRE_PRERELEASE
+#define PCRE_DATE 2007-06-19
/* When an application links to a PCRE DLL in Windows, the symbols that are
imported have to be identified as such. When building PCRE, the appropriate
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/pcre_exec.c?r1=1.1.2.1.2.4&r2=1.1.2.1.2.5&diff_format=u
Index: php-src/ext/pcre/pcrelib/pcre_exec.c
diff -u php-src/ext/pcre/pcrelib/pcre_exec.c:1.1.2.1.2.4
php-src/ext/pcre/pcrelib/pcre_exec.c:1.1.2.1.2.5
--- php-src/ext/pcre/pcrelib/pcre_exec.c:1.1.2.1.2.4 Fri Jun 15 19:09:24 2007
+++ php-src/ext/pcre/pcrelib/pcre_exec.c Tue Jun 19 17:11:30 2007
@@ -2786,7 +2786,7 @@
for (i = 1; i <= min; i++)
{
if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
- GETCHARINC(c, eptr);
+ GETCHARINCTEST(c, eptr);
}
break;
@@ -2794,7 +2794,7 @@
for (i = 1; i <= min; i++)
{
if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
- GETCHARINC(c, eptr);
+ GETCHARINCTEST(c, eptr);
prop_category = _pcre_ucp_findprop(c, &prop_chartype,
&prop_script);
if ((prop_chartype == ucp_Lu ||
prop_chartype == ucp_Ll ||
@@ -2807,7 +2807,7 @@
for (i = 1; i <= min; i++)
{
if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
- GETCHARINC(c, eptr);
+ GETCHARINCTEST(c, eptr);
prop_category = _pcre_ucp_findprop(c, &prop_chartype,
&prop_script);
if ((prop_category == prop_value) == prop_fail_result)
RRETURN(MATCH_NOMATCH);
@@ -2818,7 +2818,7 @@
for (i = 1; i <= min; i++)
{
if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
- GETCHARINC(c, eptr);
+ GETCHARINCTEST(c, eptr);
prop_category = _pcre_ucp_findprop(c, &prop_chartype,
&prop_script);
if ((prop_chartype == prop_value) == prop_fail_result)
RRETURN(MATCH_NOMATCH);
@@ -2829,7 +2829,7 @@
for (i = 1; i <= min; i++)
{
if (eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
- GETCHARINC(c, eptr);
+ GETCHARINCTEST(c, eptr);
prop_category = _pcre_ucp_findprop(c, &prop_chartype,
&prop_script);
if ((prop_script == prop_value) == prop_fail_result)
RRETURN(MATCH_NOMATCH);
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/doc/pcre.txt?r1=1.9.2.1.2.3&r2=1.9.2.1.2.4&diff_format=u
Index: php-src/ext/pcre/pcrelib/doc/pcre.txt
diff -u php-src/ext/pcre/pcrelib/doc/pcre.txt:1.9.2.1.2.3
php-src/ext/pcre/pcrelib/doc/pcre.txt:1.9.2.1.2.4
--- php-src/ext/pcre/pcrelib/doc/pcre.txt:1.9.2.1.2.3 Fri Jun 15 19:09:25 2007
+++ php-src/ext/pcre/pcrelib/doc/pcre.txt Tue Jun 19 17:11:30 2007
@@ -3047,8 +3047,10 @@
Unicode character properties
When PCRE is built with Unicode character property support, three addi-
- tional escape sequences to match character properties are available
- when UTF-8 mode is selected. They are:
+ tional escape sequences that match characters with specific properties
+ are available. When not in UTF-8 mode, these sequences are of course
+ limited to testing characters whose codepoints are less than 256, but
+ they do work in this mode. The extra escape sequences are:
\p{xx} a character with the xx property
\P{xx} a character without the xx property
@@ -3162,7 +3164,9 @@
That is, it matches a character without the "mark" property, followed
by zero or more characters with the "mark" property, and treats the
sequence as an atomic group (see below). Characters with the "mark"
- property are typically accents that affect the preceding character.
+ property are typically accents that affect the preceding character.
+ None of them have codepoints less than 256, so in non-UTF-8 mode \X
+ matches any one character.
Matching characters by Unicode property is not fast, because PCRE has
to search a structure that contains data for over fifteen thousand
@@ -4539,7 +4543,7 @@
REVISION
- Last updated: 13 June 2007
+ Last updated: 19 June 2007
Copyright (c) 1997-2007 University of Cambridge.
------------------------------------------------------------------------------
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/testdata/testinput6?r1=1.3.2.1.2.3&r2=1.3.2.1.2.4&diff_format=u
Index: php-src/ext/pcre/pcrelib/testdata/testinput6
diff -u php-src/ext/pcre/pcrelib/testdata/testinput6:1.3.2.1.2.3
php-src/ext/pcre/pcrelib/testdata/testinput6:1.3.2.1.2.4
--- php-src/ext/pcre/pcrelib/testdata/testinput6:1.3.2.1.2.3 Fri Jun 15
19:09:25 2007
+++ php-src/ext/pcre/pcrelib/testdata/testinput6 Tue Jun 19 17:11:30 2007
@@ -771,5 +771,11 @@
/^\x{023a}+([^X])/8i
\x{023a}\x{2c65}X
+
+/Check property support in non-UTF-8 mode/
+/\p{L}{4}/
+ 123abcdefg
+ 123abc\xc4\xc5zz
+
/ End of testinput6 /
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/testdata/testinput9?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u
Index: php-src/ext/pcre/pcrelib/testdata/testinput9
diff -u php-src/ext/pcre/pcrelib/testdata/testinput9:1.1.2.1.2.1
php-src/ext/pcre/pcrelib/testdata/testinput9:1.1.2.1.2.2
--- php-src/ext/pcre/pcrelib/testdata/testinput9:1.1.2.1.2.1 Fri Jun 15
19:09:25 2007
+++ php-src/ext/pcre/pcrelib/testdata/testinput9 Tue Jun 19 17:11:30 2007
@@ -819,4 +819,10 @@
/^\x{023a}+([^X])/8i
\x{023a}\x{2c65}X
+/Check property support in non-UTF-8 mode/
+
+/\p{L}{4}/
+ 123abcdefg
+ 123abc\xc4\xc5zz
+
/ End /
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/testdata/testoutput6?r1=1.3.2.1.2.3&r2=1.3.2.1.2.4&diff_format=u
Index: php-src/ext/pcre/pcrelib/testdata/testoutput6
diff -u php-src/ext/pcre/pcrelib/testdata/testoutput6:1.3.2.1.2.3
php-src/ext/pcre/pcrelib/testdata/testoutput6:1.3.2.1.2.4
--- php-src/ext/pcre/pcrelib/testdata/testoutput6:1.3.2.1.2.3 Fri Jun 15
19:09:25 2007
+++ php-src/ext/pcre/pcrelib/testdata/testoutput6 Tue Jun 19 17:11:30 2007
@@ -1443,5 +1443,13 @@
\x{023a}\x{2c65}X
0: \x{23a}\x{2c65}
1: \x{2c65}
+
+/Check property support in non-UTF-8 mode/
+/\p{L}{4}/
+ 123abcdefg
+ 0: abcd
+ 123abc\xc4\xc5zz
+ 0: abc\xc4
+
/ End of testinput6 /
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/pcrelib/testdata/testoutput9?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u
Index: php-src/ext/pcre/pcrelib/testdata/testoutput9
diff -u php-src/ext/pcre/pcrelib/testdata/testoutput9:1.1.2.1.2.1
php-src/ext/pcre/pcrelib/testdata/testoutput9:1.1.2.1.2.2
--- php-src/ext/pcre/pcrelib/testdata/testoutput9:1.1.2.1.2.1 Fri Jun 15
19:09:26 2007
+++ php-src/ext/pcre/pcrelib/testdata/testoutput9 Tue Jun 19 17:11:30 2007
@@ -1632,4 +1632,12 @@
\x{023a}\x{2c65}X
0: \x{23a}\x{2c65}
+/Check property support in non-UTF-8 mode/
+
+/\p{L}{4}/
+ 123abcdefg
+ 0: abcd
+ 123abc\xc4\xc5zz
+ 0: abc\xc4
+
/ End /
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
