walkero
/
pcre2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Final file tidies for 10.22.

This commit is contained in:
Philip.Hazel 2016-07-29 08:47:39 +00:00
parent 42d7c17a1d
commit 5b6c797a4d
10 changed files with 56 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,7 +1,7 @@
News about PCRE2 releases News about PCRE2 releases
------------------------- -------------------------
Version 10.22 29-June-2016 Version 10.22 29-July-2016
-------------------------- --------------------------
1. ChangeLog has the details of a number of bug fixes. 1. ChangeLog has the details of a number of bug fixes.

4
configure.ac
View File

@ -10,8 +10,8 @@ dnl be defined as -RC2, for example. For real releases, it should be empty.
m4_define(pcre2_major, [10]) m4_define(pcre2_major, [10])
m4_define(pcre2_minor, [22]) m4_define(pcre2_minor, [22])
m4_define(pcre2_prerelease, [-RC1]) m4_define(pcre2_prerelease, [])
m4_define(pcre2_date, [2016-06-29]) m4_define(pcre2_date, [2016-07-29])
# NOTE: The CMakeLists.txt file searches for the above variables in the first # NOTE: The CMakeLists.txt file searches for the above variables in the first
# 50 lines of this file. Please update that if the variables above are moved. # 50 lines of this file. Please update that if the variables above are moved.

5
doc/html/pcre2test.html
View File

@ -1090,7 +1090,8 @@ The <b>allcaptures</b> modifier requests that the values of all potential
captured parentheses be output after a match. By default, only those up to the captured parentheses be output after a match. By default, only those up to the
highest one actually used in the match are output (corresponding to the return highest one actually used in the match are output (corresponding to the return
code from <b>pcre2_match()</b>). Groups that did not take part in the match code from <b>pcre2_match()</b>). Groups that did not take part in the match
are output as "&#60;unset&#62;". are output as "&#60;unset&#62;". This modifier is not relevant for DFA matching (which
does no capturing); it is ignored, with a warning message, if present.
</P> </P>
<br><b> <br><b>
Testing callouts Testing callouts
@ -1705,7 +1706,7 @@ Cambridge, England.
</P> </P>
<br><a name="SEC21" href="#TOC1">REVISION</a><br> <br><a name="SEC21" href="#TOC1">REVISION</a><br>
<P> <P>
Last updated: 17 June 2016 Last updated: 06 July 2016
<br> <br>
Copyright &copy; 1997-2016 University of Cambridge. Copyright &copy; 1997-2016 University of Cambridge.
<br> <br>

32
doc/html/pcre2unicode.html
View File

@ -67,16 +67,20 @@ In UTF modes, the dot metacharacter matches one UTF character instead of a
single code unit. single code unit.
</P> </P>
<P> <P>
The escape sequence \C can be used to match a single code unit, in a UTF mode, The escape sequence \C can be used to match a single code unit in a UTF mode,
but its use can lead to some strange effects because it breaks up multi-unit but its use can lead to some strange effects because it breaks up multi-unit
characters (see the description of \C in the characters (see the description of \C in the
<a href="pcre2pattern.html"><b>pcre2pattern</b></a> <a href="pcre2pattern.html"><b>pcre2pattern</b></a>
documentation). The use of \C is not supported by the alternative matching documentation).
function <b>pcre2_dfa_match()</b> when in UTF mode. Its use provokes a </P>
match-time error. The JIT optimization also does not support \C in UTF mode. <P>
If JIT optimization is requested for a UTF pattern that contains \C, it will The use of \C is not supported by the alternative matching function
not succeed, and so the matching will be carried out by the normal interpretive <b>pcre2_dfa_match()</b> when in UTF-8 or UTF-16 mode, that is, when a character
function. may consist of more than one code unit. The use of \C in these modes provokes
a match-time error. Also, the JIT optimization does not support \C in these
modes. If JIT optimization is requested for a UTF-8 or UTF-16 pattern that
contains \C, it will not succeed, and so when <b>pcre2_match()</b> is called,
the matching will be carried out by the normal interpretive function.
</P> </P>
<P> <P>
The character escapes \b, \B, \d, \D, \s, \S, \w, and \W correctly test The character escapes \b, \B, \d, \D, \s, \S, \w, and \W correctly test
@ -244,9 +248,9 @@ Errors in UTF-16 strings
<P> <P>
The following negative error codes are given for invalid UTF-16 strings: The following negative error codes are given for invalid UTF-16 strings:
<pre> <pre>
PCRE_UTF16_ERR1 Missing low surrogate at end of string PCRE2_ERROR_UTF16_ERR1 Missing low surrogate at end of string
PCRE_UTF16_ERR2 Invalid low surrogate follows high surrogate PCRE2_ERROR_UTF16_ERR2 Invalid low surrogate follows high surrogate
PCRE_UTF16_ERR3 Isolated low surrogate PCRE2_ERROR_UTF16_ERR3 Isolated low surrogate
<a name="utf32strings"></a></PRE> <a name="utf32strings"></a></PRE>
</P> </P>
@ -256,8 +260,8 @@ Errors in UTF-32 strings
<P> <P>
The following negative error codes are given for invalid UTF-32 strings: The following negative error codes are given for invalid UTF-32 strings:
<pre> <pre>
PCRE_UTF32_ERR1 Surrogate character (range from 0xd800 to 0xdfff) PCRE2_ERROR_UTF32_ERR1 Surrogate character (0xd800 to 0xdfff)
PCRE_UTF32_ERR2 Code point is greater than 0x10ffff PCRE2_ERROR_UTF32_ERR2 Code point is greater than 0x10ffff
</PRE> </PRE>
</P> </P>
@ -276,9 +280,9 @@ Cambridge, England.
REVISION REVISION
</b><br> </b><br>
<P> <P>
Last updated: 16 October 2015 Last updated: 03 July 2016
<br> <br>
Copyright &copy; 1997-2015 University of Cambridge. Copyright &copy; 1997-2016 University of Cambridge.
<br> <br>
<p> <p>
Return to the <a href="index.html">PCRE2 index page</a>. Return to the <a href="index.html">PCRE2 index page</a>.

36
doc/pcre2.txt
View File

@ -9740,15 +9740,19 @@ WIDE CHARACTERS AND UTF MODES
In UTF modes, the dot metacharacter matches one UTF character instead In UTF modes, the dot metacharacter matches one UTF character instead
of a single code unit. of a single code unit.
The escape sequence \C can be used to match a single code unit, in a The escape sequence \C can be used to match a single code unit in a UTF
UTF mode, but its use can lead to some strange effects because it mode, but its use can lead to some strange effects because it breaks up
breaks up multi-unit characters (see the description of \C in the multi-unit characters (see the description of \C in the pcre2pattern
pcre2pattern documentation). The use of \C is not supported by the documentation).
alternative matching function pcre2_dfa_match() when in UTF mode. Its
use provokes a match-time error. The JIT optimization also does not The use of \C is not supported by the alternative matching function
support \C in UTF mode. If JIT optimization is requested for a UTF pcre2_dfa_match() when in UTF-8 or UTF-16 mode, that is, when a charac-
pattern that contains \C, it will not succeed, and so the matching will ter may consist of more than one code unit. The use of \C in these
be carried out by the normal interpretive function. modes provokes a match-time error. Also, the JIT optimization does not
support \C in these modes. If JIT optimization is requested for a UTF-8
or UTF-16 pattern that contains \C, it will not succeed, and so when
pcre2_match() is called, the matching will be carried out by the normal
interpretive function.
The character escapes \b, \B, \d, \D, \s, \S, \w, and \W correctly test The character escapes \b, \B, \d, \D, \s, \S, \w, and \W correctly test
characters of any code value, but, by default, the characters that characters of any code value, but, by default, the characters that
@ -9900,9 +9904,9 @@ VALIDITY OF UTF STRINGS
The following negative error codes are given for invalid UTF-16 The following negative error codes are given for invalid UTF-16
strings: strings:
PCRE_UTF16_ERR1 Missing low surrogate at end of string PCRE2_ERROR_UTF16_ERR1 Missing low surrogate at end of string
PCRE_UTF16_ERR2 Invalid low surrogate follows high surrogate PCRE2_ERROR_UTF16_ERR2 Invalid low surrogate follows high surrogate
PCRE_UTF16_ERR3 Isolated low surrogate PCRE2_ERROR_UTF16_ERR3 Isolated low surrogate
Errors in UTF-32 strings Errors in UTF-32 strings
@ -9910,8 +9914,8 @@ VALIDITY OF UTF STRINGS
The following negative error codes are given for invalid UTF-32 The following negative error codes are given for invalid UTF-32
strings: strings:
PCRE_UTF32_ERR1 Surrogate character (range from 0xd800 to 0xdfff) PCRE2_ERROR_UTF32_ERR1 Surrogate character (0xd800 to 0xdfff)
PCRE_UTF32_ERR2 Code point is greater than 0x10ffff PCRE2_ERROR_UTF32_ERR2 Code point is greater than 0x10ffff
AUTHOR AUTHOR
@ -9923,8 +9927,8 @@ AUTHOR
REVISION REVISION
Last updated: 16 October 2015 Last updated: 03 July 2016
Copyright (c) 1997-2015 University of Cambridge. Copyright (c) 1997-2016 University of Cambridge.
------------------------------------------------------------------------------ ------------------------------------------------------------------------------

