Documentation update.
This commit is contained in:
Philip.Hazel
parent
666e94cd59
commit
455ce731dc
|
|
@ -3176,14 +3176,23 @@ A name is always required with this verb. There may be as many instances of
|
|||
(*MARK) as you like in a pattern, and their names do not have to be unique.
|
||||
</P>
|
||||
<P>
|
||||
When a match succeeds, the name of the last-encountered (*MARK:NAME),
|
||||
(*PRUNE:NAME), or (*THEN:NAME) on the matching path is passed back to the
|
||||
caller as described in the section entitled
|
||||
When a match succeeds, the name of the last-encountered (*MARK:NAME) on the
|
||||
matching path is passed back to the caller as described in the section entitled
|
||||
<a href="pcre2api.html#matchotherdata">"Other information about the match"</a>
|
||||
in the
|
||||
<a href="pcre2api.html"><b>pcre2api</b></a>
|
||||
documentation. Here is an example of <b>pcre2test</b> output, where the "mark"
|
||||
modifier requests the retrieval and outputting of (*MARK) data:
|
||||
documentation. This applies to all instances of (*MARK), including those inside
|
||||
assertions and atomic groups. (There are differences in those cases when
|
||||
(*MARK) is used in conjunction with (*SKIP) as described below.)
|
||||
</P>
|
||||
<P>
|
||||
As well as (*MARK), the (*PRUNE) and (*THEN) verbs may have associated NAME
|
||||
arguments. Whichever is last on the matching path is passed back. See below for
|
||||
more details of these other verbs.
|
||||
</P>
|
||||
<P>
|
||||
Here is an example of <b>pcre2test</b> output, where the "mark" modifier
|
||||
requests the retrieval and outputting of (*MARK) data:
|
||||
<pre>
|
||||
re> /X(*MARK:A)Y|X(*MARK:B)Z/mark
|
||||
data> XY
|
||||
|
|
@ -3348,10 +3357,10 @@ In the first example, the (*MARK) setting is in an atomic group, so it is not
|
|||
seen when (*SKIP:X) triggers, causing the (*SKIP) to be ignored. This allows
|
||||
the second branch of the pattern to be tried at the first character position.
|
||||
In the second example, the (*MARK) setting is not in an atomic group. This
|
||||
allows (*SKIP:X) to immediately cause a new matching attempt to start at the
|
||||
second character. This time, the (*MARK) is never seen because "a" does not
|
||||
match "b", so the matcher immediately jumps to the second branch of the
|
||||
pattern.
|
||||
allows (*SKIP:X) to find the (*MARK) when it backtracks, and this causes a new
|
||||
matching attempt to start at the second character. This time, the (*MARK) is
|
||||
never seen because "a" does not match "b", so the matcher immediately jumps to
|
||||
the second branch of the pattern.
|
||||
</P>
|
||||
<P>
|
||||
Note that (*SKIP:NAME) searches only for names set by (*MARK:NAME). It ignores
|
||||
|
|
@ -3542,7 +3551,7 @@ Cambridge, England.
|
|||
</P>
|
||||
<br><a name="SEC30" href="#TOC1">REVISION</a><br>
|
||||
<P>
|
||||
Last updated: 11 July 2018
|
||||
Last updated: 16 July 2018
|
||||
<br>
|
||||
Copyright © 1997-2018 University of Cambridge.
|
||||
<br>
|
||||
|
|
|
|||
|
|
@ -8651,12 +8651,20 @@ BACKTRACKING CONTROL
|
|||
instances of (*MARK) as you like in a pattern, and their names do not
|
||||
have to be unique.
|
||||
|
||||
When a match succeeds, the name of the last-encountered (*MARK:NAME),
|
||||
(*PRUNE:NAME), or (*THEN:NAME) on the matching path is passed back to
|
||||
the caller as described in the section entitled "Other information
|
||||
about the match" in the pcre2api documentation. Here is an example of
|
||||
pcre2test output, where the "mark" modifier requests the retrieval and
|
||||
outputting of (*MARK) data:
|
||||
When a match succeeds, the name of the last-encountered (*MARK:NAME) on
|
||||
the matching path is passed back to the caller as described in the sec-
|
||||
tion entitled "Other information about the match" in the pcre2api docu-
|
||||
mentation. This applies to all instances of (*MARK), including those
|
||||
inside assertions and atomic groups. (There are differences in those
|
||||
cases when (*MARK) is used in conjunction with (*SKIP) as described
|
||||
below.)
|
||||
|
||||
As well as (*MARK), the (*PRUNE) and (*THEN) verbs may have associated
|
||||
NAME arguments. Whichever is last on the matching path is passed back.
|
||||
See below for more details of these other verbs.
|
||||
|
||||
Here is an example of pcre2test output, where the "mark" modifier
|
||||
requests the retrieval and outputting of (*MARK) data:
|
||||
|
||||
re> /X(*MARK:A)Y|X(*MARK:B)Z/mark
|
||||
data> XY
|
||||
|
|
@ -8816,10 +8824,11 @@ BACKTRACKING CONTROL
|
|||
is not seen when (*SKIP:X) triggers, causing the (*SKIP) to be ignored.
|
||||
This allows the second branch of the pattern to be tried at the first
|
||||
character position. In the second example, the (*MARK) setting is not
|
||||
in an atomic group. This allows (*SKIP:X) to immediately cause a new
|
||||
matching attempt to start at the second character. This time, the
|
||||
(*MARK) is never seen because "a" does not match "b", so the matcher
|
||||
immediately jumps to the second branch of the pattern.
|
||||
in an atomic group. This allows (*SKIP:X) to find the (*MARK) when it
|
||||
backtracks, and this causes a new matching attempt to start at the sec-
|
||||
ond character. This time, the (*MARK) is never seen because "a" does
|
||||
not match "b", so the matcher immediately jumps to the second branch of
|
||||
the pattern.
|
||||
|
||||
Note that (*SKIP:NAME) searches only for names set by (*MARK:NAME). It
|
||||
ignores names that are set by (*PRUNE:NAME) or (*THEN:NAME).
|
||||
|
|
@ -8993,7 +9002,7 @@ AUTHOR
|
|||
|
||||
REVISION
|
||||
|
||||
Last updated: 11 July 2018
|
||||
Last updated: 16 July 2018
|
||||
Copyright (c) 1997-2018 University of Cambridge.
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.TH PCRE2PATTERN 3 "11 July 2018" "PCRE2 10.32"
|
||||
.TH PCRE2PATTERN 3 "16 July 2018" "PCRE2 10.32"
|
||||
.SH NAME
|
||||
PCRE2 - Perl-compatible regular expressions (revised API)
|
||||
.SH "PCRE2 REGULAR EXPRESSION DETAILS"
|
||||
|
|
@ -3206,9 +3206,8 @@ starting point (see (*SKIP) below).
|
|||
A name is always required with this verb. There may be as many instances of
|
||||
(*MARK) as you like in a pattern, and their names do not have to be unique.
|
||||
.P
|
||||
When a match succeeds, the name of the last-encountered (*MARK:NAME),
|
||||
(*PRUNE:NAME), or (*THEN:NAME) on the matching path is passed back to the
|
||||
caller as described in the section entitled
|
||||
When a match succeeds, the name of the last-encountered (*MARK:NAME) on the
|
||||
matching path is passed back to the caller as described in the section entitled
|
||||
.\" HTML <a href="pcre2api.html#matchotherdata">
|
||||
.\" </a>
|
||||
"Other information about the match"
|
||||
|
|
@ -3217,8 +3216,16 @@ in the
|
|||
.\" HREF
|
||||
\fBpcre2api\fP
|
||||
.\"
|
||||
documentation. Here is an example of \fBpcre2test\fP output, where the "mark"
|
||||
modifier requests the retrieval and outputting of (*MARK) data:
|
||||
documentation. This applies to all instances of (*MARK), including those inside
|
||||
assertions and atomic groups. (There are differences in those cases when
|
||||
(*MARK) is used in conjunction with (*SKIP) as described below.)
|
||||
.P
|
||||
As well as (*MARK), the (*PRUNE) and (*THEN) verbs may have associated NAME
|
||||
arguments. Whichever is last on the matching path is passed back. See below for
|
||||
more details of these other verbs.
|
||||
.P
|
||||
Here is an example of \fBpcre2test\fP output, where the "mark" modifier
|
||||
requests the retrieval and outputting of (*MARK) data:
|
||||
.sp
|
||||
re> /X(*MARK:A)Y|X(*MARK:B)Z/mark
|
||||
data> XY
|
||||
|
|
@ -3378,10 +3385,10 @@ In the first example, the (*MARK) setting is in an atomic group, so it is not
|
|||
seen when (*SKIP:X) triggers, causing the (*SKIP) to be ignored. This allows
|
||||
the second branch of the pattern to be tried at the first character position.
|
||||
In the second example, the (*MARK) setting is not in an atomic group. This
|
||||
allows (*SKIP:X) to immediately cause a new matching attempt to start at the
|
||||
second character. This time, the (*MARK) is never seen because "a" does not
|
||||
match "b", so the matcher immediately jumps to the second branch of the
|
||||
pattern.
|
||||
allows (*SKIP:X) to find the (*MARK) when it backtracks, and this causes a new
|
||||
matching attempt to start at the second character. This time, the (*MARK) is
|
||||
never seen because "a" does not match "b", so the matcher immediately jumps to
|
||||
the second branch of the pattern.
|
||||
.P
|
||||
Note that (*SKIP:NAME) searches only for names set by (*MARK:NAME). It ignores
|
||||
names that are set by (*PRUNE:NAME) or (*THEN:NAME).
|
||||
|
|
@ -3567,6 +3574,6 @@ Cambridge, England.
|
|||
.rs
|
||||
.sp
|
||||
.nf
|
||||
Last updated: 11 July 2018
|
||||
Last updated: 16 July 2018
|
||||
Copyright (c) 1997-2018 University of Cambridge.
|
||||
.fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue