diff options
author | ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069> | 2016-07-29 08:47:39 +0000 |
---|---|---|
committer | ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069> | 2016-07-29 08:47:39 +0000 |
commit | 8073565eee8160d622b485df106f2ce539942f07 (patch) | |
tree | 35e6fa0e264cc8d1b20c9598460b59ffb0d63e11 /doc | |
parent | b9e7721c74fae901b3c6821e959b4b91e404370e (diff) | |
download | pcre2-8073565eee8160d622b485df106f2ce539942f07.tar.gz |
Final file tidies for 10.22.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@551 6239d852-aaf2-0410-a92c-79f79f948069
Diffstat (limited to 'doc')
-rw-r--r-- | doc/html/pcre2test.html | 5 | ||||
-rw-r--r-- | doc/html/pcre2unicode.html | 32 | ||||
-rw-r--r-- | doc/pcre2.txt | 36 | ||||
-rw-r--r-- | doc/pcre2test.1 | 2 | ||||
-rw-r--r-- | doc/pcre2test.txt | 6 |
5 files changed, 46 insertions, 35 deletions
diff --git a/doc/html/pcre2test.html b/doc/html/pcre2test.html index 148c4b3..17b308e 100644 --- a/doc/html/pcre2test.html +++ b/doc/html/pcre2test.html @@ -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 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 @@ Cambridge, England. </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> diff --git a/doc/html/pcre2unicode.html b/doc/html/pcre2unicode.html index 7af55c3..6ca367f 100644 --- a/doc/html/pcre2unicode.html +++ b/doc/html/pcre2unicode.html @@ -67,16 +67,20 @@ In UTF modes, the dot metacharacter matches one UTF character instead of a 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 @@ -244,9 +248,9 @@ Errors in UTF-16 strings <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 @@ Errors in UTF-32 strings <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 @@ Cambridge, England. 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>. diff --git a/doc/pcre2.txt b/doc/pcre2.txt index fe66fb4..8f4e8a1 100644 --- a/doc/pcre2.txt +++ b/doc/pcre2.txt @@ -9740,15 +9740,19 @@ WIDE CHARACTERS AND UTF MODES 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 @@ -9900,9 +9904,9 @@ VALIDITY OF UTF STRINGS 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 @@ VALIDITY OF UTF STRINGS 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 @@ AUTHOR 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. ------------------------------------------------------------------------------ diff --git a/doc/pcre2test.1 b/doc/pcre2test.1 index f639ec2..2fbf794 100644 --- a/doc/pcre2test.1 +++ b/doc/pcre2test.1 @@ -1055,7 +1055,7 @@ The \fBallcaptures\fP modifier requests that the values of all potential 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. . . diff --git a/doc/pcre2test.txt b/doc/pcre2test.txt index d285a3a..cfa0baa 100644 --- a/doc/pcre2test.txt +++ b/doc/pcre2test.txt @@ -981,7 +981,9 @@ SUBJECT MODIFIERS 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 @@ AUTHOR REVISION - Last updated: 17 June 2016 + Last updated: 06 July 2016 Copyright (c) 1997-2016 University of Cambridge. |