6
doc/pcre2test.txt
View File

@ -981,7 +981,9 @@ SUBJECT MODIFIERS
tured parentheses be output after a match. By default, only those up to tured parentheses be output after a match. By default, only those up to
the highest one actually used in the match are output (corresponding to the highest one actually used in the match are output (corresponding to
the return code from pcre2_match()). Groups that did not take part in the return code from pcre2_match()). Groups that did not take part in
the match are output as "<unset>". the match are output as "<unset>". This modifier is not relevant for
DFA matching (which does no capturing); it is ignored, with a warning
message, if present.
Testing callouts Testing callouts
@ -1546,5 +1548,5 @@ AUTHOR
REVISION REVISION
Last updated: 17 June 2016 Last updated: 06 July 2016
Copyright (c) 1997-2016 University of Cambridge. Copyright (c) 1997-2016 University of Cambridge.

6
src/config.h.generic
View File

@ -206,7 +206,7 @@ sure both macros are undefined; an emulation function will then be used. */
#define PACKAGE_NAME "PCRE2" #define PACKAGE_NAME "PCRE2"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "PCRE2 10.22-RC1" #define PACKAGE_STRING "PCRE2 10.22"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "pcre2" #define PACKAGE_TARNAME "pcre2"
@ -215,7 +215,7 @@ sure both macros are undefined; an emulation function will then be used. */
#define PACKAGE_URL "" #define PACKAGE_URL ""
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "10.22-RC1" #define PACKAGE_VERSION "10.22"
/* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested /* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested
parentheses (of any kind) in a pattern. This limits the amount of system parentheses (of any kind) in a pattern. This limits the amount of system
@ -299,7 +299,7 @@ sure both macros are undefined; an emulation function will then be used. */
/* #undef SUPPORT_VALGRIND */ /* #undef SUPPORT_VALGRIND */
/* Version number of package */ /* Version number of package */
#define VERSION "10.22-RC1" #define VERSION "10.22"
/* Define to empty if `const' does not conform to ANSI C. */ /* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */ /* #undef const */

4
src/pcre2.h
View File

@ -43,8 +43,8 @@ POSSIBILITY OF SUCH DAMAGE.
#define PCRE2_MAJOR 10 #define PCRE2_MAJOR 10
#define PCRE2_MINOR 22 #define PCRE2_MINOR 22
#define PCRE2_PRERELEASE -RC1 #define PCRE2_PRERELEASE
#define PCRE2_DATE 2016-06-29 #define PCRE2_DATE 2016-07-29
/* When an application links to a PCRE DLL in Windows, the symbols that are /* When an application links to a PCRE DLL in Windows, the symbols that are
imported have to be identified as such. When building PCRE2, the appropriate imported have to be identified as such. When building PCRE2, the appropriate

4
src/pcre2.h.generic
View File

@ -43,8 +43,8 @@ POSSIBILITY OF SUCH DAMAGE.
#define PCRE2_MAJOR 10 #define PCRE2_MAJOR 10
#define PCRE2_MINOR 22 #define PCRE2_MINOR 22
#define PCRE2_PRERELEASE -RC1 #define PCRE2_PRERELEASE
#define PCRE2_DATE 2016-06-29 #define PCRE2_DATE 2016-07-29
/* When an application links to a PCRE DLL in Windows, the symbols that are /* When an application links to a PCRE DLL in Windows, the symbols that are
imported have to be identified as such. When building PCRE2, the appropriate imported have to be identified as such. When building PCRE2, the appropriate