Revision: 551
http://www.exim.org/viewvc/pcre2?view=rev&revision=551
Author: ph10
Date: 2016-07-29 09:47:39 +0100 (Fri, 29 Jul 2016)
Log Message:
-----------
Final file tidies for 10.22.
Modified Paths:
--------------
code/trunk/NEWS
code/trunk/configure.ac
code/trunk/doc/html/pcre2test.html
code/trunk/doc/html/pcre2unicode.html
code/trunk/doc/pcre2.txt
code/trunk/doc/pcre2test.1
code/trunk/doc/pcre2test.txt
code/trunk/src/config.h.generic
code/trunk/src/pcre2.h
code/trunk/src/pcre2.h.generic
Modified: code/trunk/NEWS
===================================================================
--- code/trunk/NEWS 2016-07-27 18:00:12 UTC (rev 550)
+++ code/trunk/NEWS 2016-07-29 08:47:39 UTC (rev 551)
@@ -1,7 +1,7 @@
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.
Modified: code/trunk/configure.ac
===================================================================
--- code/trunk/configure.ac 2016-07-27 18:00:12 UTC (rev 550)
+++ code/trunk/configure.ac 2016-07-29 08:47:39 UTC (rev 551)
@@ -10,8 +10,8 @@
m4_define(pcre2_major, [10])
m4_define(pcre2_minor, [22])
-m4_define(pcre2_prerelease, [-RC1])
-m4_define(pcre2_date, [2016-06-29])
+m4_define(pcre2_prerelease, [])
+m4_define(pcre2_date, [2016-07-29])
# 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.
Modified: code/trunk/doc/html/pcre2test.html
===================================================================
--- code/trunk/doc/html/pcre2test.html 2016-07-27 18:00:12 UTC (rev 550)
+++ code/trunk/doc/html/pcre2test.html 2016-07-29 08:47:39 UTC (rev 551)
@@ -1090,7 +1090,8 @@
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
code from <b>pcre2_match()</b>). Groups that did not take part in the match
-are output as "<unset>".
+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.
</P>
<br><b>
Testing callouts
@@ -1705,7 +1706,7 @@
</P>
<br><a name="SEC21" href="#TOC1">REVISION</a><br>
<P>
-Last updated: 17 June 2016
+Last updated: 06 July 2016
<br>
Copyright © 1997-2016 University of Cambridge.
<br>
Modified: code/trunk/doc/html/pcre2unicode.html
===================================================================
--- code/trunk/doc/html/pcre2unicode.html 2016-07-27 18:00:12 UTC (rev 550)
+++ code/trunk/doc/html/pcre2unicode.html 2016-07-29 08:47:39 UTC (rev 551)
@@ -67,18 +67,22 @@
single code unit.
</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
characters (see the description of \C in the
<a href="pcre2pattern.html"><b>pcre2pattern</b></a>
-documentation). The use of \C is not supported by the alternative matching
-function <b>pcre2_dfa_match()</b> when in UTF mode. Its use provokes a
-match-time error. The JIT optimization also does not support \C in UTF mode.
-If JIT optimization is requested for a UTF pattern that contains \C, it will
-not succeed, and so the matching will be carried out by the normal interpretive
-function.
+documentation).
</P>
<P>
+The use of \C is not supported by the alternative matching function
+<b>pcre2_dfa_match()</b> when in UTF-8 or UTF-16 mode, that is, when a character
+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>
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 PCRE2
recognizes as digits, spaces, or word characters remain the same set as in
@@ -244,9 +248,9 @@
<P>
The following negative error codes are given for invalid UTF-16 strings:
<pre>
- PCRE_UTF16_ERR1 Missing low surrogate at end of string
- PCRE_UTF16_ERR2 Invalid low surrogate follows high surrogate
- PCRE_UTF16_ERR3 Isolated low surrogate
+ PCRE2_ERROR_UTF16_ERR1 Missing low surrogate at end of string
+ PCRE2_ERROR_UTF16_ERR2 Invalid low surrogate follows high surrogate
+ PCRE2_ERROR_UTF16_ERR3 Isolated low surrogate
<a name="utf32strings"></a></PRE>
</P>
@@ -256,8 +260,8 @@
<P>
The following negative error codes are given for invalid UTF-32 strings:
<pre>
- PCRE_UTF32_ERR1 Surrogate character (range from 0xd800 to 0xdfff)
- PCRE_UTF32_ERR2 Code point is greater than 0x10ffff
+ PCRE2_ERROR_UTF32_ERR1 Surrogate character (0xd800 to 0xdfff)
+ PCRE2_ERROR_UTF32_ERR2 Code point is greater than 0x10ffff
</PRE>
</P>
@@ -276,9 +280,9 @@
REVISION
</b><br>
<P>
-Last updated: 16 October 2015
+Last updated: 03 July 2016
<br>
-Copyright © 1997-2015 University of Cambridge.
+Copyright © 1997-2016 University of Cambridge.
<br>
<p>
Return to the <a href="index.html">PCRE2 index page</a>.
Modified: code/trunk/doc/pcre2.txt
===================================================================
--- code/trunk/doc/pcre2.txt 2016-07-27 18:00:12 UTC (rev 550)
+++ code/trunk/doc/pcre2.txt 2016-07-29 08:47:39 UTC (rev 551)
@@ -9740,16 +9740,20 @@
In UTF modes, the dot metacharacter matches one UTF character instead
of a single code unit.
- 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 characters (see the description of \C in the
- pcre2pattern documentation). The use of \C is not supported by the
- alternative matching function pcre2_dfa_match() when in UTF mode. Its
- use provokes a match-time error. The JIT optimization also does not
- support \C in UTF mode. If JIT optimization is requested for a UTF
- pattern that contains \C, it will not succeed, and so the matching will
- be carried out by the normal interpretive function.
+ 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 characters (see the description of \C in the pcre2pattern
+ documentation).
+ The use of \C is not supported by the alternative matching function
+ pcre2_dfa_match() when in UTF-8 or UTF-16 mode, that is, when a charac-
+ ter 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
+ 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
characters of any code value, but, by default, the characters that
PCRE2 recognizes as digits, spaces, or word characters remain the same
@@ -9900,9 +9904,9 @@
The following negative error codes are given for invalid UTF-16
strings:
- PCRE_UTF16_ERR1 Missing low surrogate at end of string
- PCRE_UTF16_ERR2 Invalid low surrogate follows high surrogate
- PCRE_UTF16_ERR3 Isolated low surrogate
+ PCRE2_ERROR_UTF16_ERR1 Missing low surrogate at end of string
+ PCRE2_ERROR_UTF16_ERR2 Invalid low surrogate follows high surrogate
+ PCRE2_ERROR_UTF16_ERR3 Isolated low surrogate
Errors in UTF-32 strings
@@ -9910,8 +9914,8 @@
The following negative error codes are given for invalid UTF-32
strings:
- PCRE_UTF32_ERR1 Surrogate character (range from 0xd800 to 0xdfff)
- PCRE_UTF32_ERR2 Code point is greater than 0x10ffff
+ PCRE2_ERROR_UTF32_ERR1 Surrogate character (0xd800 to 0xdfff)
+ PCRE2_ERROR_UTF32_ERR2 Code point is greater than 0x10ffff
AUTHOR
@@ -9923,8 +9927,8 @@
REVISION
- Last updated: 16 October 2015
- Copyright (c) 1997-2015 University of Cambridge.
+ Last updated: 03 July 2016
+ Copyright (c) 1997-2016 University of Cambridge.
------------------------------------------------------------------------------
Modified: code/trunk/doc/pcre2test.1
===================================================================
--- code/trunk/doc/pcre2test.1 2016-07-27 18:00:12 UTC (rev 550)
+++ code/trunk/doc/pcre2test.1 2016-07-29 08:47:39 UTC (rev 551)
@@ -1055,7 +1055,7 @@
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
code from \fBpcre2_match()\fP). Groups that did not take part in the match
-are output as "<unset>". This modifier is not relevant for DFA matching (which
+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.
.
.
Modified: code/trunk/doc/pcre2test.txt
===================================================================
--- code/trunk/doc/pcre2test.txt 2016-07-27 18:00:12 UTC (rev 550)
+++ code/trunk/doc/pcre2test.txt 2016-07-29 08:47:39 UTC (rev 551)
@@ -981,7 +981,9 @@
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 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
@@ -1546,5 +1548,5 @@
REVISION
- Last updated: 17 June 2016
+ Last updated: 06 July 2016
Copyright (c) 1997-2016 University of Cambridge.
Modified: code/trunk/src/config.h.generic
===================================================================
--- code/trunk/src/config.h.generic 2016-07-27 18:00:12 UTC (rev 550)
+++ code/trunk/src/config.h.generic 2016-07-29 08:47:39 UTC (rev 551)
@@ -206,7 +206,7 @@
#define PACKAGE_NAME "PCRE2"
/* 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 PACKAGE_TARNAME "pcre2"
@@ -215,7 +215,7 @@
#define PACKAGE_URL ""
/* 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
parentheses (of any kind) in a pattern. This limits the amount of system
@@ -299,7 +299,7 @@
/* #undef SUPPORT_VALGRIND */
/* Version number of package */
-#define VERSION "10.22-RC1"
+#define VERSION "10.22"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
Modified: code/trunk/src/pcre2.h
===================================================================
--- code/trunk/src/pcre2.h 2016-07-27 18:00:12 UTC (rev 550)
+++ code/trunk/src/pcre2.h 2016-07-29 08:47:39 UTC (rev 551)
@@ -43,8 +43,8 @@
#define PCRE2_MAJOR 10
#define PCRE2_MINOR 22
-#define PCRE2_PRERELEASE -RC1
-#define PCRE2_DATE 2016-06-29
+#define PCRE2_PRERELEASE
+#define PCRE2_DATE 2016-07-29
/* 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
Modified: code/trunk/src/pcre2.h.generic
===================================================================
--- code/trunk/src/pcre2.h.generic 2016-07-27 18:00:12 UTC (rev 550)
+++ code/trunk/src/pcre2.h.generic 2016-07-29 08:47:39 UTC (rev 551)
@@ -43,8 +43,8 @@
#define PCRE2_MAJOR 10
#define PCRE2_MINOR 22
-#define PCRE2_PRERELEASE -RC1
-#define PCRE2_DATE 2016-06-29
+#define PCRE2_PRERELEASE
+#define PCRE2_DATE 2016-07-29
/* 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
