Revision: 982
http://vcs.pcre.org/viewvc?view=rev&revision=982
Author: ph10
Date: 2012-06-20 16:15:27 +0100 (Wed, 20 Jun 2012)
Log Message:
-----------
Source tidies for 8.31-RC2.
Modified Paths:
--------------
code/trunk/ChangeLog
code/trunk/Makefile.am
code/trunk/NEWS
code/trunk/NON-AUTOTOOLS-BUILD
code/trunk/README
code/trunk/doc/html/pcreapi.html
code/trunk/doc/html/pcrepattern.html
code/trunk/doc/pcre.txt
code/trunk/doc/pcrepattern.3
code/trunk/pcre_compile.c
code/trunk/pcre_dfa_exec.c
code/trunk/pcreposix.c
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2012-06-18 18:22:51 UTC (rev 981)
+++ code/trunk/ChangeLog 2012-06-20 15:15:27 UTC (rev 982)
@@ -1,7 +1,7 @@
ChangeLog for PCRE
------------------
-Version 8.31 02-June-2012
+Version 8.31 20-June-2012
-------------------------
1. Fixing a wrong JIT test case and some compiler warnings.
@@ -133,10 +133,10 @@
37. Optimizing single character iterators in JIT.
38. Wide characters specified with \uxxxx in JavaScript mode are now subject to
- the same checks as \x{...} characters in non-JavaScript mode. Specifically,
- codepoints that are too big for the mode are faulted, and in a UTF mode,
- disallowed codepoints are also faulted.
-
+ the same checks as \x{...} characters in non-JavaScript mode. Specifically,
+ codepoints that are too big for the mode are faulted, and in a UTF mode,
+ disallowed codepoints are also faulted.
+
39. If PCRE was compiled with UTF support, in three places in the DFA
matcher there was code that should only have been obeyed in UTF mode, but
was being obeyed unconditionally. In 8-bit mode this could cause incorrect
@@ -145,9 +145,9 @@
both cases the values are those that cannot be the first data item in a UTF
character. The three items that might have provoked this were recursions,
possessively repeated groups, and atomic groups.
-
-40. Ensure that libpcre is explicitly listed in the link commands for pcretest
- and pcregrep, because some OS require shared objects to be explicitly
+
+40. Ensure that libpcre is explicitly listed in the link commands for pcretest
+ and pcregrep, because some OS require shared objects to be explicitly
passed to ld, causing the link step to fail if they are not.
Modified: code/trunk/Makefile.am
===================================================================
--- code/trunk/Makefile.am 2012-06-18 18:22:51 UTC (rev 981)
+++ code/trunk/Makefile.am 2012-06-20 15:15:27 UTC (rev 982)
@@ -97,7 +97,7 @@
EXTRA_DIST += \
doc/perltest.txt \
NON-UNIX-USE \
- NON-AUTOTOOLS-BUILD \
+ NON-AUTOTOOLS-BUILD \
HACKING
# These files are used in the preparation of a release
Modified: code/trunk/NEWS
===================================================================
--- code/trunk/NEWS 2012-06-18 18:22:51 UTC (rev 981)
+++ code/trunk/NEWS 2012-06-20 15:15:27 UTC (rev 982)
@@ -1,7 +1,7 @@
News about PCRE releases
------------------------
-Release 8.31 02-June-2012
+Release 8.31 20-June-2012
-------------------------
This is mainly a bug-fixing release, with a small number of developments:
Modified: code/trunk/NON-AUTOTOOLS-BUILD
===================================================================
--- code/trunk/NON-AUTOTOOLS-BUILD 2012-06-18 18:22:51 UTC (rev 981)
+++ code/trunk/NON-AUTOTOOLS-BUILD 2012-06-20 15:15:27 UTC (rev 982)
@@ -34,7 +34,7 @@
library. The C++ wrapper functions are a separate issue (see below).
The PCRE distribution includes a "configure" file for use by the configure/make
-(autotools) build system, as found in many Unix-like environments. The README
+(autotools) build system, as found in many Unix-like environments. The README
file contains information about the options for "configure".
There is also support for CMake, which some users prefer, especially in Windows
Modified: code/trunk/README
===================================================================
--- code/trunk/README 2012-06-18 18:22:51 UTC (rev 981)
+++ code/trunk/README 2012-06-20 15:15:27 UTC (rev 982)
@@ -116,7 +116,7 @@
For a non-Unix-like system, please read the comments in the file
NON-AUTOTOOLS-BUILD, though if your system supports the use of "configure" and
"make" you may be able to build PCRE using autotools in the same way as for
-many Unix-like systems.
+many Unix-like systems.
PCRE can also be configured using the GUI facility provided by CMake's
cmake-gui command. This creates Makefiles, solution files, etc. The file
@@ -615,10 +615,10 @@
numbers as arguments to RunTest, for example:
RunTest 2 7 11
-
-You can also call RunTest with the single argument "list" to cause it to output
-a list of tests.
+You can also call RunTest with the single argument "list" to cause it to output
+a list of tests.
+
The first test file can be fed directly into the perltest.pl script to check
that Perl gives the same results. The only difference you should see is in the
first few lines, where the Perl version is given instead of the PCRE version.
@@ -825,7 +825,7 @@
) Makefile.in
NEWS important changes in this release
NON-UNIX-USE the previous name for NON-AUTOTOOLS-BUILD
- NON-AUTOTOOLS-BUILD notes on building PCRE without using autotools
+ NON-AUTOTOOLS-BUILD notes on building PCRE without using autotools
PrepareRelease script to make preparations for "make dist"
README this file
RunTest a Unix shell script for running tests
Modified: code/trunk/doc/html/pcreapi.html
===================================================================
--- code/trunk/doc/html/pcreapi.html 2012-06-18 18:22:51 UTC (rev 981)
+++ code/trunk/doc/html/pcreapi.html 2012-06-20 15:15:27 UTC (rev 982)
@@ -917,6 +917,7 @@
73 disallowed Unicode code point (>= 0xd800 && <= 0xdfff)
74 invalid UTF-16 string (specifically UTF-16)
75 name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)
+ 76 character value in \u.... sequence is too large
</pre>
The numbers 32 and 10000 in errors 48 and 49 are defaults; different values may
be used if the limits were changed when PCRE was built.
@@ -2618,7 +2619,7 @@
</P>
<br><a name="SEC26" href="#TOC1">REVISION</a><br>
<P>
-Last updated: 04 May 2012
+Last updated: 17 June 2012
<br>
Copyright © 1997-2012 University of Cambridge.
<br>
Modified: code/trunk/doc/html/pcrepattern.html
===================================================================
--- code/trunk/doc/html/pcrepattern.html 2012-06-18 18:22:51 UTC (rev 981)
+++ code/trunk/doc/html/pcrepattern.html 2012-06-20 15:15:27 UTC (rev 982)
@@ -307,6 +307,8 @@
Otherwise, it matches a literal "x" character. In JavaScript mode, support for
code points greater than 256 is provided by \u, which must be followed by
four hexadecimal digits; otherwise it matches a literal "u" character.
+Character codes specified by \u in JavaScript mode are constrained in the same
+was as those specified by \x in non-JavaScript mode.
</P>
<P>
Characters whose value is less than 256 can be defined by either of the two
@@ -2869,7 +2871,7 @@
</P>
<br><a name="SEC28" href="#TOC1">REVISION</a><br>
<P>
-Last updated: 01 June 2012
+Last updated: 17 June 2012
<br>
Copyright © 1997-2012 University of Cambridge.
<br>
Modified: code/trunk/doc/pcre.txt
===================================================================
--- code/trunk/doc/pcre.txt 2012-06-18 18:22:51 UTC (rev 981)
+++ code/trunk/doc/pcre.txt 2012-06-20 15:15:27 UTC (rev 982)
@@ -1895,6 +1895,7 @@
73 disallowed Unicode code point (>= 0xd800 && <= 0xdfff)
74 invalid UTF-16 string (specifically UTF-16)
75 name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)
+ 76 character value in \u.... sequence is too large
The numbers 32 and 10000 in errors 48 and 49 are defaults; different
values may be used if the limits were changed when PCRE was built.
@@ -3493,7 +3494,7 @@
REVISION
- Last updated: 04 May 2012
+ Last updated: 17 June 2012
Copyright (c) 1997-2012 University of Cambridge.
------------------------------------------------------------------------------
@@ -4141,7 +4142,9 @@
its. Otherwise, it matches a literal "x" character. In JavaScript
mode, support for code points greater than 256 is provided by \u, which
must be followed by four hexadecimal digits; otherwise it matches a
- literal "u" character.
+ literal "u" character. Character codes specified by \u in JavaScript
+ mode are constrained in the same was as those specified by \x in non-
+ JavaScript mode.
Characters whose value is less than 256 can be defined by either of the
two syntaxes for \x (or by \u in JavaScript mode). There is no differ-
@@ -6492,7 +6495,7 @@
REVISION
- Last updated: 01 June 2012
+ Last updated: 17 June 2012
Copyright (c) 1997-2012 University of Cambridge.
------------------------------------------------------------------------------
Modified: code/trunk/doc/pcrepattern.3
===================================================================
--- code/trunk/doc/pcrepattern.3 2012-06-18 18:22:51 UTC (rev 981)
+++ code/trunk/doc/pcrepattern.3 2012-06-20 15:15:27 UTC (rev 982)
@@ -277,7 +277,7 @@
Otherwise, it matches a literal "x" character. In JavaScript mode, support for
code points greater than 256 is provided by \eu, which must be followed by
four hexadecimal digits; otherwise it matches a literal "u" character.
-Character codes specified by \eu in JavaScript mode are constrained in the same
+Character codes specified by \eu in JavaScript mode are constrained in the same
was as those specified by \ex in non-JavaScript mode.
.P
Characters whose value is less than 256 can be defined by either of the two
Modified: code/trunk/pcre_compile.c
===================================================================
--- code/trunk/pcre_compile.c 2012-06-18 18:22:51 UTC (rev 981)
+++ code/trunk/pcre_compile.c 2012-06-20 15:15:27 UTC (rev 982)
@@ -832,7 +832,7 @@
c = (c << 4) + cc - ((cc >= CHAR_0)? CHAR_0 : (CHAR_A - 10));
#endif
}
-
+
#ifdef COMPILE_PCRE8
if (c > (utf ? 0x10ffff : 0xff))
#else
@@ -841,7 +841,7 @@
#endif
#endif
{
- *errorcodeptr = ERR76;
+ *errorcodeptr = ERR76;
}
else if (utf && c >= 0xd800 && c <= 0xdfff) *errorcodeptr = ERR73;
}
Modified: code/trunk/pcre_dfa_exec.c
===================================================================
--- code/trunk/pcre_dfa_exec.c 2012-06-18 18:22:51 UTC (rev 981)
+++ code/trunk/pcre_dfa_exec.c 2012-06-20 15:15:27 UTC (rev 982)
@@ -2798,11 +2798,11 @@
int charcount = local_offsets[rc+1] - local_offsets[rc];
#ifdef SUPPORT_UTF
if (utf)
- {
+ {
const pcre_uchar *p = start_subject + local_offsets[rc];
const pcre_uchar *pp = start_subject + local_offsets[rc+1];
while (p < pp) if (NOT_FIRSTCHAR(*p++)) charcount--;
- }
+ }
#endif
if (charcount > 0)
{
@@ -2984,11 +2984,11 @@
{
#ifdef SUPPORT_UTF
if (utf)
- {
+ {
const pcre_uchar *p = start_subject + local_offsets[0];
const pcre_uchar *pp = start_subject + local_offsets[1];
while (p < pp) if (NOT_FIRSTCHAR(*p++)) charcount--;
- }
+ }
#endif
ADD_NEW_DATA(-next_state_offset, 0, (charcount - 1));
if (repeat_state_offset >= 0)
Modified: code/trunk/pcreposix.c
===================================================================
--- code/trunk/pcreposix.c 2012-06-18 18:22:51 UTC (rev 981)
+++ code/trunk/pcreposix.c 2012-06-20 15:15:27 UTC (rev 982)
@@ -161,7 +161,7 @@
REG_BADPAT, /* invalid UTF-16 string (should not occur) */
/* 75 */
REG_BADPAT, /* overlong MARK name */
- REG_BADPAT /* character value in \u.... sequence is too large */
+ REG_BADPAT /* character value in \u.... sequence is too large */
};
/* Table of texts corresponding to POSIX error codes */
