From b8a935f35ed8968f87032080126857a3aa3624e1 Mon Sep 17 00:00:00 2001 From: "Philip.Hazel" Date: Sat, 17 Jun 2017 11:40:17 +0000 Subject: [PATCH] Documentation update. --- doc/html/pcre2syntax.html | 17 +++++++++-------- doc/pcre2.txt | 23 ++++++++++++----------- doc/pcre2syntax.3 | 19 ++++++++++--------- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/doc/html/pcre2syntax.html b/doc/html/pcre2syntax.html index ec29303..ce7e7da 100644 --- a/doc/html/pcre2syntax.html +++ b/doc/html/pcre2syntax.html @@ -439,11 +439,12 @@ but some of them use Unicode properties if PCRE2_UCP is set. You can use The following are recognized only at the very start of a pattern or after one of the newline or \R options with similar syntax. More than one of them may -appear. +appear. For the first three, d is a decimal number. 
-  (*LIMIT_MATCH=d) set the match limit to d (decimal number)
-  (*LIMIT_DEPTH=d) set the backtracking limit to d (decimal number)
-  (*NOTEMPTY)     set PCRE2_NOTEMPTY when matching
+  (*LIMIT_DEPTH=d) set the backtracking limit to d
+  (*LIMIT_HEAP=d)  set the heap size limit to d kilobytes
+  (*LIMIT_MATCH=d) set the match limit to d
+  (*NOTEMPTY)      set PCRE2_NOTEMPTY when matching
   (*NOTEMPTY_ATSTART) set PCRE2_NOTEMPTY_ATSTART when matching
   (*NO_AUTO_POSSESS) no auto-possessification (PCRE2_NO_AUTO_POSSESS)
   (*NO_DOTSTAR_ANCHOR) no .* anchoring (PCRE2_NO_DOTSTAR_ANCHOR)
@@ -452,9 +453,9 @@ appear.
   (*UTF)          set appropriate UTF mode for the library in use
   (*UCP)          set PCRE2_UCP (use Unicode properties for \d etc)
-Note that LIMIT_MATCH and LIMIT_DEPTH can only reduce the value of the limits -set by the caller of pcre2_match() or pcre2_dfa_match(), not -increase them. LIMIT_RECURSION is an obsolete synonym for LIMIT_DEPTH. The +Note that LIMIT_DEPTH, LIMIT_HEAP, and LIMIT_MATCH can only reduce the value of +the limits set by the caller of pcre2_match() or pcre2_dfa_match(), +not increase them. LIMIT_RECURSION is an obsolete synonym for LIMIT_DEPTH. The application can lock out the use of (*UTF) and (*UCP) by setting the PCRE2_NEVER_UTF or PCRE2_NEVER_UCP options, respectively, at compile time.

@@ -599,7 +600,7 @@ Cambridge, England.


REVISION

-Last updated: 26 May 2017 +Last updated: 17 June 2017
Copyright © 1997-2017 University of Cambridge.
diff --git a/doc/pcre2.txt b/doc/pcre2.txt index de7af65..a72a4fa 100644 --- a/doc/pcre2.txt +++ b/doc/pcre2.txt @@ -9829,11 +9829,12 @@ OPTION SETTING The following are recognized only at the very start of a pattern or after one of the newline or \R options with similar syntax. More than - one of them may appear. + one of them may appear. For the first three, d is a decimal number. - (*LIMIT_MATCH=d) set the match limit to d (decimal number) - (*LIMIT_DEPTH=d) set the backtracking limit to d (decimal number) - (*NOTEMPTY) set PCRE2_NOTEMPTY when matching + (*LIMIT_DEPTH=d) set the backtracking limit to d + (*LIMIT_HEAP=d) set the heap size limit to d kilobytes + (*LIMIT_MATCH=d) set the match limit to d + (*NOTEMPTY) set PCRE2_NOTEMPTY when matching (*NOTEMPTY_ATSTART) set PCRE2_NOTEMPTY_ATSTART when matching (*NO_AUTO_POSSESS) no auto-possessification (PCRE2_NO_AUTO_POSSESS) (*NO_DOTSTAR_ANCHOR) no .* anchoring (PCRE2_NO_DOTSTAR_ANCHOR) @@ -9842,12 +9843,12 @@ OPTION SETTING (*UTF) set appropriate UTF mode for the library in use (*UCP) set PCRE2_UCP (use Unicode properties for \d etc) - Note that LIMIT_MATCH and LIMIT_DEPTH can only reduce the value of the - limits set by the caller of pcre2_match() or pcre2_dfa_match(), not - increase them. LIMIT_RECURSION is an obsolete synonym for LIMIT_DEPTH. - The application can lock out the use of (*UTF) and (*UCP) by setting - the PCRE2_NEVER_UTF or PCRE2_NEVER_UCP options, respectively, at com- - pile time. + Note that LIMIT_DEPTH, LIMIT_HEAP, and LIMIT_MATCH can only reduce the + value of the limits set by the caller of pcre2_match() or + pcre2_dfa_match(), not increase them. LIMIT_RECURSION is an obsolete + synonym for LIMIT_DEPTH. The application can lock out the use of (*UTF) + and (*UCP) by setting the PCRE2_NEVER_UTF or PCRE2_NEVER_UCP options, + respectively, at compile time. NEWLINE CONVENTION @@ -9989,7 +9990,7 @@ AUTHOR REVISION - Last updated: 26 May 2017 + Last updated: 17 June 2017 Copyright (c) 1997-2017 University of Cambridge. ------------------------------------------------------------------------------ diff --git a/doc/pcre2syntax.3 b/doc/pcre2syntax.3 index 99f10ac..27f0aab 100644 --- a/doc/pcre2syntax.3 +++ b/doc/pcre2syntax.3 @@ -1,4 +1,4 @@ -.TH PCRE2SYNTAX 3 "26 May 2017" "PCRE2 10.30" +.TH PCRE2SYNTAX 3 "17 June 2017" "PCRE2 10.30" .SH NAME PCRE2 - Perl-compatible regular expressions (revised API) .SH "PCRE2 REGULAR EXPRESSION SYNTAX SUMMARY" @@ -416,11 +416,12 @@ but some of them use Unicode properties if PCRE2_UCP is set. You can use .sp The following are recognized only at the very start of a pattern or after one of the newline or \eR options with similar syntax. More than one of them may -appear. +appear. For the first three, d is a decimal number. .sp - (*LIMIT_MATCH=d) set the match limit to d (decimal number) - (*LIMIT_DEPTH=d) set the backtracking limit to d (decimal number) - (*NOTEMPTY) set PCRE2_NOTEMPTY when matching + (*LIMIT_DEPTH=d) set the backtracking limit to d + (*LIMIT_HEAP=d) set the heap size limit to d kilobytes + (*LIMIT_MATCH=d) set the match limit to d + (*NOTEMPTY) set PCRE2_NOTEMPTY when matching (*NOTEMPTY_ATSTART) set PCRE2_NOTEMPTY_ATSTART when matching (*NO_AUTO_POSSESS) no auto-possessification (PCRE2_NO_AUTO_POSSESS) (*NO_DOTSTAR_ANCHOR) no .* anchoring (PCRE2_NO_DOTSTAR_ANCHOR) @@ -429,9 +430,9 @@ appear. (*UTF) set appropriate UTF mode for the library in use (*UCP) set PCRE2_UCP (use Unicode properties for \ed etc) .sp -Note that LIMIT_MATCH and LIMIT_DEPTH can only reduce the value of the limits -set by the caller of \fBpcre2_match()\fP or \fBpcre2_dfa_match()\fP, not -increase them. LIMIT_RECURSION is an obsolete synonym for LIMIT_DEPTH. The +Note that LIMIT_DEPTH, LIMIT_HEAP, and LIMIT_MATCH can only reduce the value of +the limits set by the caller of \fBpcre2_match()\fP or \fBpcre2_dfa_match()\fP, +not increase them. LIMIT_RECURSION is an obsolete synonym for LIMIT_DEPTH. The application can lock out the use of (*UTF) and (*UCP) by setting the PCRE2_NEVER_UTF or PCRE2_NEVER_UCP options, respectively, at compile time. . @@ -588,6 +589,6 @@ Cambridge, England. .rs .sp .nf -Last updated: 26 May 2017 +Last updated: 17 June 2017 Copyright (c) 1997-2017 University of Cambridge. .fi