Revision: 842
http://www.exim.org/viewvc/pcre2?view=rev&revision=842
Author: ph10
Date: 2017-07-19 17:04:15 +0100 (Wed, 19 Jul 2017)
Log Message:
-----------
Code tidies for 10.30-RC1 release candidate.
Modified Paths:
--------------
code/trunk/CMakeLists.txt
code/trunk/ChangeLog
code/trunk/NEWS
code/trunk/NON-AUTOTOOLS-BUILD
code/trunk/README
code/trunk/RunTest
code/trunk/configure.ac
code/trunk/doc/html/NON-AUTOTOOLS-BUILD.txt
code/trunk/doc/html/README.txt
code/trunk/doc/html/pcre2.html
code/trunk/doc/html/pcre2_code_free.html
code/trunk/doc/html/pcre2_compile.html
code/trunk/doc/html/pcre2_config.html
code/trunk/doc/html/pcre2_converted_pattern_free.html
code/trunk/doc/html/pcre2_maketables.html
code/trunk/doc/html/pcre2_match.html
code/trunk/doc/html/pcre2_pattern_info.html
code/trunk/doc/html/pcre2_set_newline.html
code/trunk/doc/html/pcre2_set_recursion_limit.html
code/trunk/doc/html/pcre2_substitute.html
code/trunk/doc/html/pcre2build.html
code/trunk/doc/html/pcre2compat.html
code/trunk/doc/html/pcre2grep.html
code/trunk/doc/html/pcre2perform.html
code/trunk/doc/html/pcre2syntax.html
code/trunk/doc/pcre2.3
code/trunk/doc/pcre2.txt
code/trunk/doc/pcre2_code_free.3
code/trunk/doc/pcre2_compile.3
code/trunk/doc/pcre2_config.3
code/trunk/doc/pcre2_converted_pattern_free.3
code/trunk/doc/pcre2_dfa_match.3
code/trunk/doc/pcre2_maketables.3
code/trunk/doc/pcre2_match.3
code/trunk/doc/pcre2_pattern_info.3
code/trunk/doc/pcre2_set_newline.3
code/trunk/doc/pcre2_set_recursion_limit.3
code/trunk/doc/pcre2_substitute.3
code/trunk/doc/pcre2build.3
code/trunk/doc/pcre2compat.3
code/trunk/doc/pcre2grep.1
code/trunk/doc/pcre2perform.3
code/trunk/doc/pcre2syntax.3
code/trunk/perltest.sh
code/trunk/src/config.h.generic
code/trunk/src/pcre2.h
code/trunk/src/pcre2.h.generic
code/trunk/src/pcre2_config.c
code/trunk/src/pcre2_context.c
code/trunk/src/pcre2_error.c
code/trunk/src/pcre2_internal.h
code/trunk/src/pcre2_jit_compile.c
code/trunk/src/pcre2_pattern_info.c
code/trunk/src/pcre2_tables.c
code/trunk/src/pcre2_ucp.h
code/trunk/src/pcre2posix.c
code/trunk/src/pcre2posix.h
code/trunk/src/pcre2test.c
code/trunk/src/sljit/sljitLir.c
code/trunk/testdata/testinput1
code/trunk/testdata/testinput2
code/trunk/testdata/testoutput1
code/trunk/testdata/testoutput2
code/trunk/testdata/testoutput8-32-3
code/trunk/testdata/testoutput8-32-4
Modified: code/trunk/CMakeLists.txt
===================================================================
--- code/trunk/CMakeLists.txt 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/CMakeLists.txt 2017-07-19 16:04:15 UTC (rev 842)
@@ -429,7 +429,7 @@
src/pcre2_compile.c
src/pcre2_config.c
src/pcre2_context.c
- src/pcre2_convert.c
+ src/pcre2_convert.c
src/pcre2_dfa_match.c
src/pcre2_error.c
src/pcre2_find_bracket.c
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/ChangeLog 2017-07-19 16:04:15 UTC (rev 842)
@@ -2,16 +2,16 @@
--------------------
-Version 10.30-DEV 09-March-2017
--------------------------------
+Version 10.30-RC1 18-July-2017
+------------------------------
-1. The main interpreter, pcre2_match(), has been refactored into a new version
-that does not use recursive function calls (and therefore the stack) for
-remembering backtracking positions. This makes --disable-stack-for-recursion a
+1. The main interpreter, pcre2_match(), has been refactored into a new version
+that does not use recursive function calls (and therefore the stack) for
+remembering backtracking positions. This makes --disable-stack-for-recursion a
NOOP. The new implementation allows backtracking into recursive group calls in
-patterns, making it more compatible with Perl, and also fixes some other
-hard-to-do issues such as #1887 in Bugzilla. The code is also cleaner because
-the old code had a number of fudges to try to reduce stack usage. It seems to
+patterns, making it more compatible with Perl, and also fixes some other
+hard-to-do issues such as #1887 in Bugzilla. The code is also cleaner because
+the old code had a number of fudges to try to reduce stack usage. It seems to
run no slower than the old code.
A number of bugs in the refactored code were subsequently fixed during testing
@@ -18,53 +18,53 @@
before release, but after the code was made available in the repository. These
bugs were never in fully released code, but are noted here for the record.
- (a) If a pattern had fewer capturing parentheses than the ovector supplied in
+ (a) If a pattern had fewer capturing parentheses than the ovector supplied in
the match data block, a memory error (detectable by ASAN) occurred after
a match, because the external block was being set from non-existent
internal ovector fields. Fixes oss-fuzz issue 781.
- (b) A pattern with very many capturing parentheses (when the internal frame
- size was greater than the initial frame vector on the stack) caused a
- crash. A vector on the heap is now set up at the start of matching if the
- vector on the stack is not big enough to handle at least 10 frames.
- Fixes oss-fuzz issue 783.
-
+ (b) A pattern with very many capturing parentheses (when the internal frame
+ size was greater than the initial frame vector on the stack) caused a
+ crash. A vector on the heap is now set up at the start of matching if the
+ vector on the stack is not big enough to handle at least 10 frames.
+ Fixes oss-fuzz issue 783.
+
(c) Handling of (*VERB)s in recursions was wrong in some cases.
-
+
(d) Captures in negative assertions that were used as conditions were not
- happening if the assertion matched via (*ACCEPT).
-
- (e) Mark values were not being passed out of recursions.
-
- (f) Refactor some code in do_callout() to avoid picky compiler warnings about
+ happening if the assertion matched via (*ACCEPT).
+
+ (e) Mark values were not being passed out of recursions.
+
+ (f) Refactor some code in do_callout() to avoid picky compiler warnings about
negative indices. Fixes oss-fuzz issue 1454.
-
+
(g) Similarly refactor the way the variable length ovector is addressed for
similar reasons. Fixes oss-fuzz issue 1465.
-
+
2. Now that pcre2_match() no longer uses recursive function calls (see above),
-the "match limit recursion" value seems misnamed. It still exists, and limits
-the depth of tree that is searched. To avoid future confusion, it has been
-renamed as "depth limit" in all relevant places (--with-depth-limit,
-(*LIMIT_DEPTH), pcre2_set_depth_limit(), etc) but the old names are still
-available for backwards compatibility.
-
+the "match limit recursion" value seems misnamed. It still exists, and limits
+the depth of tree that is searched. To avoid future confusion, it has been
+renamed as "depth limit" in all relevant places (--with-depth-limit,
+(*LIMIT_DEPTH), pcre2_set_depth_limit(), etc) but the old names are still
+available for backwards compatibility.
+
3. Hardened pcre2test so as to reduce the number of bugs reported by fuzzers:
- (a) Check for malloc failures when getting memory for the ovector (POSIX) or
- the match data block (non-POSIX).
-
+ (a) Check for malloc failures when getting memory for the ovector (POSIX) or
+ the match data block (non-POSIX).
+
4. In the 32-bit library in non-UTF mode, an attempt to find a Unicode property
for a character with a code point greater than 0x10ffff (the Unicode maximum)
caused a crash.
-5. If a lookbehind assertion that contained a back reference to a group
+5. If a lookbehind assertion that contained a back reference to a group
appearing later in the pattern was compiled with the PCRE2_ANCHORED option,
-undefined actions (often a segmentation fault) could occur, depending on what
-other options were set. An example assertion is (?<!\1(abc)) where the
+undefined actions (often a segmentation fault) could occur, depending on what
+other options were set. An example assertion is (?<!\1(abc)) where the
reference \1 precedes the group (abc). This fixes oss-fuzz issue 865.
-6. Added the PCRE2_INFO_FRAMESIZE item to pcre2_pattern_info() and arranged for
+6. Added the PCRE2_INFO_FRAMESIZE item to pcre2_pattern_info() and arranged for
pcre2test to use it to output the frame size when the "framesize" modifier is
given.
@@ -71,9 +71,9 @@
7. Reworked the recursive pattern matching in the JIT compiler to follow the
interpreter changes.
-8. When the zero_terminate modifier was specified on a pcre2test subject line
-for global matching, unpredictable things could happen. For example, in UTF-8
-mode, the pattern //g,zero_terminate read random memory when matched against an
+8. When the zero_terminate modifier was specified on a pcre2test subject line
+for global matching, unpredictable things could happen. For example, in UTF-8
+mode, the pattern //g,zero_terminate read random memory when matched against an
empty string with zero_terminate. This was a bug in pcre2test, not the library.
9. Moved some Windows-specific code in pcre2grep (introduced in 10.23/13) out
@@ -80,27 +80,27 @@
of the section that is compiled when Unix-style directory scanning is
available, and into a new section that is always compiled for Windows.
-10. In pcre2test, explicitly close the file after an error during serialization
+10. In pcre2test, explicitly close the file after an error during serialization
or deserialization (the "load" or "save" commands).
11. Fix memory leak in pcre2_serialize_decode() when the input is invalid.
-12. Fix potential NULL dereference in pcre2_callout_enumerate() if called with
+12. Fix potential NULL dereference in pcre2_callout_enumerate() if called with
a NULL pattern pointer when Unicode support is available.
-13. When the 32-bit library was being tested by pcre2test, error messages that
-were longer than 64 code units could cause a buffer overflow. This was a bug in
+13. When the 32-bit library was being tested by pcre2test, error messages that
+were longer than 64 code units could cause a buffer overflow. This was a bug in
pcre2test.
-14. The alternative matching function, pcre2_dfa_match() misbehaved if it
+14. The alternative matching function, pcre2_dfa_match() misbehaved if it
encountered a character class with a possessive repeat, for example [a-f]{3}+.
-15. The depth (formerly recursion) limit now applies to DFA matching (as
-of 10.23/36); pcre2test has been upgraded so that \=find_limits works with DFA
+15. The depth (formerly recursion) limit now applies to DFA matching (as
+of 10.23/36); pcre2test has been upgraded so that \=find_limits works with DFA
matching to find the minimum value for this limit.
-16. Since 10.21, if pcre2_match() was called with a null context, default
-memory allocation functions were used instead of whatever was used when the
+16. Since 10.21, if pcre2_match() was called with a null context, default
+memory allocation functions were used instead of whatever was used when the
pattern was compiled.
17. Changes to the pcre2test "memory" modifier on a subject line. These apply
@@ -108,33 +108,33 @@
(a) Warn if null_context is set on both pattern and subject, because the
memory details cannot then be shown.
-
+
(b) Remember (up to a certain number of) memory allocations and their
lengths, and list only the lengths, so as to be system-independent.
- (In practice, the new interpreter never has more than 2 blocks allocated
- simultaneously.)
-
+ (In practice, the new interpreter never has more than 2 blocks allocated
+ simultaneously.)
+
18. Make pcre2test detect an error return from pcre2_get_error_message(), give
-a message, and abandon the run (this would have detected #13 above).
+a message, and abandon the run (this would have detected #13 above).
19. Implemented PCRE2_ENDANCHORED.
-20. Applied Jason Hood's patches (slightly modified) to pcre2grep, to implement
+20. Applied Jason Hood's patches (slightly modified) to pcre2grep, to implement
the --output=text (-O) option and the inbuilt callout echo.
-21. Extend auto-anchoring etc. to ignore groups with a zero qualifier and
-single-branch conditions with a false condition (e.g. DEFINE) at the start of a
+21. Extend auto-anchoring etc. to ignore groups with a zero qualifier and
+single-branch conditions with a false condition (e.g. DEFINE) at the start of a
branch. For example, /(?(DEFINE)...)^A/ and /(...){0}^B/ are now flagged as
anchored.
-22. Added an explicit limit on the amount of heap used by pcre2_match(), set by
-pcre2_set_heap_limit() or (*LIMIT_HEAP=xxx). Upgraded pcre2test to show the
-heap limit along with other pattern information, and to find the minimum when
+22. Added an explicit limit on the amount of heap used by pcre2_match(), set by
+pcre2_set_heap_limit() or (*LIMIT_HEAP=xxx). Upgraded pcre2test to show the
+heap limit along with other pattern information, and to find the minimum when
the find_limits modifier is set.
-23. Write to the last 8 bytes of the pcre2_real_code structure when a compiled
-pattern is set up so as to initialize any padding the compiler might have
-included. This avoids valgrind warnings when a compiled pattern is copied, in
+23. Write to the last 8 bytes of the pcre2_real_code structure when a compiled
+pattern is set up so as to initialize any padding the compiler might have
+included. This avoids valgrind warnings when a compiled pattern is copied, in
particular when it is serialized.
24. Remove a redundant line of code left in accidentally a long time ago.
@@ -143,70 +143,70 @@
26. Correct an incorrect cast in pcre2_valid_utf.c
-27. Update pcre2test, remove some unused code in pcre2_match(), and upgrade the
+27. Update pcre2test, remove some unused code in pcre2_match(), and upgrade the
tests to improve coverage.
28. Some fixes/tidies as a result of looking at Coverity Scan output:
(a) Typo: ">" should be ">=" in opcode check in pcre2_auto_possess.c.
- (b) Added some casts to avoid "suspicious implicit sign extension".
- (c) Resource leaks in pcre2test in rare error cases.
+ (b) Added some casts to avoid "suspicious implicit sign extension".
+ (c) Resource leaks in pcre2test in rare error cases.
(d) Avoid warning for never-use case OP_TABLE_LENGTH which is just a fudge
- for checking at compile time that tables are the right size.
- (e) Add missing "fall through" comment.
-
-29. Implemented PCRE2_EXTENDED_MORE and related /xx and (?xx) features.
+ for checking at compile time that tables are the right size.
+ (e) Add missing "fall through" comment.
+29. Implemented PCRE2_EXTENDED_MORE and related /xx and (?xx) features.
+
30. Implement (?n: for PCRE2_NO_AUTO_CAPTURE, because Perl now has this.
-31. If more than one of "push", "pushcopy", or "pushtablescopy" were set in
+31. If more than one of "push", "pushcopy", or "pushtablescopy" were set in
pcre2test, a crash could occur.
-32. Make -bigstack in RunTest allocate a 64Mb stack (instead of 16 MB) so that
+32. Make -bigstack in RunTest allocate a 64Mb stack (instead of 16 MB) so that
all the tests can run with clang's sanitizing options.
-33. Implement extra compile options in the compile context and add the first
+33. Implement extra compile options in the compile context and add the first
one: PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES.
34. Implement newline type PCRE2_NEWLINE_NUL.
-35. A lookbehind assertion that had a zero-length branch caused undefined
+35. A lookbehind assertion that had a zero-length branch caused undefined
behaviour when processed by pcre2_dfa_match(). This is oss-fuzz issue 1859.
-36. The match limit value now also applies to pcre2_dfa_match() as there are
-patterns that can use up a lot of resources without necessarily recursing very
+36. The match limit value now also applies to pcre2_dfa_match() as there are
+patterns that can use up a lot of resources without necessarily recursing very
deeply. (Compare item 10.23/36.) This should fix oss-fuzz #1761.
37. Implement PCRE2_EXTRA_BAD_ESCAPE_IS_LITERAL.
-38. Fix returned offsets from regexec() when REG_STARTEND is used with a
+38. Fix returned offsets from regexec() when REG_STARTEND is used with a
starting offset greater than zero.
39. Implement REG_PEND (GNU extension) for the POSIX wrapper.
-40. Implement the subject_literal modifier in pcre2test, and allow jitstack on
+40. Implement the subject_literal modifier in pcre2test, and allow jitstack on
pattern lines.
41. Implement PCRE2_LITERAL and use it to support REG_NOSPEC.
-42. Implement PCRE2_EXTRA_MATCH_LINE and PCRE2_EXTRA_MATCH_WORD for the benefit
+42. Implement PCRE2_EXTRA_MATCH_LINE and PCRE2_EXTRA_MATCH_WORD for the benefit
of pcre2grep.
-43. Re-implement pcre2grep's -F, -w, and -x options using PCRE2_LITERAL,
+43. Re-implement pcre2grep's -F, -w, and -x options using PCRE2_LITERAL,
PCRE2_EXTRA_MATCH_WORD, and PCRE2_EXTRA_MATCH_LINE. This fixes two bugs:
(a) The -F option did not work for fixed strings containing \E.
- (b) The -w option did not work for patterns with multiple branches.
-
+ (b) The -w option did not work for patterns with multiple branches.
+
44. Added configuration options for the SELinux compatible execmem allocator in
JIT.
-45. Increased the limit for searching for a "must be present" code unit in
-subjects from 1000 to 2000 for 8-bit searches, since they use memchr() and are
+45. Increased the limit for searching for a "must be present" code unit in
+subjects from 1000 to 2000 for 8-bit searches, since they use memchr() and are
much faster.
46. Arrange for anchored patterns to record and use "first code unit" data,
-because this can give a fast "no match" without searching for a "required code
+because this can give a fast "no match" without searching for a "required code
unit". Previously only non-anchored patterns did this.
47. Upgraded the Unicode tables from Unicode 8.0.0 to Unicode 10.0.0.
@@ -213,10 +213,10 @@
48. Add the callout_no_where modifier to pcre2test.
-49. Update extended grapheme breaking rules to the latest set that are in
+49. Update extended grapheme breaking rules to the latest set that are in
Unicode Standard Annex #29.
-50. Added experimental foreign pattern conversion facilities
+50. Added experimental foreign pattern conversion facilities
(pcre2_pattern_convert() and friends).
Modified: code/trunk/NEWS
===================================================================
--- code/trunk/NEWS 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/NEWS 2017-07-19 16:04:15 UTC (rev 842)
@@ -1,6 +1,63 @@
News about PCRE2 releases
-------------------------
+Version 10.30-RC1 18-July-2017
+------------------------------
+
+The full list of changes that includes bugfixes and tidies is, as always, in
+ChangeLog. These are the most important new features:
+
+1. The main interpreter, pcre2_match(), has been refactored into a new version
+that does not use recursive function calls (and therefore the system stack) for
+remembering backtracking positions. This makes --disable-stack-for-recursion a
+NOOP. The new implementation allows backtracking into recursive group calls in
+patterns, making it more compatible with Perl, and also fixes some other
+previously hard-to-do issues. For patterns that have a lot of backtracking, the
+heap is now used, and there is explicit limit on the amount, settable by
+pcre2_set_heap_limit() or (*LIMIT_HEAP=xxx). The "recursion limit" is retained,
+but is renamed as "depth limit" (though the old names remain for
+compatibility).
+
+There is also a change in the way callouts from pcre2_match() are handled. The
+offset_vector field in the callout block is no longer a pointer to the
+actual ovector that was passed to the matching function in the match data
+block. Instead it points to an internal ovector of a size large enough to hold
+all possible captured substrings in the pattern.
+
+2. The new option PCRE2_ENDANCHORED insists that a pattern match must end at
+the end of the subject.
+
+3. The new option PCRE2_EXTENDED_MORE implements Perl's /xx feature, and
+pcre2test is upgraded to support it. Setting within the pattern by (?xx) is
+also supported.
+
+4. (?n) can be used to set PCRE2_NO_AUTO_CAPTURE, because Perl now has this.
+
+5. Additional compile options in the compile context are now available, and the
+first two are: PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES and
+PCRE2_EXTRA_BAD_ESCAPE_IS LITERAL.
+
+6. The newline type PCRE2_NEWLINE_NUL is now available.
+
+7. The match limit value now also applies to pcre2_dfa_match() as there are
+patterns that can use up a lot of resources without necessarily recursing very
+deeply.
+
+8. The option REG_PEND (a GNU extension) is now available for the POSIX
+wrapper. Also there is a new option PCRE2_LITERAL which is used to support
+REG_NOSPEC.
+
+9. PCRE2_EXTRA_MATCH_LINE and PCRE2_EXTRA_MATCH_WORD are implemented for the
+benefit of pcre2grep, and pcre2grep's -F, -w, and -x options are re-implemented
+using PCRE2_LITERAL, PCRE2_EXTRA_MATCH_WORD, and PCRE2_EXTRA_MATCH_LINE. This
+is tidier and also fixes some bugs.
+
+10. The Unicode tables are upgraded from Unicode 8.0.0 to Unicode 10.0.0.
+
+11. There are some experimental functions for converting foreign patterns
+(globs and POSIX patterns) into PCRE2 patterns.
+
+
Version 10.23 14-February-2017
------------------------------
Modified: code/trunk/NON-AUTOTOOLS-BUILD
===================================================================
--- code/trunk/NON-AUTOTOOLS-BUILD 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/NON-AUTOTOOLS-BUILD 2017-07-19 16:04:15 UTC (rev 842)
@@ -179,8 +179,8 @@
STACK SIZE IN WINDOWS ENVIRONMENTS
-Prior to release 10.30 the default system stack size of 1Mb in some Windows
-environments caused issues with some tests. This should no longer be the case
+Prior to release 10.30 the default system stack size of 1Mb in some Windows
+environments caused issues with some tests. This should no longer be the case
for 10.30 and later releases.
Modified: code/trunk/README
===================================================================
--- code/trunk/README 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/README 2017-07-19 16:04:15 UTC (rev 842)
@@ -173,7 +173,7 @@
architectures. If you try to enable it on an unsupported architecture, there
will be a compile time error. If you are running under SELinux you may also
want to add --enable-jit-sealloc, which enables the use of an execmem
- allocator in JIT that is compatible with SELinux. This has no effect if JIT
+ allocator in JIT that is compatible with SELinux. This has no effect if JIT
is not enabled.
. If you do not want to make use of the default support for UTF-8 Unicode
@@ -198,13 +198,14 @@
or starting a pattern with (*UCP).
. You can build PCRE2 to recognize either CR or LF or the sequence CRLF, or any
- of the preceding, or any of the Unicode newline sequences, as indicating the
- end of a line. Whatever you specify at build time is the default; the caller
- of PCRE2 can change the selection at run time. The default newline indicator
- is a single LF character (the Unix standard). You can specify the default
- newline indicator by adding --enable-newline-is-cr, --enable-newline-is-lf,
- --enable-newline-is-crlf, --enable-newline-is-anycrlf, or
- --enable-newline-is-any to the "configure" command, respectively.
+ of the preceding, or any of the Unicode newline sequences, or the NUL (zero)
+ character as indicating the end of a line. Whatever you specify at build time
+ is the default; the caller of PCRE2 can change the selection at run time. The
+ default newline indicator is a single LF character (the Unix standard). You
+ can specify the default newline indicator by adding --enable-newline-is-cr,
+ --enable-newline-is-lf, --enable-newline-is-crlf,
+ --enable-newline-is-anycrlf, --enable-newline-is-any, or
+ --enable-newline-is-nul to the "configure" command, respectively.
. By default, the sequence \R in a pattern matches any Unicode line ending
sequence. This is independent of the option specifying what PCRE2 considers
@@ -227,15 +228,15 @@
--with-parens-nest-limit=500
. PCRE2 has a counter that can be set to limit the amount of computing resource
- it uses when matching a pattern with the Perl-compatible matching function.
- If the limit is exceeded during a match, the match fails. The default is ten
- million. You can change the default by setting, for example,
+ it uses when matching a pattern. If the limit is exceeded during a match, the
+ match fails. The default is ten million. You can change the default by
+ setting, for example,
--with-match-limit=500000
on the "configure" command. This is just the default; individual calls to
- pcre2_match() can supply their own value. There is more discussion in the
- pcre2api man page (search for pcre2_set_match_limit).
+ pcre2_match() or pcre2_dfa_match() can supply their own value. There is more
+ discussion in the pcre2api man page (search for pcre2_set_match_limit).
. There is a separate counter that limits the depth of nested backtracking
during a matching process, which indirectly limits the amount of heap memory
@@ -246,16 +247,16 @@
There is more discussion in the pcre2api man page (search for
pcre2_set_depth_limit).
-
-. You can also set an explicit limit on the amount of heap memory used by
+
+. You can also set an explicit limit on the amount of heap memory used by
the pcre2_match() interpreter:
-
+
--with-heap-limit=500
-
- The units are kilobytes. This limit does not apply when the JIT optimization
- (which has its own memory control features) is used. There is more discussion
- on the pcre2api man page (search for pcre2_set_heap_limit).
+ The units are kilobytes. This limit does not apply when the JIT optimization
+ (which has its own memory control features) is used. There is more discussion
+ on the pcre2api man page (search for pcre2_set_heap_limit).
+
. In the 8-bit library, the default maximum compiled pattern size is around
64K bytes. You can increase this by adding --with-link-size=3 to the
"configure" command. PCRE2 then uses three bytes instead of two for offsets
@@ -659,9 +660,10 @@
Tests 6 and 7 check the pcre2_dfa_match() alternative matching function, in
non-UTF mode and UTF-mode with Unicode property support, respectively.
-Test 8 checks some internal offsets and code size features; it is run only when
-the default "link size" of 2 is set (in other cases the sizes change) and when
-Unicode support is enabled.
+Test 8 checks some internal offsets and code size features, but it is run only
+when Unicode support is enabled. The output is different in 8-bit, 16-bit, and
+32-bit modes and for different link sizes, so there are different output files
+for each mode and link size.
Tests 9 and 10 are run only in 8-bit mode, and tests 11 and 12 are run only in
16-bit and 32-bit modes. These are tests that generate different output in
@@ -671,7 +673,7 @@
pcre2_dfa_match() in 16-bit and 32-bit modes.
Test 14 contains some special UTF and UCP tests that give different output for
-the different widths.
+different code unit widths.
Test 15 contains a number of tests that must not be run with JIT. They check,
among other non-JIT things, the match-limiting features of the intepretive
@@ -692,7 +694,10 @@
Tests 21 and 22 test \C support when the use of \C is not locked out, without
and with UTF support, respectively. Test 23 tests \C when it is locked out.
+Tests 24 and 25 test the experimental pattern conversion functions, without and
+with UTF support, respectively.
+
Character tables
----------------
@@ -710,7 +715,7 @@
by the program dftables (compiled from dftables.c), which uses the ANSI C
character handling functions such as isalnum(), isalpha(), isupper(),
islower(), etc. to build the table sources. This means that the default C
-locale which is set for your system will control the contents of these default
+locale that is set for your system will control the contents of these default
tables. You can change the default tables by editing pcre2_chartables.c and
then re-building PCRE2. If you do this, you should take care to ensure that the
file does not get automatically re-generated. The best way to do this is to
@@ -765,6 +770,7 @@
src/pcre2_compile.c )
src/pcre2_config.c )
src/pcre2_context.c )
+ src/pcre2_convert.c )
src/pcre2_dfa_match.c )
src/pcre2_error.c )
src/pcre2_find_bracket.c )
@@ -804,7 +810,6 @@
src/pcre2demo.c simple demonstration of coding calls to PCRE2
src/pcre2grep.c source of a grep utility that uses PCRE2
src/pcre2test.c comprehensive test program
- src/pcre2_printint.c part of pcre2test
src/pcre2_jit_test.c JIT test program
(C) Auxiliary files:
@@ -869,12 +874,12 @@
(E) Auxiliary files for building PCRE2 "by hand"
- pcre2.h.generic ) a version of the public PCRE2 header file
+ src/pcre2.h.generic ) a version of the public PCRE2 header file
) for use in non-"configure" environments
- config.h.generic ) a version of config.h for use in non-"configure"
+ src/config.h.generic ) a version of config.h for use in non-"configure"
) environments
Philip Hazel
Email local part: ph10
Email domain: cam.ac.uk
-Last updated: 17 June 2017
+Last updated: 18 July 2017
Modified: code/trunk/RunTest
===================================================================
--- code/trunk/RunTest 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/RunTest 2017-07-19 16:04:15 UTC (rev 842)
@@ -830,7 +830,7 @@
if [ $supportBSC -ne 0 ] ; then
echo " Skipped because \C is not disabled"
else
- $sim $valgrind ${opt:+$vjs} ./pcre2test -q $setstack $bmode $opt $testdata/testinput23 testtry
+ $sim $valgrind ./pcre2test -q $setstack $bmode $testdata/testinput23 testtry
checkresult $? 23 ""
fi
fi
@@ -839,7 +839,7 @@
if [ "$do24" = yes ] ; then
echo $title24
- $sim $valgrind ${opt:+$vjs} ./pcre2test -q $setstack $bmode $opt $testdata/testinput24 testtry
+ $sim $valgrind ./pcre2test -q $setstack $bmode $testdata/testinput24 testtry
checkresult $? 24 ""
fi
@@ -850,7 +850,7 @@
if [ $utf -eq 0 ] ; then
echo " Skipped because UTF-$bits support is not available"
else
- $sim $valgrind ${opt:+$vjs} ./pcre2test -q $setstack $bmode $opt $testdata/testinput25 testtry
+ $sim $valgrind ./pcre2test -q $setstack $bmode $testdata/testinput25 testtry
checkresult $? 25 ""
fi
fi
Modified: code/trunk/configure.ac
===================================================================
--- code/trunk/configure.ac 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/configure.ac 2017-07-19 16:04:15 UTC (rev 842)
@@ -10,17 +10,17 @@
m4_define(pcre2_major, [10])
m4_define(pcre2_minor, [30])
-m4_define(pcre2_prerelease, [-DEV])
-m4_define(pcre2_date, [2017-03-05])
+m4_define(pcre2_prerelease, [-RC1])
+m4_define(pcre2_date, [2017-07-18])
# 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.
# Libtool shared library interface versions (current:revision:age)
-m4_define(libpcre2_8_version, [5:0:5])
-m4_define(libpcre2_16_version, [5:0:5])
-m4_define(libpcre2_32_version, [5:0:5])
-m4_define(libpcre2_posix_version, [1:1:0])
+m4_define(libpcre2_8_version, [6:0:6])
+m4_define(libpcre2_16_version, [6:0:6])
+m4_define(libpcre2_32_version, [6:0:6])
+m4_define(libpcre2_posix_version, [2:0:0])
AC_PREREQ(2.57)
AC_INIT(PCRE2, pcre2_major.pcre2_minor[]pcre2_prerelease, , pcre2)
@@ -277,7 +277,7 @@
AC_ARG_WITH(heap-limit,
AS_HELP_STRING([--with-heap-limit=N],
[default limit on heap memory (kilobytes, default=20000000)]),
- , with_heap_limit=20000000)
+ , with_heap_limit=20000000)
# Handle --with-match-limit=N
AC_ARG_WITH(match-limit,
@@ -301,7 +301,7 @@
AC_ARG_WITH(match-limit-recursion,,
, with_match_limit_recursion=UNSET)
-
+
# Handle --enable-valgrind
AC_ARG_ENABLE(valgrind,
AS_HELP_STRING([--enable-valgrind],
@@ -370,7 +370,7 @@
crlf) ac_pcre2_newline_value=3 ;;
any) ac_pcre2_newline_value=4 ;;
anycrlf) ac_pcre2_newline_value=5 ;;
- nul) ac_pcre2_newline_value=6 ;;
+ nul) ac_pcre2_newline_value=6 ;;
*)
AC_MSG_ERROR([invalid argument \"$enable_newline\" to --enable-newline option])
;;
@@ -737,7 +737,7 @@
AC_DEFINE_UNQUOTED([HEAP_LIMIT], [$with_heap_limit], [
This limits the amount of memory that pcre2_match() may use while matching
- a pattern. The value is in kilobytes.])
+ a pattern. The value is in kilobytes.])
AC_DEFINE([MAX_NAME_SIZE], [32], [
This limit is parameterized just in case anybody ever wants to
Modified: code/trunk/doc/html/NON-AUTOTOOLS-BUILD.txt
===================================================================
--- code/trunk/doc/html/NON-AUTOTOOLS-BUILD.txt 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/NON-AUTOTOOLS-BUILD.txt 2017-07-19 16:04:15 UTC (rev 842)
@@ -179,8 +179,8 @@
STACK SIZE IN WINDOWS ENVIRONMENTS
-Prior to release 10.30 the default system stack size of 1Mb in some Windows
-environments caused issues with some tests. This should no longer be the case
+Prior to release 10.30 the default system stack size of 1Mb in some Windows
+environments caused issues with some tests. This should no longer be the case
for 10.30 and later releases.
Modified: code/trunk/doc/html/README.txt
===================================================================
--- code/trunk/doc/html/README.txt 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/README.txt 2017-07-19 16:04:15 UTC (rev 842)
@@ -173,7 +173,7 @@
architectures. If you try to enable it on an unsupported architecture, there
will be a compile time error. If you are running under SELinux you may also
want to add --enable-jit-sealloc, which enables the use of an execmem
- allocator in JIT that is compatible with SELinux. This has no effect if JIT
+ allocator in JIT that is compatible with SELinux. This has no effect if JIT
is not enabled.
. If you do not want to make use of the default support for UTF-8 Unicode
@@ -198,13 +198,14 @@
or starting a pattern with (*UCP).
. You can build PCRE2 to recognize either CR or LF or the sequence CRLF, or any
- of the preceding, or any of the Unicode newline sequences, as indicating the
- end of a line. Whatever you specify at build time is the default; the caller
- of PCRE2 can change the selection at run time. The default newline indicator
- is a single LF character (the Unix standard). You can specify the default
- newline indicator by adding --enable-newline-is-cr, --enable-newline-is-lf,
- --enable-newline-is-crlf, --enable-newline-is-anycrlf, or
- --enable-newline-is-any to the "configure" command, respectively.
+ of the preceding, or any of the Unicode newline sequences, or the NUL (zero)
+ character as indicating the end of a line. Whatever you specify at build time
+ is the default; the caller of PCRE2 can change the selection at run time. The
+ default newline indicator is a single LF character (the Unix standard). You
+ can specify the default newline indicator by adding --enable-newline-is-cr,
+ --enable-newline-is-lf, --enable-newline-is-crlf,
+ --enable-newline-is-anycrlf, --enable-newline-is-any, or
+ --enable-newline-is-nul to the "configure" command, respectively.
. By default, the sequence \R in a pattern matches any Unicode line ending
sequence. This is independent of the option specifying what PCRE2 considers
@@ -227,15 +228,15 @@
--with-parens-nest-limit=500
. PCRE2 has a counter that can be set to limit the amount of computing resource
- it uses when matching a pattern with the Perl-compatible matching function.
- If the limit is exceeded during a match, the match fails. The default is ten
- million. You can change the default by setting, for example,
+ it uses when matching a pattern. If the limit is exceeded during a match, the
+ match fails. The default is ten million. You can change the default by
+ setting, for example,
--with-match-limit=500000
on the "configure" command. This is just the default; individual calls to
- pcre2_match() can supply their own value. There is more discussion in the
- pcre2api man page (search for pcre2_set_match_limit).
+ pcre2_match() or pcre2_dfa_match() can supply their own value. There is more
+ discussion in the pcre2api man page (search for pcre2_set_match_limit).
. There is a separate counter that limits the depth of nested backtracking
during a matching process, which indirectly limits the amount of heap memory
@@ -246,16 +247,16 @@
There is more discussion in the pcre2api man page (search for
pcre2_set_depth_limit).
-
-. You can also set an explicit limit on the amount of heap memory used by
+
+. You can also set an explicit limit on the amount of heap memory used by
the pcre2_match() interpreter:
-
+
--with-heap-limit=500
-
- The units are kilobytes. This limit does not apply when the JIT optimization
- (which has its own memory control features) is used. There is more discussion
- on the pcre2api man page (search for pcre2_set_heap_limit).
+ The units are kilobytes. This limit does not apply when the JIT optimization
+ (which has its own memory control features) is used. There is more discussion
+ on the pcre2api man page (search for pcre2_set_heap_limit).
+
. In the 8-bit library, the default maximum compiled pattern size is around
64K bytes. You can increase this by adding --with-link-size=3 to the
"configure" command. PCRE2 then uses three bytes instead of two for offsets
@@ -659,9 +660,10 @@
Tests 6 and 7 check the pcre2_dfa_match() alternative matching function, in
non-UTF mode and UTF-mode with Unicode property support, respectively.
-Test 8 checks some internal offsets and code size features; it is run only when
-the default "link size" of 2 is set (in other cases the sizes change) and when
-Unicode support is enabled.
+Test 8 checks some internal offsets and code size features, but it is run only
+when Unicode support is enabled. The output is different in 8-bit, 16-bit, and
+32-bit modes and for different link sizes, so there are different output files
+for each mode and link size.
Tests 9 and 10 are run only in 8-bit mode, and tests 11 and 12 are run only in
16-bit and 32-bit modes. These are tests that generate different output in
@@ -671,7 +673,7 @@
pcre2_dfa_match() in 16-bit and 32-bit modes.
Test 14 contains some special UTF and UCP tests that give different output for
-the different widths.
+different code unit widths.
Test 15 contains a number of tests that must not be run with JIT. They check,
among other non-JIT things, the match-limiting features of the intepretive
@@ -692,7 +694,10 @@
Tests 21 and 22 test \C support when the use of \C is not locked out, without
and with UTF support, respectively. Test 23 tests \C when it is locked out.
+Tests 24 and 25 test the experimental pattern conversion functions, without and
+with UTF support, respectively.
+
Character tables
----------------
@@ -710,7 +715,7 @@
by the program dftables (compiled from dftables.c), which uses the ANSI C
character handling functions such as isalnum(), isalpha(), isupper(),
islower(), etc. to build the table sources. This means that the default C
-locale which is set for your system will control the contents of these default
+locale that is set for your system will control the contents of these default
tables. You can change the default tables by editing pcre2_chartables.c and
then re-building PCRE2. If you do this, you should take care to ensure that the
file does not get automatically re-generated. The best way to do this is to
@@ -765,6 +770,7 @@
src/pcre2_compile.c )
src/pcre2_config.c )
src/pcre2_context.c )
+ src/pcre2_convert.c )
src/pcre2_dfa_match.c )
src/pcre2_error.c )
src/pcre2_find_bracket.c )
@@ -804,7 +810,6 @@
src/pcre2demo.c simple demonstration of coding calls to PCRE2
src/pcre2grep.c source of a grep utility that uses PCRE2
src/pcre2test.c comprehensive test program
- src/pcre2_printint.c part of pcre2test
src/pcre2_jit_test.c JIT test program
(C) Auxiliary files:
@@ -869,12 +874,12 @@
(E) Auxiliary files for building PCRE2 "by hand"
- pcre2.h.generic ) a version of the public PCRE2 header file
+ src/pcre2.h.generic ) a version of the public PCRE2 header file
) for use in non-"configure" environments
- config.h.generic ) a version of config.h for use in non-"configure"
+ src/config.h.generic ) a version of config.h for use in non-"configure"
) environments
Philip Hazel
Email local part: ph10
Email domain: cam.ac.uk
-Last updated: 17 June 2017
+Last updated: 18 July 2017
Modified: code/trunk/doc/html/pcre2.html
===================================================================
--- code/trunk/doc/html/pcre2.html 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/pcre2.html 2017-07-19 16:04:15 UTC (rev 842)
@@ -137,7 +137,7 @@
repeats in a pattern are a common example. PCRE2 provides some protection
against this: see the <b>pcre2_set_match_limit()</b> function in the
<a href="pcre2api.html"><b>pcre2api</b></a>
-page. There is a similar function called <b>pcre2_set_depth_limit()</b> that can
+page. There is a similar function called <b>pcre2_set_depth_limit()</b> that can
be used to restrict the amount of memory that is used.
</P>
<br><a name="SEC3" href="#TOC1">USER DOCUMENTATION</a><br>
Modified: code/trunk/doc/html/pcre2_code_free.html
===================================================================
--- code/trunk/doc/html/pcre2_code_free.html 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/pcre2_code_free.html 2017-07-19 16:04:15 UTC (rev 842)
@@ -26,8 +26,8 @@
</b><br>
<P>
This function frees the memory used for a compiled pattern, including any
-memory used by the JIT compiler. If the compiled pattern was created by a call
-to <b>pcre2_code_copy_with_tables()</b>, the memory for the character tables is
+memory used by the JIT compiler. If the compiled pattern was created by a call
+to <b>pcre2_code_copy_with_tables()</b>, the memory for the character tables is
also freed.
</P>
<P>
Modified: code/trunk/doc/html/pcre2_compile.html
===================================================================
--- code/trunk/doc/html/pcre2_compile.html 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/pcre2_compile.html 2017-07-19 16:04:15 UTC (rev 842)
@@ -64,7 +64,7 @@
PCRE2_ENDANCHORED Pattern can match only at end of subject
PCRE2_EXTENDED Ignore white space and # comments
PCRE2_FIRSTLINE Force matching to be before newline
- PCRE2_LITERAL Pattern characters are all literal
+ PCRE2_LITERAL Pattern characters are all literal
PCRE2_MATCH_UNSET_BACKREF Match unset back references
PCRE2_MULTILINE ^ and $ match newlines within data
PCRE2_NEVER_BACKSLASH_C Lock out the use of \C in patterns
Modified: code/trunk/doc/html/pcre2_config.html
===================================================================
--- code/trunk/doc/html/pcre2_config.html 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/pcre2_config.html 2017-07-19 16:04:15 UTC (rev 842)
@@ -45,7 +45,7 @@
PCRE2_CONFIG_BSR Indicates what \R matches by default:
PCRE2_BSR_UNICODE
PCRE2_BSR_ANYCRLF
- PCRE2_CONFIG_HEAPLIMIT Default heap memory limit
+ PCRE2_CONFIG_HEAPLIMIT Default heap memory limit
PCRE2_CONFIG_DEPTHLIMIT Default backtracking depth limit
PCRE2_CONFIG_JIT Availability of just-in-time compiler support (1=yes 0=no)
PCRE2_CONFIG_JITTARGET Information (a string) about the target architecture for the JIT compiler
@@ -57,7 +57,7 @@
PCRE2_NEWLINE_CRLF
PCRE2_NEWLINE_ANY
PCRE2_NEWLINE_ANYCRLF
- PCRE2_NEWLINE_NUL
+ PCRE2_NEWLINE_NUL
PCRE2_CONFIG_PARENSLIMIT Default parentheses nesting limit
PCRE2_CONFIG_RECURSIONLIMIT Obsolete: use PCRE2_CONFIG_DEPTHLIMIT
PCRE2_CONFIG_STACKRECURSE Obsolete: always returns 0
Modified: code/trunk/doc/html/pcre2_converted_pattern_free.html
===================================================================
--- code/trunk/doc/html/pcre2_converted_pattern_free.html 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/pcre2_converted_pattern_free.html 2017-07-19 16:04:15 UTC (rev 842)
@@ -26,8 +26,8 @@
</b><br>
<P>
This function is part of an experimental set of pattern conversion functions.
-It frees the memory occupied by a converted pattern that was obtained by
-calling <b>pcre2_pattern_convert()</b> with arguments that caused it to place
+It frees the memory occupied by a converted pattern that was obtained by
+calling <b>pcre2_pattern_convert()</b> with arguments that caused it to place
the converted pattern into newly obtained heap memory.
</P>
<P>
Modified: code/trunk/doc/html/pcre2_maketables.html
===================================================================
--- code/trunk/doc/html/pcre2_maketables.html 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/pcre2_maketables.html 2017-07-19 16:04:15 UTC (rev 842)
@@ -25,7 +25,7 @@
DESCRIPTION
</b><br>
<P>
-This function builds a set of character tables for character code points that
+This function builds a set of character tables for character code points that
are less than 256. These can be passed to <b>pcre2_compile()</b> in a compile
context in order to override the internal, built-in tables (which were either
defaulted or made by <b>pcre2_maketables()</b> when PCRE2 was compiled). See the
Modified: code/trunk/doc/html/pcre2_match.html
===================================================================
--- code/trunk/doc/html/pcre2_match.html 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/pcre2_match.html 2017-07-19 16:04:15 UTC (rev 842)
@@ -43,14 +43,14 @@
A match context is needed only if you want to:
<pre>
Set up a callout function
- Set a matching offset limit
- Change the heap memory limit
- Change the backtracking match limit
+ Set a matching offset limit
+ Change the heap memory limit
+ Change the backtracking match limit
Change the backtracking depth limit
Set custom memory management specifically for the match
</pre>
The <i>length</i> and <i>startoffset</i> values are code
-units, not characters. The length may be given as PCRE2_ZERO_TERMINATE for a
+units, not characters. The length may be given as PCRE2_ZERO_TERMINATE for a
subject that is terminated by a binary zero code unit. The options are:
<pre>
PCRE2_ANCHORED Match only at the first position
@@ -59,7 +59,7 @@
PCRE2_NOTEOL Subject string is not the end of a line
PCRE2_NOTEMPTY An empty string is not a valid match
PCRE2_NOTEMPTY_ATSTART An empty string at the start of the subject is not a valid match
- PCRE2_NO_JIT Do not use JIT matching
+ PCRE2_NO_JIT Do not use JIT matching
PCRE2_NO_UTF_CHECK Do not check the subject for UTF validity (only relevant if PCRE2_UTF
was set at compile time)
PCRE2_PARTIAL_HARD Return PCRE2_ERROR_PARTIAL for a partial match even if there is a full match
Modified: code/trunk/doc/html/pcre2_pattern_info.html
===================================================================
--- code/trunk/doc/html/pcre2_pattern_info.html 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/pcre2_pattern_info.html 2017-07-19 16:04:15 UTC (rev 842)
@@ -48,7 +48,7 @@
1 first code unit is set
2 start of string or after newline
PCRE2_INFO_FIRSTCODEUNIT First code unit when type is 1
- PCRE2_INFO_FRAMESIZE Size of backtracking frame
+ PCRE2_INFO_FRAMESIZE Size of backtracking frame
PCRE2_INFO_HASBACKSLASHC Return 1 if pattern contains \C
PCRE2_INFO_HASCRORLF Return 1 if explicit CR or LF matches exist in the pattern
PCRE2_INFO_HEAPLIMIT Heap memory limit if set, otherwise PCRE2_ERROR_UNSET
@@ -71,7 +71,7 @@
PCRE2_NEWLINE_CRLF
PCRE2_NEWLINE_ANY
PCRE2_NEWLINE_ANYCRLF
- PCRE2_NEWLINE_NUL
+ PCRE2_NEWLINE_NUL
PCRE2_INFO_RECURSIONLIMIT Obsolete synonym for PCRE2_INFO_DEPTHLIMIT
PCRE2_INFO_SIZE Size of compiled pattern
</pre>
Modified: code/trunk/doc/html/pcre2_set_newline.html
===================================================================
--- code/trunk/doc/html/pcre2_set_newline.html 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/pcre2_set_newline.html 2017-07-19 16:04:15 UTC (rev 842)
@@ -35,7 +35,7 @@
PCRE2_NEWLINE_CRLF CR followed by LF only
PCRE2_NEWLINE_ANYCRLF Any of the above
PCRE2_NEWLINE_ANY Any Unicode newline sequence
- PCRE2_NEWLINE_NUL The NUL character (binary zero)
+ PCRE2_NEWLINE_NUL The NUL character (binary zero)
</pre>
The result is zero for success or PCRE2_ERROR_BADDATA if the second argument is
invalid.
Modified: code/trunk/doc/html/pcre2_set_recursion_limit.html
===================================================================
--- code/trunk/doc/html/pcre2_set_recursion_limit.html 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/pcre2_set_recursion_limit.html 2017-07-19 16:04:15 UTC (rev 842)
@@ -26,7 +26,7 @@
DESCRIPTION
</b><br>
<P>
-This function is obsolete and should not be used in new code. Use
+This function is obsolete and should not be used in new code. Use
<b>pcre2_set_depth_limit()</b> instead.
</P>
<P>
Modified: code/trunk/doc/html/pcre2_substitute.html
===================================================================
--- code/trunk/doc/html/pcre2_substitute.html 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/pcre2_substitute.html 2017-07-19 16:04:15 UTC (rev 842)
@@ -60,7 +60,7 @@
The <i>length</i>, <i>startoffset</i> and <i>rlength</i> values are code
units, not characters, as is the contents of the variable pointed at by
<i>outlengthptr</i>, which is updated to the actual length of the new string.
-The subject and replacement lengths can be given as PCRE2_ZERO_TERMINATED for
+The subject and replacement lengths can be given as PCRE2_ZERO_TERMINATED for
zero-terminated strings. The options are:
<pre>
PCRE2_ANCHORED Match only at the first position
Modified: code/trunk/doc/html/pcre2build.html
===================================================================
--- code/trunk/doc/html/pcre2build.html 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/pcre2build.html 2017-07-19 16:04:15 UTC (rev 842)
@@ -87,10 +87,10 @@
<br><a name="SEC3" href="#TOC1">BUILDING 8-BIT, 16-BIT AND 32-BIT LIBRARIES</a><br>
<P>
By default, a library called <b>libpcre2-8</b> is built, containing functions
-that take string arguments contained in vectors of bytes, interpreted either as
+that take string arguments contained in arrays of bytes, interpreted either as
single-byte characters, or UTF-8 strings. You can also build two other
libraries, called <b>libpcre2-16</b> and <b>libpcre2-32</b>, which process
-strings that are contained in vectors of 16-bit and 32-bit code units,
+strings that are contained in arrays of 16-bit and 32-bit code units,
respectively. These can be interpreted either as single-unit characters or
UTF-16/UTF-32 strings. To build these additional libraries, add one or both of
the following to the <b>configure</b> command:
@@ -208,7 +208,7 @@
--enable-newline-is-anycrlf
</pre>
which causes PCRE2 to recognize any of the three sequences CR, LF, or CRLF as
-indicating a line ending. Finally, a fifth option, specified by
+indicating a line ending. A fifth option, specified by
<pre>
--enable-newline-is-any
</pre>
@@ -215,12 +215,16 @@
causes PCRE2 to recognize any Unicode newline sequence. The Unicode newline
sequences are the three just mentioned, plus the single characters VT (vertical
tab, U+000B), FF (form feed, U+000C), NEL (next line, U+0085), LS (line
-separator, U+2028), and PS (paragraph separator, U+2029).
+separator, U+2028), and PS (paragraph separator, U+2029). The final option is
+<pre>
+ --enable-newline-is-nul
+</pre>
+which causes NUL (binary zero) is set as the default line-ending character.
</P>
<P>
Whatever default line ending convention is selected when PCRE2 is built can be
overridden by applications that use the library. At build time it is
-conventional to use the standard for your operating system.
+recommended to use the standard for your operating system.
</P>
<br><a name="SEC9" href="#TOC1">WHAT \R MATCHES</a><br>
<P>
@@ -301,7 +305,9 @@
capturing parentheses in a pattern, the amount of heap that is used before the
limit is reached varies from pattern to pattern. This limit was more useful in
versions before 10.30, where function recursion was used for backtracking.
-However, as well as applying to <b>pcre2_match()</b>, this limit also controls
+</P>
+<P>
+As well as applying to <b>pcre2_match()</b>, the depth limit also controls
the depth of recursive function calls in <b>pcre2_dfa_match()</b>. These are
used for lookaround assertions, atomic groups, and recursion within patterns.
The limit does not apply to JIT matching.
@@ -559,7 +565,7 @@
</P>
<br><a name="SEC25" href="#TOC1">REVISION</a><br>
<P>
-Last updated: 17 June 2017
+Last updated: 18 July 2017
<br>
Copyright © 1997-2017 University of Cambridge.
<br>
Modified: code/trunk/doc/html/pcre2compat.html
===================================================================
--- code/trunk/doc/html/pcre2compat.html 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/pcre2compat.html 2017-07-19 16:04:15 UTC (rev 842)
@@ -85,7 +85,7 @@
<P>
8. Subroutine calls (whether recursive or not) were treated as atomic groups up
to PCRE2 release 10.23, but from release 10.30 this changed, and backtracking
-into subroutine calls is now supported, as in Perl.
+into subroutine calls is now supported, as in Perl.
</P>
<P>
9. If any of the backtracking control verbs are used in a subpattern that is
Modified: code/trunk/doc/html/pcre2grep.html
===================================================================
--- code/trunk/doc/html/pcre2grep.html 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/pcre2grep.html 2017-07-19 16:04:15 UTC (rev 842)
@@ -517,8 +517,8 @@
The <b>--match-limit</b> option provides a means of limiting computing resource
usage when processing patterns that are not going to match, but which have a
very large number of possibilities in their search trees. The classic example
-is a pattern that uses nested unlimited repeats. Internally, PCRE2 has a
-counter that is incremented each time around its main processing loop. If the
+is a pattern that uses nested unlimited repeats. Internally, PCRE2 has a
+counter that is incremented each time around its main processing loop. If the
value set by <b>--match-limit</b> is reached, an error occurs.
<br>
<br>
@@ -525,12 +525,12 @@
The <b>--heap-limit</b> option specifies, as a number of kilobytes, the amount
of heap memory that may be used for matching. Heap memory is needed only if
matching the pattern requires a significant number of nested backtracking
-points to be remembered. This parameter can be set to zero to forbid the use of
+points to be remembered. This parameter can be set to zero to forbid the use of
heap memory altogether.
<br>
<br>
The <b>--depth-limit</b> option limits the depth of nested backtracking points,
-which indirectly limits the amount of memory that is used. The amount of memory
+which indirectly limits the amount of memory that is used. The amount of memory
needed for each backtracking point depends on the number of capturing
parentheses in the pattern, so the amount of memory that is used before this
limit acts varies from pattern to pattern. This limit is of use only if it is
@@ -538,7 +538,7 @@
<br>
<br>
There are no short forms for these options. The default settings are specified
-when the PCRE2 library is compiled, with the default defaults being very large
+when the PCRE2 library is compiled, with the default defaults being very large
and so effectively unlimited.
</P>
<P>
@@ -841,7 +841,7 @@
A callout in a PCRE2 pattern is of the form (?C<arg>) where the argument is
either a number or a quoted string (see the
<a href="pcre2callout.html"><b>pcre2callout</b></a>
-documentation for details). Numbered callouts are ignored by <b>pcre2grep</b>;
+documentation for details). Numbered callouts are ignored by <b>pcre2grep</b>;
only callouts with string arguments are useful.
</P>
<br><b>
@@ -892,10 +892,10 @@
If the callout string starts with a pipe (vertical bar) character, the rest of
the string is written to the output, having been passed through the same escape
processing as text from the --output option. This provides a simple echoing
-facility that avoids calling an external program or script. No terminator is
+facility that avoids calling an external program or script. No terminator is
added to the string, so if you want a newline, you must include it explicitly.
-Matching continues normally after the string is output. If you want to see only
-the callout output but not any output from an actual match, you should end the
+Matching continues normally after the string is output. If you want to see only
+the callout output but not any output from an actual match, you should end the
relevant pattern with (*FAIL).
</P>
<br><a name="SEC11" href="#TOC1">MATCHING ERRORS</a><br>
@@ -910,8 +910,8 @@
</P>
<P>
The <b>--match-limit</b> option of <b>pcre2grep</b> can be used to set the
-overall resource limit. There are also other limits that affect the amount of
-memory used during matching; see the discussion of <b>--heap-limit</b> and
+overall resource limit. There are also other limits that affect the amount of
+memory used during matching; see the discussion of <b>--heap-limit</b> and
<b>--depth-limit</b> above.
</P>
<br><a name="SEC12" href="#TOC1">DIAGNOSTICS</a><br>
Modified: code/trunk/doc/html/pcre2perform.html
===================================================================
--- code/trunk/doc/html/pcre2perform.html 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/pcre2perform.html 2017-07-19 16:04:15 UTC (rev 842)
@@ -29,7 +29,7 @@
<br><a name="SEC2" href="#TOC1">COMPILED PATTERN MEMORY USAGE</a><br>
<P>
Patterns are compiled by PCRE2 into a reasonably efficient interpretive code,
-so that most simple patterns do not use much memory for storing the compiled
+so that most simple patterns do not use much memory for storing the compiled
version. However, there is one case where the memory usage of a compiled
pattern can be unexpectedly large. If a parenthesized subpattern has a
quantifier with a minimum greater than 1 and/or a limited maximum, the whole
@@ -91,7 +91,7 @@
may also reduce the memory requirements.
</P>
<P>
-In contrast to <b>pcre2_match()</b>, <b>pcre2_dfa_match()</b> does use recursive
+In contrast to <b>pcre2_match()</b>, <b>pcre2_dfa_match()</b> does use recursive
function calls, but only for processing atomic groups, lookaround assertions,
and recursion within the pattern. Too much nested recursion may cause stack
issues. The "match depth" parameter can be used to limit the depth of function
@@ -184,7 +184,7 @@
</P>
<P>
In many cases, the solution to this kind of performance issue is to use an
-atomic group or a possessive quantifier. This can often reduce memory
+atomic group or a possessive quantifier. This can often reduce memory
requirements as well. As another example, consider this pattern:
<pre>
([^<]|<(?!inet))+
@@ -205,7 +205,7 @@
is used to stop any backtracking into the runs of non-"<" characters. This
version also uses a lot less memory because entry to a new set of parentheses
happens only when a "<" character that is not followed by "inet" is encountered
-(and we assume this is relatively rare).
+(and we assume this is relatively rare).
</P>
<P>
This example shows that one way of optimizing performance when matching long
@@ -216,10 +216,10 @@
SETTING RESOURCE LIMITS
</b><br>
<P>
-You can set limits on the amount of processing that takes place when matching,
+You can set limits on the amount of processing that takes place when matching,
and on the amount of heap memory that is used. The default values of the limits
are very large, and unlikely ever to operate. They can be changed when PCRE2 is
-built, and they can also be set when <b>pcre2_match()</b> or
+built, and they can also be set when <b>pcre2_match()</b> or
<b>pcre2_dfa_match()</b> is called. For details of these interfaces, see the
<a href="pcre2build.html"><b>pcre2build</b></a>
documentation and the section entitled
Modified: code/trunk/doc/html/pcre2syntax.html
===================================================================
--- code/trunk/doc/html/pcre2syntax.html 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/html/pcre2syntax.html 2017-07-19 16:04:15 UTC (rev 842)
@@ -430,11 +430,11 @@
(?i) caseless
(?J) allow duplicate names
(?m) multiline
- (?n) no auto capture
+ (?n) no auto capture
(?s) single line (dotall)
(?U) default ungreedy (lazy)
(?x) extended: ignore white space except in classes
- (?xx) as (?x) but also ignore space and tab in classes
+ (?xx) as (?x) but also ignore space and tab in classes
(?-...) unset option(s)
</pre>
The following are recognized only at the very start of a pattern or after one
Modified: code/trunk/doc/pcre2.3
===================================================================
--- code/trunk/doc/pcre2.3 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2.3 2017-07-19 16:04:15 UTC (rev 842)
@@ -130,7 +130,7 @@
.\" HREF
\fBpcre2api\fP
.\"
-page. There is a similar function called \fBpcre2_set_depth_limit()\fP that can
+page. There is a similar function called \fBpcre2_set_depth_limit()\fP that can
be used to restrict the amount of memory that is used.
.
.
Modified: code/trunk/doc/pcre2.txt
===================================================================
--- code/trunk/doc/pcre2.txt 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2.txt 2017-07-19 16:04:15 UTC (rev 842)
@@ -170,8 +170,8 @@
Last updated: 01 April 2017
Copyright (c) 1997-2017 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2API(3) Library Functions Manual PCRE2API(3)
@@ -3432,8 +3432,8 @@
Last updated: 10 July 2017
Copyright (c) 1997-2017 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2BUILD(3) Library Functions Manual PCRE2BUILD(3)
@@ -3487,10 +3487,10 @@
BUILDING 8-BIT, 16-BIT AND 32-BIT LIBRARIES
By default, a library called libpcre2-8 is built, containing functions
- that take string arguments contained in vectors of bytes, interpreted
+ that take string arguments contained in arrays of bytes, interpreted
either as single-byte characters, or UTF-8 strings. You can also build
two other libraries, called libpcre2-16 and libpcre2-32, which process
- strings that are contained in vectors of 16-bit and 32-bit code units,
+ strings that are contained in arrays of 16-bit and 32-bit code units,
respectively. These can be interpreted either as single-unit characters
or UTF-16/UTF-32 strings. To build these additional libraries, add one
or both of the following to the configure command:
@@ -3609,7 +3609,7 @@
--enable-newline-is-anycrlf
which causes PCRE2 to recognize any of the three sequences CR, LF, or
- CRLF as indicating a line ending. Finally, a fifth option, specified by
+ CRLF as indicating a line ending. A fifth option, specified by
--enable-newline-is-any
@@ -3617,45 +3617,50 @@
newline sequences are the three just mentioned, plus the single charac-
ters VT (vertical tab, U+000B), FF (form feed, U+000C), NEL (next line,
U+0085), LS (line separator, U+2028), and PS (paragraph separator,
- U+2029).
+ U+2029). The final option is
+ --enable-newline-is-nul
+
+ which causes NUL (binary zero) is set as the default line-ending char-
+ acter.
+
Whatever default line ending convention is selected when PCRE2 is built
- can be overridden by applications that use the library. At build time
- it is conventional to use the standard for your operating system.
+ can be overridden by applications that use the library. At build time
+ it is recommended to use the standard for your operating system.
WHAT \R MATCHES
- By default, the sequence \R in a pattern matches any Unicode newline
- sequence, independently of what has been selected as the line ending
+ By default, the sequence \R in a pattern matches any Unicode newline
+ sequence, independently of what has been selected as the line ending
sequence. If you specify
--enable-bsr-anycrlf
- the default is changed so that \R matches only CR, LF, or CRLF. What-
- ever is selected when PCRE2 is built can be overridden by applications
+ the default is changed so that \R matches only CR, LF, or CRLF. What-
+ ever is selected when PCRE2 is built can be overridden by applications
that use the library.
HANDLING VERY LARGE PATTERNS
- Within a compiled pattern, offset values are used to point from one
- part to another (for example, from an opening parenthesis to an alter-
- nation metacharacter). By default, in the 8-bit and 16-bit libraries,
- two-byte values are used for these offsets, leading to a maximum size
- for a compiled pattern of around 64K code units. This is sufficient to
+ Within a compiled pattern, offset values are used to point from one
+ part to another (for example, from an opening parenthesis to an alter-
+ nation metacharacter). By default, in the 8-bit and 16-bit libraries,
+ two-byte values are used for these offsets, leading to a maximum size
+ for a compiled pattern of around 64K code units. This is sufficient to
handle all but the most gigantic patterns. Nevertheless, some people do
- want to process truly enormous patterns, so it is possible to compile
- PCRE2 to use three-byte or four-byte offsets by adding a setting such
+ want to process truly enormous patterns, so it is possible to compile
+ PCRE2 to use three-byte or four-byte offsets by adding a setting such
as
--with-link-size=3
- to the configure command. The value given must be 2, 3, or 4. For the
- 16-bit library, a value of 3 is rounded up to 4. In these libraries,
- using longer offsets slows down the operation of PCRE2 because it has
- to load additional data when handling them. For the 32-bit library the
- value is always 4 and cannot be overridden; the value of --with-link-
+ to the configure command. The value given must be 2, 3, or 4. For the
+ 16-bit library, a value of 3 is rounded up to 4. In these libraries,
+ using longer offsets slows down the operation of PCRE2 because it has
+ to load additional data when handling them. For the 32-bit library the
+ value is always 4 and cannot be overridden; the value of --with-link-
size is ignored.
@@ -3662,54 +3667,55 @@
LIMITING PCRE2 RESOURCE USAGE
The pcre2_match() function increments a counter each time it goes round
- its main loop. Putting a limit on this counter controls the amount of
- computing resource used by a single call to pcre2_match(). The limit
+ its main loop. Putting a limit on this counter controls the amount of
+ computing resource used by a single call to pcre2_match(). The limit
can be changed at run time, as described in the pcre2api documentation.
- The default is 10 million, but this can be changed by adding a setting
+ The default is 10 million, but this can be changed by adding a setting
such as
--with-match-limit=500000
- to the configure command. This setting also applies to the
- pcre2_dfa_match() matching function, and to JIT matching (though the
+ to the configure command. This setting also applies to the
+ pcre2_dfa_match() matching function, and to JIT matching (though the
counting is done differently).
- The pcre2_match() function starts out using a 20K vector on the system
- stack to record backtracking points. The more nested backtracking
+ The pcre2_match() function starts out using a 20K vector on the system
+ stack to record backtracking points. The more nested backtracking
points there are (that is, the deeper the search tree), the more memory
- is needed. If the initial vector is not large enough, heap memory is
+ is needed. If the initial vector is not large enough, heap memory is
used, up to a certain limit, which is specified in kilobytes. The limit
can be changed at run time, as described in the pcre2api documentation.
- The default limit (in effect unlimited) is 20 million. You can change
+ The default limit (in effect unlimited) is 20 million. You can change
this by a setting such as
--with-heap-limit=500
- which limits the amount of heap to 500 kilobytes. This limit applies
- only to interpretive matching in pcre2_match(). It does not apply when
- JIT (which has its own memory arrangements) is used, nor does it apply
+ which limits the amount of heap to 500 kilobytes. This limit applies
+ only to interpretive matching in pcre2_match(). It does not apply when
+ JIT (which has its own memory arrangements) is used, nor does it apply
to pcre2_dfa_match().
- You can also explicitly limit the depth of nested backtracking in the
+ You can also explicitly limit the depth of nested backtracking in the
pcre2_match() interpreter. This limit defaults to the value that is set
- for --with-match-limit. You can set a lower default limit by adding,
+ for --with-match-limit. You can set a lower default limit by adding,
for example,
--with-match-limit_depth=10000
- to the configure command. This value can be overridden at run time.
- This depth limit indirectly limits the amount of heap memory that is
- used, but because the size of each backtracking "frame" depends on the
- number of capturing parentheses in a pattern, the amount of heap that
- is used before the limit is reached varies from pattern to pattern.
- This limit was more useful in versions before 10.30, where function
- recursion was used for backtracking. However, as well as applying to
- pcre2_match(), this limit also controls the depth of recursive function
- calls in pcre2_dfa_match(). These are used for lookaround assertions,
- atomic groups, and recursion within patterns. The limit does not apply
- to JIT matching.
+ to the configure command. This value can be overridden at run time.
+ This depth limit indirectly limits the amount of heap memory that is
+ used, but because the size of each backtracking "frame" depends on the
+ number of capturing parentheses in a pattern, the amount of heap that
+ is used before the limit is reached varies from pattern to pattern.
+ This limit was more useful in versions before 10.30, where function
+ recursion was used for backtracking.
+ As well as applying to pcre2_match(), the depth limit also controls the
+ depth of recursive function calls in pcre2_dfa_match(). These are used
+ for lookaround assertions, atomic groups, and recursion within pat-
+ terns. The limit does not apply to JIT matching.
+
CREATING CHARACTER TABLES AT BUILD TIME
PCRE2 uses fixed tables for processing characters whose code points are
@@ -3969,11 +3975,11 @@
REVISION
- Last updated: 17 June 2017
+ Last updated: 18 July 2017
Copyright (c) 1997-2017 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2CALLOUT(3) Library Functions Manual PCRE2CALLOUT(3)
@@ -4366,8 +4372,8 @@
Last updated: 14 April 2017
Copyright (c) 1997-2017 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2COMPAT(3) Library Functions Manual PCRE2COMPAT(3)
@@ -4564,8 +4570,8 @@
Last updated: 18 April 2017
Copyright (c) 1997-2017 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2JIT(3) Library Functions Manual PCRE2JIT(3)
@@ -4958,8 +4964,8 @@
Last updated: 31 March 2017
Copyright (c) 1997-2017 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2LIMITS(3) Library Functions Manual PCRE2LIMITS(3)
@@ -5029,8 +5035,8 @@
Last updated: 30 March 2017
Copyright (c) 1997-2017 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2MATCHING(3) Library Functions Manual PCRE2MATCHING(3)
@@ -5248,8 +5254,8 @@
Last updated: 29 September 2014
Copyright (c) 1997-2014 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2PARTIAL(3) Library Functions Manual PCRE2PARTIAL(3)
@@ -5688,8 +5694,8 @@
Last updated: 22 December 2014
Copyright (c) 1997-2014 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2PATTERN(3) Library Functions Manual PCRE2PATTERN(3)
@@ -8790,8 +8796,8 @@
Last updated: 05 July 2017
Copyright (c) 1997-2017 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2PERFORM(3) Library Functions Manual PCRE2PERFORM(3)
@@ -9018,8 +9024,8 @@
Last updated: 08 April 2017
Copyright (c) 1997-2017 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2POSIX(3) Library Functions Manual PCRE2POSIX(3)
@@ -9326,8 +9332,8 @@
Last updated: 15 June 2017
Copyright (c) 1997-2017 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2SAMPLE(3) Library Functions Manual PCRE2SAMPLE(3)
@@ -9595,8 +9601,8 @@
Last updated: 21 March 2017
Copyright (c) 1997-2017 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2SYNTAX(3) Library Functions Manual PCRE2SYNTAX(3)
@@ -10043,8 +10049,8 @@
Last updated: 17 June 2017
Copyright (c) 1997-2017 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2UNICODE(3) Library Functions Manual PCRE2UNICODE(3)
@@ -10300,5 +10306,5 @@
Last updated: 17 May 2017
Copyright (c) 1997-2017 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
Modified: code/trunk/doc/pcre2_code_free.3
===================================================================
--- code/trunk/doc/pcre2_code_free.3 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2_code_free.3 2017-07-19 16:04:15 UTC (rev 842)
@@ -14,8 +14,8 @@
.rs
.sp
This function frees the memory used for a compiled pattern, including any
-memory used by the JIT compiler. If the compiled pattern was created by a call
-to \fBpcre2_code_copy_with_tables()\fP, the memory for the character tables is
+memory used by the JIT compiler. If the compiled pattern was created by a call
+to \fBpcre2_code_copy_with_tables()\fP, the memory for the character tables is
also freed.
.P
There is a complete description of the PCRE2 native API in the
Modified: code/trunk/doc/pcre2_compile.3
===================================================================
--- code/trunk/doc/pcre2_compile.3 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2_compile.3 2017-07-19 16:04:15 UTC (rev 842)
@@ -52,7 +52,7 @@
PCRE2_ENDANCHORED Pattern can match only at end of subject
PCRE2_EXTENDED Ignore white space and # comments
PCRE2_FIRSTLINE Force matching to be before newline
- PCRE2_LITERAL Pattern characters are all literal
+ PCRE2_LITERAL Pattern characters are all literal
PCRE2_MATCH_UNSET_BACKREF Match unset back references
PCRE2_MULTILINE ^ and $ match newlines within data
PCRE2_NEVER_BACKSLASH_C Lock out the use of \eC in patterns
Modified: code/trunk/doc/pcre2_config.3
===================================================================
--- code/trunk/doc/pcre2_config.3 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2_config.3 2017-07-19 16:04:15 UTC (rev 842)
@@ -31,7 +31,7 @@
PCRE2_CONFIG_BSR Indicates what \eR matches by default:
PCRE2_BSR_UNICODE
PCRE2_BSR_ANYCRLF
- PCRE2_CONFIG_HEAPLIMIT Default heap memory limit
+ PCRE2_CONFIG_HEAPLIMIT Default heap memory limit
PCRE2_CONFIG_DEPTHLIMIT Default backtracking depth limit
.\" JOIN
PCRE2_CONFIG_JIT Availability of just-in-time compiler
@@ -47,7 +47,7 @@
PCRE2_NEWLINE_CRLF
PCRE2_NEWLINE_ANY
PCRE2_NEWLINE_ANYCRLF
- PCRE2_NEWLINE_NUL
+ PCRE2_NEWLINE_NUL
PCRE2_CONFIG_PARENSLIMIT Default parentheses nesting limit
PCRE2_CONFIG_RECURSIONLIMIT Obsolete: use PCRE2_CONFIG_DEPTHLIMIT
PCRE2_CONFIG_STACKRECURSE Obsolete: always returns 0
Modified: code/trunk/doc/pcre2_converted_pattern_free.3
===================================================================
--- code/trunk/doc/pcre2_converted_pattern_free.3 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2_converted_pattern_free.3 2017-07-19 16:04:15 UTC (rev 842)
@@ -14,8 +14,8 @@
.rs
.sp
This function is part of an experimental set of pattern conversion functions.
-It frees the memory occupied by a converted pattern that was obtained by
-calling \fBpcre2_pattern_convert()\fP with arguments that caused it to place
+It frees the memory occupied by a converted pattern that was obtained by
+calling \fBpcre2_pattern_convert()\fP with arguments that caused it to place
the converted pattern into newly obtained heap memory.
.P
The pattern conversion functions are described in the
Modified: code/trunk/doc/pcre2_dfa_match.3
===================================================================
--- code/trunk/doc/pcre2_dfa_match.3 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2_dfa_match.3 2017-07-19 16:04:15 UTC (rev 842)
@@ -43,17 +43,17 @@
PCRE2_NOTBOL Subject is not the beginning of a line
PCRE2_NOTEOL Subject is not the end of a line
PCRE2_NOTEMPTY An empty string is not a valid match
-.\" JOIN
+.\" JOIN
PCRE2_NOTEMPTY_ATSTART An empty string at the start of the subject
is not a valid match
-.\" JOIN
+.\" JOIN
PCRE2_NO_UTF_CHECK Do not check the subject for UTF
validity (only relevant if PCRE2_UTF
was set at compile time)
-.\" JOIN
+.\" JOIN
PCRE2_PARTIAL_HARD Return PCRE2_ERROR_PARTIAL for a partial
match even if there is a full match
-.\" JOIN
+.\" JOIN
PCRE2_PARTIAL_SOFT Return PCRE2_ERROR_PARTIAL for a partial
match if no full matches are found
PCRE2_DFA_RESTART Restart after a partial match
Modified: code/trunk/doc/pcre2_maketables.3
===================================================================
--- code/trunk/doc/pcre2_maketables.3 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2_maketables.3 2017-07-19 16:04:15 UTC (rev 842)
@@ -12,7 +12,7 @@
.SH DESCRIPTION
.rs
.sp
-This function builds a set of character tables for character code points that
+This function builds a set of character tables for character code points that
are less than 256. These can be passed to \fBpcre2_compile()\fP in a compile
context in order to override the internal, built-in tables (which were either
defaulted or made by \fBpcre2_maketables()\fP when PCRE2 was compiled). See the
Modified: code/trunk/doc/pcre2_match.3
===================================================================
--- code/trunk/doc/pcre2_match.3 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2_match.3 2017-07-19 16:04:15 UTC (rev 842)
@@ -31,14 +31,14 @@
A match context is needed only if you want to:
.sp
Set up a callout function
- Set a matching offset limit
- Change the heap memory limit
- Change the backtracking match limit
+ Set a matching offset limit
+ Change the heap memory limit
+ Change the backtracking match limit
Change the backtracking depth limit
Set custom memory management specifically for the match
.sp
The \fIlength\fP and \fIstartoffset\fP values are code
-units, not characters. The length may be given as PCRE2_ZERO_TERMINATE for a
+units, not characters. The length may be given as PCRE2_ZERO_TERMINATE for a
subject that is terminated by a binary zero code unit. The options are:
.sp
PCRE2_ANCHORED Match only at the first position
@@ -49,7 +49,7 @@
.\" JOIN
PCRE2_NOTEMPTY_ATSTART An empty string at the start of the subject
is not a valid match
- PCRE2_NO_JIT Do not use JIT matching
+ PCRE2_NO_JIT Do not use JIT matching
.\" JOIN
PCRE2_NO_UTF_CHECK Do not check the subject for UTF
validity (only relevant if PCRE2_UTF
Modified: code/trunk/doc/pcre2_pattern_info.3
===================================================================
--- code/trunk/doc/pcre2_pattern_info.3 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2_pattern_info.3 2017-07-19 16:04:15 UTC (rev 842)
@@ -38,7 +38,7 @@
1 first code unit is set
2 start of string or after newline
PCRE2_INFO_FIRSTCODEUNIT First code unit when type is 1
- PCRE2_INFO_FRAMESIZE Size of backtracking frame
+ PCRE2_INFO_FRAMESIZE Size of backtracking frame
PCRE2_INFO_HASBACKSLASHC Return 1 if pattern contains \eC
.\" JOIN
PCRE2_INFO_HASCRORLF Return 1 if explicit CR or LF matches
@@ -71,7 +71,7 @@
PCRE2_NEWLINE_CRLF
PCRE2_NEWLINE_ANY
PCRE2_NEWLINE_ANYCRLF
- PCRE2_NEWLINE_NUL
+ PCRE2_NEWLINE_NUL
PCRE2_INFO_RECURSIONLIMIT Obsolete synonym for PCRE2_INFO_DEPTHLIMIT
PCRE2_INFO_SIZE Size of compiled pattern
.sp
Modified: code/trunk/doc/pcre2_set_newline.3
===================================================================
--- code/trunk/doc/pcre2_set_newline.3 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2_set_newline.3 2017-07-19 16:04:15 UTC (rev 842)
@@ -23,7 +23,7 @@
PCRE2_NEWLINE_CRLF CR followed by LF only
PCRE2_NEWLINE_ANYCRLF Any of the above
PCRE2_NEWLINE_ANY Any Unicode newline sequence
- PCRE2_NEWLINE_NUL The NUL character (binary zero)
+ PCRE2_NEWLINE_NUL The NUL character (binary zero)
.sp
The result is zero for success or PCRE2_ERROR_BADDATA if the second argument is
invalid.
Modified: code/trunk/doc/pcre2_set_recursion_limit.3
===================================================================
--- code/trunk/doc/pcre2_set_recursion_limit.3 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2_set_recursion_limit.3 2017-07-19 16:04:15 UTC (rev 842)
@@ -14,7 +14,7 @@
.SH DESCRIPTION
.rs
.sp
-This function is obsolete and should not be used in new code. Use
+This function is obsolete and should not be used in new code. Use
\fBpcre2_set_depth_limit()\fP instead.
.P
There is a complete description of the PCRE2 native API in the
Modified: code/trunk/doc/pcre2_substitute.3
===================================================================
--- code/trunk/doc/pcre2_substitute.3 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2_substitute.3 2017-07-19 16:04:15 UTC (rev 842)
@@ -48,7 +48,7 @@
The \fIlength\fP, \fIstartoffset\fP and \fIrlength\fP values are code
units, not characters, as is the contents of the variable pointed at by
\fIoutlengthptr\fP, which is updated to the actual length of the new string.
-The subject and replacement lengths can be given as PCRE2_ZERO_TERMINATED for
+The subject and replacement lengths can be given as PCRE2_ZERO_TERMINATED for
zero-terminated strings. The options are:
.sp
PCRE2_ANCHORED Match only at the first position
Modified: code/trunk/doc/pcre2build.3
===================================================================
--- code/trunk/doc/pcre2build.3 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2build.3 2017-07-19 16:04:15 UTC (rev 842)
@@ -1,4 +1,4 @@
-.TH PCRE2BUILD 3 "17 June 2017" "PCRE2 10.30"
+.TH PCRE2BUILD 3 "18 July 2017" "PCRE2 10.30"
.SH NAME
PCRE2 - Perl-compatible regular expressions (revised API)
.
@@ -66,10 +66,10 @@
.rs
.sp
By default, a library called \fBlibpcre2-8\fP is built, containing functions
-that take string arguments contained in vectors of bytes, interpreted either as
+that take string arguments contained in arrays of bytes, interpreted either as
single-byte characters, or UTF-8 strings. You can also build two other
libraries, called \fBlibpcre2-16\fP and \fBlibpcre2-32\fP, which process
-strings that are contained in vectors of 16-bit and 32-bit code units,
+strings that are contained in arrays of 16-bit and 32-bit code units,
respectively. These can be interpreted either as single-unit characters or
UTF-16/UTF-32 strings. To build these additional libraries, add one or both of
the following to the \fBconfigure\fP command:
@@ -197,7 +197,7 @@
--enable-newline-is-anycrlf
.sp
which causes PCRE2 to recognize any of the three sequences CR, LF, or CRLF as
-indicating a line ending. Finally, a fifth option, specified by
+indicating a line ending. A fifth option, specified by
.sp
--enable-newline-is-any
.sp
@@ -204,11 +204,15 @@
causes PCRE2 to recognize any Unicode newline sequence. The Unicode newline
sequences are the three just mentioned, plus the single characters VT (vertical
tab, U+000B), FF (form feed, U+000C), NEL (next line, U+0085), LS (line
-separator, U+2028), and PS (paragraph separator, U+2029).
+separator, U+2028), and PS (paragraph separator, U+2029). The final option is
+.sp
+ --enable-newline-is-nul
+.sp
+which causes NUL (binary zero) is set as the default line-ending character.
.P
Whatever default line ending convention is selected when PCRE2 is built can be
overridden by applications that use the library. At build time it is
-conventional to use the standard for your operating system.
+recommended to use the standard for your operating system.
.
.
.SH "WHAT \eR MATCHES"
@@ -297,7 +301,8 @@
capturing parentheses in a pattern, the amount of heap that is used before the
limit is reached varies from pattern to pattern. This limit was more useful in
versions before 10.30, where function recursion was used for backtracking.
-However, as well as applying to \fBpcre2_match()\fP, this limit also controls
+.P
+As well as applying to \fBpcre2_match()\fP, the depth limit also controls
the depth of recursive function calls in \fBpcre2_dfa_match()\fP. These are
used for lookaround assertions, atomic groups, and recursion within patterns.
The limit does not apply to JIT matching.
@@ -577,6 +582,6 @@
.rs
.sp
.nf
-Last updated: 17 June 2017
+Last updated: 18 July 2017
Copyright (c) 1997-2017 University of Cambridge.
.fi
Modified: code/trunk/doc/pcre2compat.3
===================================================================
--- code/trunk/doc/pcre2compat.3 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2compat.3 2017-07-19 16:04:15 UTC (rev 842)
@@ -71,7 +71,7 @@
.P
8. Subroutine calls (whether recursive or not) were treated as atomic groups up
to PCRE2 release 10.23, but from release 10.30 this changed, and backtracking
-into subroutine calls is now supported, as in Perl.
+into subroutine calls is now supported, as in Perl.
.P
9. If any of the backtracking control verbs are used in a subpattern that is
called as a subroutine (whether or not recursively), their effect is confined
Modified: code/trunk/doc/pcre2grep.1
===================================================================
--- code/trunk/doc/pcre2grep.1 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2grep.1 2017-07-19 16:04:15 UTC (rev 842)
@@ -446,18 +446,18 @@
The \fB--match-limit\fP option provides a means of limiting computing resource
usage when processing patterns that are not going to match, but which have a
very large number of possibilities in their search trees. The classic example
-is a pattern that uses nested unlimited repeats. Internally, PCRE2 has a
-counter that is incremented each time around its main processing loop. If the
+is a pattern that uses nested unlimited repeats. Internally, PCRE2 has a
+counter that is incremented each time around its main processing loop. If the
value set by \fB--match-limit\fP is reached, an error occurs.
.sp
The \fB--heap-limit\fP option specifies, as a number of kilobytes, the amount
of heap memory that may be used for matching. Heap memory is needed only if
matching the pattern requires a significant number of nested backtracking
-points to be remembered. This parameter can be set to zero to forbid the use of
+points to be remembered. This parameter can be set to zero to forbid the use of
heap memory altogether.
.sp
The \fB--depth-limit\fP option limits the depth of nested backtracking points,
-which indirectly limits the amount of memory that is used. The amount of memory
+which indirectly limits the amount of memory that is used. The amount of memory
needed for each backtracking point depends on the number of capturing
parentheses in the pattern, so the amount of memory that is used before this
limit acts varies from pattern to pattern. This limit is of use only if it is
@@ -464,7 +464,7 @@
set smaller than \fB--match-limit\fP.
.sp
There are no short forms for these options. The default settings are specified
-when the PCRE2 library is compiled, with the default defaults being very large
+when the PCRE2 library is compiled, with the default defaults being very large
and so effectively unlimited.
.TP
\fB--max-buffer-size=\fInumber\fP
@@ -747,7 +747,7 @@
.\" HREF
\fBpcre2callout\fP
.\"
-documentation for details). Numbered callouts are ignored by \fBpcre2grep\fP;
+documentation for details). Numbered callouts are ignored by \fBpcre2grep\fP;
only callouts with string arguments are useful.
.
.
@@ -797,10 +797,10 @@
If the callout string starts with a pipe (vertical bar) character, the rest of
the string is written to the output, having been passed through the same escape
processing as text from the --output option. This provides a simple echoing
-facility that avoids calling an external program or script. No terminator is
+facility that avoids calling an external program or script. No terminator is
added to the string, so if you want a newline, you must include it explicitly.
-Matching continues normally after the string is output. If you want to see only
-the callout output but not any output from an actual match, you should end the
+Matching continues normally after the string is output. If you want to see only
+the callout output but not any output from an actual match, you should end the
relevant pattern with (*FAIL).
.
.
@@ -816,8 +816,8 @@
there are more than 20 such errors, \fBpcre2grep\fP gives up.
.P
The \fB--match-limit\fP option of \fBpcre2grep\fP can be used to set the
-overall resource limit. There are also other limits that affect the amount of
-memory used during matching; see the discussion of \fB--heap-limit\fP and
+overall resource limit. There are also other limits that affect the amount of
+memory used during matching; see the discussion of \fB--heap-limit\fP and
\fB--depth-limit\fP above.
.
.
Modified: code/trunk/doc/pcre2perform.3
===================================================================
--- code/trunk/doc/pcre2perform.3 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2perform.3 2017-07-19 16:04:15 UTC (rev 842)
@@ -12,7 +12,7 @@
.rs
.sp
Patterns are compiled by PCRE2 into a reasonably efficient interpretive code,
-so that most simple patterns do not use much memory for storing the compiled
+so that most simple patterns do not use much memory for storing the compiled
version. However, there is one case where the memory usage of a compiled
pattern can be unexpectedly large. If a parenthesized subpattern has a
quantifier with a minimum greater than 1 and/or a limited maximum, the whole
@@ -76,7 +76,7 @@
vector is used. Rewriting patterns to be time-efficient, as described below,
may also reduce the memory requirements.
.P
-In contrast to \fBpcre2_match()\fP, \fBpcre2_dfa_match()\fP does use recursive
+In contrast to \fBpcre2_match()\fP, \fBpcre2_dfa_match()\fP does use recursive
function calls, but only for processing atomic groups, lookaround assertions,
and recursion within the pattern. Too much nested recursion may cause stack
issues. The "match depth" parameter can be used to limit the depth of function
@@ -163,7 +163,7 @@
appreciable time with strings longer than about 20 characters.
.P
In many cases, the solution to this kind of performance issue is to use an
-atomic group or a possessive quantifier. This can often reduce memory
+atomic group or a possessive quantifier. This can often reduce memory
requirements as well. As another example, consider this pattern:
.sp
([^<]|<(?!inet))+
@@ -184,7 +184,7 @@
is used to stop any backtracking into the runs of non-"<" characters. This
version also uses a lot less memory because entry to a new set of parentheses
happens only when a "<" character that is not followed by "inet" is encountered
-(and we assume this is relatively rare).
+(and we assume this is relatively rare).
.P
This example shows that one way of optimizing performance when matching long
subject strings is to write repeated parenthesized subpatterns to match more
@@ -194,10 +194,10 @@
.SS "SETTING RESOURCE LIMITS"
.rs
.sp
-You can set limits on the amount of processing that takes place when matching,
+You can set limits on the amount of processing that takes place when matching,
and on the amount of heap memory that is used. The default values of the limits
are very large, and unlikely ever to operate. They can be changed when PCRE2 is
-built, and they can also be set when \fBpcre2_match()\fP or
+built, and they can also be set when \fBpcre2_match()\fP or
\fBpcre2_dfa_match()\fP is called. For details of these interfaces, see the
.\" HREF
\fBpcre2build\fP
Modified: code/trunk/doc/pcre2syntax.3
===================================================================
--- code/trunk/doc/pcre2syntax.3 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/doc/pcre2syntax.3 2017-07-19 16:04:15 UTC (rev 842)
@@ -407,11 +407,11 @@
(?i) caseless
(?J) allow duplicate names
(?m) multiline
- (?n) no auto capture
+ (?n) no auto capture
(?s) single line (dotall)
(?U) default ungreedy (lazy)
(?x) extended: ignore white space except in classes
- (?xx) as (?x) but also ignore space and tab in classes
+ (?xx) as (?x) but also ignore space and tab in classes
(?-...) unset option(s)
.sp
The following are recognized only at the very start of a pattern or after one
Modified: code/trunk/perltest.sh
===================================================================
--- code/trunk/perltest.sh 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/perltest.sh 2017-07-19 16:04:15 UTC (rev 842)
@@ -50,7 +50,7 @@
# ucp sets Perl's /u modifier
# utf invoke UTF-8 functionality
#
-# The data lines must not have any pcre2test modifiers. Unless
+# The data lines must not have any pcre2test modifiers. Unless
# "subject_litersl" is on the pattern, data lines are processed as
# Perl double-quoted strings, so if they contain " $ or @ characters, these
# have to be escaped. For this reason, all such characters in the
@@ -141,21 +141,21 @@
chomp($pattern);
$pattern =~ s/\s+$//;
-
+
# Split the pattern from the modifiers and adjust them as necessary.
$pattern =~ /^\s*((.).*\2)(.*)$/s;
$pat = $1;
$mod = $3;
-
+
# The private "aftertext" modifier means "print $' afterwards".
$showrest = ($mod =~ s/aftertext,?//);
-
+
# The "subject_literal" modifer disables escapes in subjects.
-
- $subject_literal = ($mod =~ s/subject_literal,?//);
+ $subject_literal = ($mod =~ s/subject_literal,?//);
+
# "allaftertext" is used by pcre2test to print remainders after captures
$mod =~ s/allaftertext,?//;
@@ -238,7 +238,7 @@
$x = $_;
}
else
- {
+ {
$x = eval "\"$_\""; # To get escapes processed
}
Modified: code/trunk/src/config.h.generic
===================================================================
--- code/trunk/src/config.h.generic 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/src/config.h.generic 2017-07-19 16:04:15 UTC (rev 842)
@@ -132,6 +132,12 @@
/* Define to 1 if you have the <zlib.h> header file. */
/* #undef HAVE_ZLIB_H */
+/* This limits the amount of memory that pcre2_match() may use while matching
+ a pattern. The value is in kilobytes. */
+#ifndef HEAP_LIMIT
+#define HEAP_LIMIT 20000000
+#endif
+
/* The value of LINK_SIZE determines the number of bytes used to store links
as offsets within the compiled regex. The default is 2, which allows for
compiled patterns up to 64K long. This covers the vast majority of cases.
@@ -148,7 +154,7 @@
#endif
/* The value of MATCH_LIMIT determines the default number of times the
- internal match() function can record a backtrack position during a single
+ pcre2_match() function can record a backtrack position during a single
matching attempt. There is a runtime interface for setting a different
limit. The limit exists in order to catch runaway regular expressions that
take for ever to determine that they do not match. The default is set very
@@ -188,8 +194,8 @@
/* The value of NEWLINE_DEFAULT determines the default newline character
sequence. PCRE2 client programs can override this by selecting other values
- at run time. The valid values are 1 (CR), 2 (LF), 3 (CRLF), 4 (ANY), and 5
- (ANYCRLF). */
+ at run time. The valid values are 1 (CR), 2 (LF), 3 (CRLF), 4 (ANY), 5
+ (ANYCRLF), and 6 (NUL). */
#ifndef NEWLINE_DEFAULT
#define NEWLINE_DEFAULT 2
#endif
@@ -204,7 +210,7 @@
#define PACKAGE_NAME "PCRE2"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PCRE2 10.30-DEV"
+#define PACKAGE_STRING "PCRE2 10.30-RC1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "pcre2"
@@ -213,7 +219,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "10.30-DEV"
+#define PACKAGE_VERSION "10.30-RC1"
/* 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
@@ -261,6 +267,11 @@
your system. */
/* #undef PTHREAD_CREATE_JOINABLE */
+/* Define to any non-zero number to enable support for SELinux compatible
+ executable memory allocator in JIT. Note that this will have no effect
+ unless SUPPORT_JIT is also defined. */
+/* #undef SLJIT_PROT_EXECUTABLE_ALLOCATOR */
+
/* Define to 1 if you have the ANSI C header files. */
/* #undef STDC_HEADERS */
@@ -328,7 +339,7 @@
#endif
/* Version number of package */
-#define VERSION "10.30-DEV"
+#define VERSION "10.30-RC1"
/* Define to 1 if on MINIX. */
/* #undef _MINIX */
Modified: code/trunk/src/pcre2.h
===================================================================
--- code/trunk/src/pcre2.h 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/src/pcre2.h 2017-07-19 16:04:15 UTC (rev 842)
@@ -43,8 +43,8 @@
#define PCRE2_MAJOR 10
#define PCRE2_MINOR 30
-#define PCRE2_PRERELEASE -DEV
-#define PCRE2_DATE 2017-03-05
+#define PCRE2_PRERELEASE -RC1
+#define PCRE2_DATE 2017-07-18
/* 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 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/src/pcre2.h.generic 2017-07-19 16:04:15 UTC (rev 842)
@@ -43,8 +43,8 @@
#define PCRE2_MAJOR 10
#define PCRE2_MINOR 30
-#define PCRE2_PRERELEASE -DEV
-#define PCRE2_DATE 2017-03-05
+#define PCRE2_PRERELEASE -RC1
+#define PCRE2_DATE 2017-07-18
/* 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
@@ -138,7 +138,15 @@
#define PCRE2_ALT_VERBNAMES 0x00400000u /* C */
#define PCRE2_USE_OFFSET_LIMIT 0x00800000u /* J M D */
#define PCRE2_EXTENDED_MORE 0x01000000u /* C */
+#define PCRE2_LITERAL 0x02000000u /* C */
+/* An additional compile options word is available in the compile context. */
+
+#define PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES 0x00000001u /* C */
+#define PCRE2_EXTRA_BAD_ESCAPE_IS_LITERAL 0x00000002u /* C */
+#define PCRE2_EXTRA_MATCH_WORD 0x00000004u /* C */
+#define PCRE2_EXTRA_MATCH_LINE 0x00000008u /* C */
+
/* These are for pcre2_jit_compile(). */
#define PCRE2_JIT_COMPLETE 0x00000001u /* For full matching */
@@ -176,6 +184,16 @@
#define PCRE2_NO_JIT 0x00002000u
+/* Options for pcre2_pattern_convert(). */
+
+#define PCRE2_CONVERT_UTF 0x00000001u
+#define PCRE2_CONVERT_NO_UTF_CHECK 0x00000002u
+#define PCRE2_CONVERT_POSIX_BASIC 0x00000004u
+#define PCRE2_CONVERT_POSIX_EXTENDED 0x00000008u
+#define PCRE2_CONVERT_GLOB 0x00000010u
+#define PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR 0x00000030u
+#define PCRE2_CONVERT_GLOB_NO_STARSTAR 0x00000050u
+
/* Newline and \R settings, for use in compile contexts. The newline values
must be kept in step with values set in config.h and both sets must all be
greater than zero. */
@@ -185,6 +203,7 @@
#define PCRE2_NEWLINE_CRLF 3
#define PCRE2_NEWLINE_ANY 4
#define PCRE2_NEWLINE_ANYCRLF 5
+#define PCRE2_NEWLINE_NUL 6
#define PCRE2_BSR_UNICODE 1
#define PCRE2_BSR_ANYCRLF 2
@@ -270,7 +289,9 @@
#define PCRE2_ERROR_TOOMANYREPLACE (-61)
#define PCRE2_ERROR_BADSERIALIZEDDATA (-62)
#define PCRE2_ERROR_HEAPLIMIT (-63)
+#define PCRE2_ERROR_CONVERT_SYNTAX (-64)
+
/* Request types for pcre2_pattern_info() */
#define PCRE2_INFO_ALLOPTIONS 0
@@ -351,6 +372,9 @@
struct pcre2_real_match_context; \
typedef struct pcre2_real_match_context pcre2_match_context; \
\
+struct pcre2_real_convert_context; \
+typedef struct pcre2_real_convert_context pcre2_convert_context; \
+\
struct pcre2_real_code; \
typedef struct pcre2_real_code pcre2_code; \
\
@@ -435,6 +459,8 @@
PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
pcre2_set_character_tables(pcre2_compile_context *, const unsigned char *); \
PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+ pcre2_set_compile_extra_options(pcre2_compile_context *, uint32_t); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
pcre2_set_max_pattern_length(pcre2_compile_context *, PCRE2_SIZE); \
PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
pcre2_set_newline(pcre2_compile_context *, uint32_t); \
@@ -466,7 +492,19 @@
pcre2_set_recursion_memory_management(pcre2_match_context *, \
void *(*)(PCRE2_SIZE, void *), void (*)(void *, void *), void *);
+#define PCRE2_CONVERT_CONTEXT_FUNCTIONS \
+PCRE2_EXP_DECL pcre2_convert_context PCRE2_CALL_CONVENTION \
+ *pcre2_convert_context_copy(pcre2_convert_context *); \
+PCRE2_EXP_DECL pcre2_convert_context PCRE2_CALL_CONVENTION \
+ *pcre2_convert_context_create(pcre2_general_context *); \
+PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
+ pcre2_convert_context_free(pcre2_convert_context *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+ pcre2_set_glob_escape(pcre2_convert_context *, uint32_t); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+ pcre2_set_glob_separator(pcre2_convert_context *, uint32_t);
+
/* Functions concerned with compiling a pattern to PCRE internal code. */
#define PCRE2_COMPILE_FUNCTIONS \
@@ -572,6 +610,16 @@
PCRE2_SIZE, PCRE2_UCHAR *, PCRE2_SIZE *);
+/* Functions for converting pattern source strings. */
+
+#define PCRE2_CONVERT_FUNCTIONS \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+ pcre2_pattern_convert(PCRE2_SPTR, PCRE2_SIZE, uint32_t, PCRE2_UCHAR **, \
+ PCRE2_SIZE *, pcre2_convert_context *); \
+PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
+ pcre2_converted_pattern_free(PCRE2_UCHAR *);
+
+
/* Functions for JIT processing */
#define PCRE2_JIT_FUNCTIONS \
@@ -623,6 +671,7 @@
#define pcre2_real_code PCRE2_SUFFIX(pcre2_real_code_)
#define pcre2_real_general_context PCRE2_SUFFIX(pcre2_real_general_context_)
#define pcre2_real_compile_context PCRE2_SUFFIX(pcre2_real_compile_context_)
+#define pcre2_real_convert_context PCRE2_SUFFIX(pcre2_real_convert_context_)
#define pcre2_real_match_context PCRE2_SUFFIX(pcre2_real_match_context_)
#define pcre2_real_jit_stack PCRE2_SUFFIX(pcre2_real_jit_stack_)
#define pcre2_real_match_data PCRE2_SUFFIX(pcre2_real_match_data_)
@@ -634,6 +683,7 @@
#define pcre2_callout_enumerate_block PCRE2_SUFFIX(pcre2_callout_enumerate_block_)
#define pcre2_general_context PCRE2_SUFFIX(pcre2_general_context_)
#define pcre2_compile_context PCRE2_SUFFIX(pcre2_compile_context_)
+#define pcre2_convert_context PCRE2_SUFFIX(pcre2_convert_context_)
#define pcre2_match_context PCRE2_SUFFIX(pcre2_match_context_)
#define pcre2_match_data PCRE2_SUFFIX(pcre2_match_data_)
@@ -649,6 +699,10 @@
#define pcre2_compile_context_create PCRE2_SUFFIX(pcre2_compile_context_create_)
#define pcre2_compile_context_free PCRE2_SUFFIX(pcre2_compile_context_free_)
#define pcre2_config PCRE2_SUFFIX(pcre2_config_)
+#define pcre2_convert_context_copy PCRE2_SUFFIX(pcre2_convert_context_copy_)
+#define pcre2_convert_context_create PCRE2_SUFFIX(pcre2_convert_context_create_)
+#define pcre2_convert_context_free PCRE2_SUFFIX(pcre2_convert_context_free_)
+#define pcre2_converted_pattern_free PCRE2_SUFFIX(pcre2_converted_pattern_free_)
#define pcre2_dfa_match PCRE2_SUFFIX(pcre2_dfa_match_)
#define pcre2_general_context_copy PCRE2_SUFFIX(pcre2_general_context_copy_)
#define pcre2_general_context_create PCRE2_SUFFIX(pcre2_general_context_create_)
@@ -672,6 +726,7 @@
#define pcre2_match_data_create PCRE2_SUFFIX(pcre2_match_data_create_)
#define pcre2_match_data_create_from_pattern PCRE2_SUFFIX(pcre2_match_data_create_from_pattern_)
#define pcre2_match_data_free PCRE2_SUFFIX(pcre2_match_data_free_)
+#define pcre2_pattern_convert PCRE2_SUFFIX(pcre2_pattern_convert_)
#define pcre2_pattern_info PCRE2_SUFFIX(pcre2_pattern_info_)
#define pcre2_serialize_decode PCRE2_SUFFIX(pcre2_serialize_decode_)
#define pcre2_serialize_encode PCRE2_SUFFIX(pcre2_serialize_encode_)
@@ -680,8 +735,11 @@
#define pcre2_set_bsr PCRE2_SUFFIX(pcre2_set_bsr_)
#define pcre2_set_callout PCRE2_SUFFIX(pcre2_set_callout_)
#define pcre2_set_character_tables PCRE2_SUFFIX(pcre2_set_character_tables_)
+#define pcre2_set_compile_extra_options PCRE2_SUFFIX(pcre2_set_compile_extra_options_)
#define pcre2_set_compile_recursion_guard PCRE2_SUFFIX(pcre2_set_compile_recursion_guard_)
#define pcre2_set_depth_limit PCRE2_SUFFIX(pcre2_set_depth_limit_)
+#define pcre2_set_glob_escape PCRE2_SUFFIX(pcre2_set_glob_escape_)
+#define pcre2_set_glob_separator PCRE2_SUFFIX(pcre2_set_glob_separator_)
#define pcre2_set_heap_limit PCRE2_SUFFIX(pcre2_set_heap_limit_)
#define pcre2_set_match_limit PCRE2_SUFFIX(pcre2_set_match_limit_)
#define pcre2_set_max_pattern_length PCRE2_SUFFIX(pcre2_set_max_pattern_length_)
@@ -716,6 +774,8 @@
PCRE2_GENERAL_INFO_FUNCTIONS \
PCRE2_GENERAL_CONTEXT_FUNCTIONS \
PCRE2_COMPILE_CONTEXT_FUNCTIONS \
+PCRE2_CONVERT_CONTEXT_FUNCTIONS \
+PCRE2_CONVERT_FUNCTIONS \
PCRE2_MATCH_CONTEXT_FUNCTIONS \
PCRE2_COMPILE_FUNCTIONS \
PCRE2_PATTERN_INFO_FUNCTIONS \
@@ -745,6 +805,7 @@
#undef PCRE2_GENERAL_INFO_FUNCTIONS
#undef PCRE2_GENERAL_CONTEXT_FUNCTIONS
#undef PCRE2_COMPILE_CONTEXT_FUNCTIONS
+#undef PCRE2_CONVERT_CONTEXT_FUNCTIONS
#undef PCRE2_MATCH_CONTEXT_FUNCTIONS
#undef PCRE2_COMPILE_FUNCTIONS
#undef PCRE2_PATTERN_INFO_FUNCTIONS
Modified: code/trunk/src/pcre2_config.c
===================================================================
--- code/trunk/src/pcre2_config.c 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/src/pcre2_config.c 2017-07-19 16:04:15 UTC (rev 842)
@@ -84,7 +84,7 @@
return PCRE2_ERROR_BADOPTION;
case PCRE2_CONFIG_BSR:
- case PCRE2_CONFIG_HEAPLIMIT:
+ case PCRE2_CONFIG_HEAPLIMIT:
case PCRE2_CONFIG_JIT:
case PCRE2_CONFIG_LINKSIZE:
case PCRE2_CONFIG_MATCHLIMIT:
@@ -151,7 +151,7 @@
case PCRE2_CONFIG_DEPTHLIMIT:
*((uint32_t *)where) = MATCH_LIMIT_DEPTH;
break;
-
+
case PCRE2_CONFIG_NEWLINE:
*((uint32_t *)where) = NEWLINE_DEFAULT;
break;
@@ -160,7 +160,7 @@
*((uint32_t *)where) = PARENS_NEST_LIMIT;
break;
- /* This is now obsolete. The stack is no longer used via recursion for
+ /* This is now obsolete. The stack is no longer used via recursion for
handling backtracking in pcre2_match(). */
case PCRE2_CONFIG_STACKRECURSE:
Modified: code/trunk/src/pcre2_context.c
===================================================================
--- code/trunk/src/pcre2_context.c 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/src/pcre2_context.c 2017-07-19 16:04:15 UTC (rev 842)
@@ -198,7 +198,7 @@
CHAR_BACKSLASH, /* Default path separator */
CHAR_GRAVE_ACCENT /* Default escape character */
#else /* Not Windows */
- CHAR_SLASH, /* Default path separator */
+ CHAR_SLASH, /* Default path separator */
CHAR_BACKSLASH /* Default escape character */
#endif
};
@@ -359,7 +359,7 @@
case PCRE2_NEWLINE_CRLF:
case PCRE2_NEWLINE_ANY:
case PCRE2_NEWLINE_ANYCRLF:
- case PCRE2_NEWLINE_NUL:
+ case PCRE2_NEWLINE_NUL:
ccontext->newline_convention = newline;
return 0;
Modified: code/trunk/src/pcre2_error.c
===================================================================
--- code/trunk/src/pcre2_error.c 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/src/pcre2_error.c 2017-07-19 16:04:15 UTC (rev 842)
@@ -177,7 +177,7 @@
/* 90 */
"internal error: bad code value in parsed_skip()\0"
"PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES is not allowed in UTF-16 mode\0"
- "invalid option bits with PCRE2_LITERAL\0"
+ "invalid option bits with PCRE2_LITERAL\0"
;
/* Match-time and UTF error texts are in the same format. */
Modified: code/trunk/src/pcre2_internal.h
===================================================================
--- code/trunk/src/pcre2_internal.h 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/src/pcre2_internal.h 2017-07-19 16:04:15 UTC (rev 842)
@@ -240,7 +240,7 @@
#define COMPILE_ERROR_BASE 100
-/* The initial frames vector for remembering backtracking points in
+/* The initial frames vector for remembering backtracking points in
pcre2_match() is allocated on the system stack, of this size (bytes). The size
must be a multiple of sizeof(PCRE2_SPTR) in all environments, so making it a
multiple of 8 is best. Typical frame sizes are a few hundred bytes (it depends
@@ -557,7 +557,7 @@
#define MAGIC_NUMBER 0x50435245UL /* 'PCRE' */
/* The maximum remaining length of subject we are prepared to search for a
-req_unit match. In 8-bit mode, memchr() is used and is much faster than the
+req_unit match. In 8-bit mode, memchr() is used and is much faster than the
search loop that has to be used in 16-bit and 32-bit modes. */
#if PCRE2_CODE_UNIT_WIDTH == 8
Modified: code/trunk/src/pcre2_jit_compile.c
===================================================================
--- code/trunk/src/pcre2_jit_compile.c 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/src/pcre2_jit_compile.c 2017-07-19 16:04:15 UTC (rev 842)
@@ -3829,7 +3829,7 @@
{
case OP_CHARI:
caseless = TRUE;
- /* Fall through */
+ /* Fall through */
case OP_CHAR:
last = FALSE;
cc++;
@@ -3861,7 +3861,7 @@
case OP_MINPLUSI:
case OP_POSPLUSI:
caseless = TRUE;
- /* Fall through */
+ /* Fall through */
case OP_PLUS:
case OP_MINPLUS:
case OP_POSPLUS:
@@ -3870,7 +3870,7 @@
case OP_EXACTI:
caseless = TRUE;
- /* Fall through */
+ /* Fall through */
case OP_EXACT:
repeat = GET2(cc, 1);
last = FALSE;
@@ -3881,7 +3881,7 @@
case OP_MINQUERYI:
case OP_POSQUERYI:
caseless = TRUE;
- /* Fall through */
+ /* Fall through */
case OP_QUERY:
case OP_MINQUERY:
case OP_POSQUERY:
@@ -4351,7 +4351,7 @@
struct sljit_jump *partial_quit[2];
sljit_u8 instruction[8];
sljit_s32 tmp1_ind = sljit_get_register_index(TMP1);
-sljit_s32 tmp2_ind = sljit_get_register_index(TMP2);
+// sljit_s32 tmp2_ind = sljit_get_register_index(TMP2);
sljit_s32 str_ptr_ind = sljit_get_register_index(STR_PTR);
sljit_s32 data_ind = 0;
sljit_s32 tmp_ind = 1;
@@ -4376,8 +4376,10 @@
OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, character_to_int32(char1 | bit));
-SLJIT_ASSERT(tmp1_ind < 8 && tmp2_ind == 1);
+// SLJIT_ASSERT(tmp1_ind < 8 && tmp2_ind == 1);
+SLJIT_ASSERT(tmp1_ind < 8);
+
/* MOVD xmm, r/m32 */
instruction[0] = 0x66;
instruction[1] = 0x0f;
Modified: code/trunk/src/pcre2_pattern_info.c
===================================================================
--- code/trunk/src/pcre2_pattern_info.c 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/src/pcre2_pattern_info.c 2017-07-19 16:04:15 UTC (rev 842)
@@ -80,7 +80,7 @@
case PCRE2_INFO_FIRSTCODEUNIT:
case PCRE2_INFO_HASBACKSLASHC:
case PCRE2_INFO_HASCRORLF:
- case PCRE2_INFO_HEAPLIMIT:
+ case PCRE2_INFO_HEAPLIMIT:
case PCRE2_INFO_JCHANGED:
case PCRE2_INFO_LASTCODETYPE:
case PCRE2_INFO_LASTCODEUNIT:
Modified: code/trunk/src/pcre2_tables.c
===================================================================
--- code/trunk/src/pcre2_tables.c 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/src/pcre2_tables.c 2017-07-19 16:04:15 UTC (rev 842)
@@ -167,15 +167,15 @@
6. Do not break after Prepend characters.
7. Do not break within emoji modifier sequences (E_Base or E_Base_GAZ followed
- by E_Modifier). Extend characters are allowed before the modifier; this
+ by E_Modifier). Extend characters are allowed before the modifier; this
cannot be represented in this table, the code has to deal with it.
-
+
8. Do not break within emoji zwj sequences (ZWJ followed by Glue_After_Zwj or
E_Base_GAZ).
-
-9. Do not break within emoji flag sequences. That is, do not break between
- regional indicator (RI) symbols if there are an odd number of RI characters
- before the break point. This table encodes "join RI characters"; the code
+
+9. Do not break within emoji flag sequences. That is, do not break between
+ regional indicator (RI) symbols if there are an odd number of RI characters
+ before the break point. This table encodes "join RI characters"; the code
has to deal with checking for previous adjoining RIs.
10. Otherwise, break everywhere.
Modified: code/trunk/src/pcre2_ucp.h
===================================================================
--- code/trunk/src/pcre2_ucp.h 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/src/pcre2_ucp.h 2017-07-19 16:04:15 UTC (rev 842)
@@ -264,7 +264,7 @@
ucp_Multani,
ucp_Old_Hungarian,
ucp_SignWriting,
- /* New for Unicode 10.0.0 (no update since 8.0.0) */
+ /* New for Unicode 10.0.0 (no update since 8.0.0) */
ucp_Adlam,
ucp_Bhaiksuki,
ucp_Marchen,
@@ -272,7 +272,7 @@
ucp_Osage,
ucp_Tangut,
ucp_Masaram_Gondi,
- ucp_Nushu,
+ ucp_Nushu,
ucp_Soyombo,
ucp_Zanabazar_Square
};
Modified: code/trunk/src/pcre2posix.c
===================================================================
--- code/trunk/src/pcre2posix.c 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/src/pcre2posix.c 2017-07-19 16:04:15 UTC (rev 842)
@@ -142,7 +142,7 @@
32, REG_INVARG, /* this version of PCRE2 does not have Unicode support */
37, REG_EESCAPE, /* PCRE2 does not support \L, \l, \N{name}, \U, or \u */
56, REG_INVARG, /* internal error: unknown newline setting */
- 92, REG_INVARG, /* invalid option bits with PCRE2_LITERAL */
+ 92, REG_INVARG, /* invalid option bits with PCRE2_LITERAL */
};
/* Table of texts corresponding to POSIX error codes */
@@ -239,7 +239,7 @@
patlen = ((cflags & REG_PEND) != 0)? (PCRE2_SIZE)(preg->re_endp - pattern) :
PCRE2_ZERO_TERMINATED;
-
+
if ((cflags & REG_ICASE) != 0) options |= PCRE2_CASELESS;
if ((cflags & REG_NEWLINE) != 0) options |= PCRE2_MULTILINE;
if ((cflags & REG_DOTALL) != 0) options |= PCRE2_DOTALL;
@@ -249,7 +249,7 @@
if ((cflags & REG_UNGREEDY) != 0) options |= PCRE2_UNGREEDY;
preg->re_cflags = cflags;
-preg->re_pcre2_code = pcre2_compile((PCRE2_SPTR)pattern, patlen, options,
+preg->re_pcre2_code = pcre2_compile((PCRE2_SPTR)pattern, patlen, options,
&errorcode, &erroffset, NULL);
preg->re_erroffset = erroffset;
@@ -262,7 +262,7 @@
if (errorcode < COMPILE_ERROR_BASE) return REG_BADPAT;
errorcode -= COMPILE_ERROR_BASE;
-
+
if (errorcode < (int)(sizeof(eint1)/sizeof(const int)))
return eint1[errorcode];
for (i = 0; i < sizeof(eint2)/sizeof(const int); i += 2)
Modified: code/trunk/src/pcre2posix.h
===================================================================
--- code/trunk/src/pcre2posix.h 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/src/pcre2posix.h 2017-07-19 16:04:15 UTC (rev 842)
@@ -93,13 +93,13 @@
};
-/* The structure representing a compiled regular expression. It is also used
+/* The structure representing a compiled regular expression. It is also used
for passing the pattern end pointer when REG_PEND is set. */
typedef struct {
void *re_pcre2_code;
void *re_match_data;
- const char *re_endp;
+ const char *re_endp;
size_t re_nsub;
size_t re_erroffset;
int re_cflags;
Modified: code/trunk/src/pcre2test.c
===================================================================
--- code/trunk/src/pcre2test.c 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/src/pcre2test.c 2017-07-19 16:04:15 UTC (rev 842)
@@ -4073,7 +4073,8 @@
* Show compile extra options *
*************************************************/
-/* Called for unsupported POSIX options.
+/* Called only for unsupported POSIX options at present, and therefore needed
+only when the 8-bit library is being compiled.
Arguments:
options an options word
@@ -4083,17 +4084,21 @@
Returns: nothing
*/
+#ifdef SUPPORT_PCRE2_8
static void
show_compile_extra_options(uint32_t options, const char *before,
const char *after)
{
if (options == 0) fprintf(outfile, "%s <none>%s", before, after);
-else fprintf(outfile, "%s%s%s%s",
+else fprintf(outfile, "%s%s%s%s%s%s",
before,
((options & PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES) != 0)? " allow_surrogate_escapes" : "",
((options & PCRE2_EXTRA_BAD_ESCAPE_IS_LITERAL) != 0)? " bad_escape_is_literal" : "",
+ ((options & PCRE2_EXTRA_MATCH_WORD) != 0)? " match_word" : "",
+ ((options & PCRE2_EXTRA_MATCH_LINE) != 0)? " match_line" : "",
after);
}
+#endif
Modified: code/trunk/src/sljit/sljitLir.c
===================================================================
--- code/trunk/src/sljit/sljitLir.c 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/src/sljit/sljitLir.c 2017-07-19 16:04:15 UTC (rev 842)
@@ -124,10 +124,10 @@
/* SLJIT_REWRITABLE_JUMP is 0x1000. */
#if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86)
-# define PATCH_MB 0x4
-# define PATCH_MW 0x8
+# define PATCH_MB 0x4
+# define PATCH_MW 0x8
#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-# define PATCH_MD 0x10
+# define PATCH_MD 0x10
#endif
#endif
@@ -1555,6 +1555,7 @@
sljit_s32 dst_reg,
sljit_s32 src, sljit_sw srcw)
{
+(void)srcw; /* To stop compiler warning */
#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
CHECK_ARGUMENT(!(type & ~(0xff | SLJIT_I32_OP)));
CHECK_ARGUMENT((type & 0xff) >= SLJIT_EQUAL && (type & 0xff) <= SLJIT_ORDERED_F64);
Modified: code/trunk/testdata/testinput1
===================================================================
--- code/trunk/testdata/testinput1 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/testdata/testinput1 2017-07-19 16:04:15 UTC (rev 842)
@@ -95,17 +95,6 @@
aaac
abbbbbbbbbbbac
-/^(b+|a){1,2}?bc/
- bbc
-
-/^(b*|ba){1,2}?bc/
- babc
- bbabc
- bababc
-\= Expect no match
- bababbc
- babababc
-
/^(ba|b*){1,2}?bc/
babc
bbabc
Modified: code/trunk/testdata/testinput2
===================================================================
--- code/trunk/testdata/testinput2 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/testdata/testinput2 2017-07-19 16:04:15 UTC (rev 842)
@@ -1,12 +1,12 @@
# This set of tests is not Perl-compatible. It checks on special features
# of PCRE2's API, error diagnostics, and the compiled code of some patterns.
-# It also checks the non-Perl syntax that PCRE2 supports (Python, .NET,
-# Oniguruma). There are also some tests where PCRE2 and Perl differ,
-# either because PCRE2 can't be compatible, or there is a possible Perl
+# It also checks the non-Perl syntax that PCRE2 supports (Python, .NET,
+# Oniguruma). There are also some tests where PCRE2 and Perl differ,
+# either because PCRE2 can't be compatible, or there is a possible Perl
# bug.
# NOTE: This is a non-UTF set of tests. When UTF support is needed, use
-# test 5.
+# test 5.
#forbid_utf
#newline_default lf any anycrlf
@@ -330,7 +330,7 @@
\= Expect no match
aaaa
aaaaaa
-
+
# Perl does not fail these two for the final subjects. Neither did PCRE until
# release 8.01. The problem is in backtracking into a subpattern that contains
# a recursive reference to itself. PCRE has now made these into atomic patterns.
@@ -1219,7 +1219,7 @@
aaabbb
aaabbb\=callout_data=0
aaabbb\=callout_data=1
-\= Expect no match
+\= Expect no match
aaabbb\=callout_data=-1
/ab(?P<one>cd)ef(?P<two>gh)/I
@@ -1291,19 +1291,19 @@
/a+b/IB,auto_callout
ab
aaaab
-\= Expect no match
+\= Expect no match
aaaacb
/(abc|def)x/IB,auto_callout
abcx
defx
-\= Expect no match
+\= Expect no match
abcdefzx
/(abc|def)x/IB,auto_callout
abcx
defx
-\= Expect no match
+\= Expect no match
abcdefzx
/(ab|cd){3,4}/I,auto_callout
@@ -1312,11 +1312,11 @@
abcdcdcdcdcd
/([ab]{,4}c|xy)/IB,auto_callout
-\= Expect no match
+\= Expect no match
Note: that { does NOT introduce a quantifier
/([ab]{,4}c|xy)/IB,auto_callout
-\= Expect no match
+\= Expect no match
Note: that { does NOT introduce a quantifier
/([ab]{1,4}c|xy){4,5}?123/IB,auto_callout
@@ -1465,7 +1465,7 @@
a1b\=copy=A
a2b\=copy=A
a1b\=copy=Z,copy=A
-
+
/(?|(?<a>)(?<b>)(?<a>)|(?<a>)(?<b>)(?<a>))/I,dupnames
/^(?P<A>a)(?P<A>b)/I,dupnames
@@ -1553,7 +1553,7 @@
\= Expect no match
xyz\nabclf
xyz\rabclf
-
+
/^abc/Im,newline=cr
xyz\rabc
\= Expect no match
@@ -2029,11 +2029,11 @@
afoo
\r\nfoo
\nfoo
-
+
/^$/gm,newline=any
abc\r\rxyz
- abc\n\rxyz
-\= Expect no match
+ abc\n\rxyz
+\= Expect no match
abc\r\nxyz
/(?m)^$/g,newline=any,aftertext
@@ -2041,7 +2041,7 @@
/(?m)^$|^\r\n/g,newline=any,aftertext
abc\r\n\r\n
-
+
/(?m)$/g,newline=any,aftertext
abc\r\n\r\n
@@ -2050,7 +2050,7 @@
/^X/m
XABC
-\= Expect no match
+\= Expect no match
XABC\=notbol
/(ab|c)(?-1)/B
@@ -2059,8 +2059,8 @@
/xy(?+1)(abc)/B
xyabcabc
\= Expect no match
- xyabc
-
+ xyabc
+
/x(?-0)y/
/x(?-1)y/
@@ -2073,13 +2073,13 @@
abcX
Y
\= Expect no match
- abcY
-
+ abcY
+
/^((?(+1)X|Y)(abc))+/B
YabcXabc
YabcXabcXabc
\= Expect no match
- XabcXabc
+ XabcXabc
/(?(-1)a)/B
@@ -2092,30 +2092,30 @@
/(?<A>tom|bon)-\k{A}/
tom-tom
- bon-bon
+ bon-bon
\= Expect no match
- tom-bon
+ tom-bon
/\g{A/
/(?|(abc)|(xyz))/B
>abc<
- >xyz<
+ >xyz<
/(x)(?|(abc)|(xyz))(x)/B
xabcx
- xxyzx
+ xxyzx
/(x)(?|(abc)(pqr)|(xyz))(x)/B
xabcpqrx
- xxyzx
+ xxyzx
/\H++X/B
\= Expect no match
XXXX
-
+
/\H+\hY/B
- XXXX Y
+ XXXX Y
/\H+ Y/B
@@ -2169,7 +2169,7 @@
/^a+(*FAIL)/auto_callout
\= Expect no match
aaaaaa
-
+
/a+b?c+(*FAIL)/auto_callout
\= Expect no match
aaabccc
@@ -2181,7 +2181,7 @@
/a+b?(*COMMIT)c+(*FAIL)/auto_callout
\= Expect no match
aaabccc
-
+
/a+b?(*SKIP)c+(*FAIL)/auto_callout
\= Expect no match
aaabcccaaabccc
@@ -2189,7 +2189,7 @@
/a+b?(*THEN)c+(*FAIL)/auto_callout
\= Expect no match
aaabccc
-
+
/a(*MARK)b/
/(?i:A{1,}\6666666666)/
@@ -2203,15 +2203,15 @@
/.+A/newline=crlf
\= Expect no match
\r\nA
-
+
/\nA/newline=crlf
- \r\nA
+ \r\nA
/[\r\n]A/newline=crlf
- \r\nA
+ \r\nA
/(\r|\n)A/newline=crlf
- \r\nA
+ \r\nA
/a(*CR)b/
@@ -2218,37 +2218,37 @@
/(*CR)a.b/
a\nb
\= Expect no match
- a\rb
+ a\rb
/(*CR)a.b/newline=lf
a\nb
\= Expect no match
- a\rb
+ a\rb
/(*LF)a.b/newline=CRLF
a\rb
\= Expect no match
- a\nb
+ a\nb
/(*CRLF)a.b/
a\rb
- a\nb
+ a\nb
\= Expect no match
- a\r\nb
+ a\r\nb
/(*ANYCRLF)a.b/newline=CR
\= Expect no match
a\rb
- a\nb
- a\r\nb
+ a\nb
+ a\r\nb
/(*ANY)a.b/newline=cr
\= Expect no match
a\rb
- a\nb
- a\r\nb
- a\x85b
-
+ a\nb
+ a\r\nb
+ a\x85b
+
/(*ANY).*/g
abc\r\ndef
@@ -2257,24 +2257,24 @@
/(*CRLF).*/g
abc\r\ndef
-
+
/(*NUL)^.*/
a\nb\x00ccc
-
+
/(*NUL)^.*/s
a\nb\x00ccc
-
+
/^x/m,newline=NUL
ab\x00xy
-
+
/'#comment' 0d 0a 00 '^x\' 0a 'y'/x,newline=nul,hex
- x\nyz
+ x\nyz
/(*NUL)^X\NY/
X\nY
X\rY
\= Expect no match
- X\x00Y
+ X\x00Y
/a\Rb/I,bsr=anycrlf
a\rb
@@ -2282,7 +2282,7 @@
a\r\nb
\= Expect no match
a\x85b
- a\x0bb
+ a\x0bb
/a\Rb/I,bsr=unicode
a\rb
@@ -2289,8 +2289,8 @@
a\nb
a\r\nb
a\x85b
- a\x0bb
-
+ a\x0bb
+
/a\R?b/I,bsr=anycrlf
a\rb
a\nb
@@ -2297,7 +2297,7 @@
a\r\nb
\= Expect no match
a\x85b
- a\x0bb
+ a\x0bb
/a\R?b/I,bsr=unicode
a\rb
@@ -2304,8 +2304,8 @@
a\nb
a\r\nb
a\x85b
- a\x0bb
-
+ a\x0bb
+
/a\R{2,4}b/I,bsr=anycrlf
a\r\n\nb
a\n\r\rb
@@ -2312,7 +2312,7 @@
a\r\n\r\n\r\n\r\nb
\= Expect no match
a\x85\x85b
- a\x0b\x0bb
+ a\x0b\x0bb
/a\R{2,4}b/I,bsr=unicode
a\r\rb
@@ -2319,13 +2319,13 @@
a\n\n\nb
a\r\n\n\r\rb
a\x85\x85b
- a\x0b\x0bb
-\= Expect no match
- a\r\r\r\r\rb
-
+ a\x0b\x0bb
+\= Expect no match
+ a\r\r\r\r\rb
+
/(*BSR_ANYCRLF)a\Rb/I
a\nb
- a\rb
+ a\rb
/(*BSR_UNICODE)a\Rb/I
a\x85b
@@ -2332,7 +2332,7 @@
/(*BSR_ANYCRLF)(*CRLF)a\Rb/I
a\nb
- a\rb
+ a\rb
/(*CRLF)(*BSR_UNICODE)a\Rb/I
a\x85b
@@ -2395,9 +2395,9 @@
/^(?+1)(?<a>x|y){0}z/
xzxx
- yzyy
+ yzyy
\= Expect no match
- xxz
+ xxz
/(\3)(\1)(a)/
\= Expect no match
@@ -2405,12 +2405,12 @@
/(\3)(\1)(a)/alt_bsux,allow_empty_class,match_unset_backref,dupnames
cat
-
+
/TA]/
- The ACTA] comes
+ The ACTA] comes
/TA]/alt_bsux,allow_empty_class,match_unset_backref,dupnames
- The ACTA] comes
+ The ACTA] comes
/(?2)[]a()b](abc)/
abcbabc
@@ -2420,12 +2420,12 @@
/(?1)[]a()b](abc)/
abcbabc
-\= Expect no match
+\= Expect no match
abcXabc
/(?1)[^]a()b](abc)/
abcXabc
-\= Expect no match
+\= Expect no match
abcbabc
/(?2)[]a()b](abc)(xyz)/
@@ -2447,23 +2447,23 @@
/a[]+b/alt_bsux,allow_empty_class,match_unset_backref,dupnames
\= Expect no match
- ab
+ ab
/a[]*+b/alt_bsux,allow_empty_class,match_unset_backref,dupnames
\= Expect no match
- ab
+ ab
/a[^]b/alt_bsux,allow_empty_class,match_unset_backref,dupnames
aXb
- a\nb
+ a\nb
\= Expect no match
- ab
-
+ ab
+
/a[^]+b/alt_bsux,allow_empty_class,match_unset_backref,dupnames
aXb
- a\nX\nXb
+ a\nX\nXb
\= Expect no match
- ab
+ ab
/a(?!)b/B
@@ -2476,32 +2476,32 @@
/(?(?=.*b)b|^)/I,auto_callout
adc
- abc
-
+ abc
+
/(?(?=b).*b|^d)/I
/(?(?=.*b).*b|^d)/I
/xyz/auto_callout
- xyz
- abcxyz
-\= Expect no match
+ xyz
+ abcxyz
+\= Expect no match
abc
- abcxypqr
-
+ abcxypqr
+
/xyz/auto_callout,no_start_optimize
- abcxyz
-\= Expect no match
+ abcxyz
+\= Expect no match
abc
- abcxypqr
-
+ abcxypqr
+
/(*NO_START_OPT)xyz/auto_callout
abcxyz
-
+
/(*NO_AUTO_POSSESS)a+b/B
/xyz/auto_callout,no_start_optimize
- abcxyz
+ abcxyz
/^"((?(?=[a])[^"])|b)*"$/auto_callout
"ab"
@@ -2514,7 +2514,7 @@
/^X(?&N)(a)(?|(b)|(q))(c)(d)(?<N>Y)/
XYabcdY
-
+
/Xa{2,4}b/
X\=ps
Xa\=ps
@@ -2521,7 +2521,7 @@
Xaa\=ps
Xaaa\=ps
Xaaaa\=ps
-
+
/Xa{2,4}?b/
X\=ps
Xa\=ps
@@ -2528,7 +2528,7 @@
Xaa\=ps
Xaaa\=ps
Xaaaa\=ps
-
+
/Xa{2,4}+b/
X\=ps
Xa\=ps
@@ -2535,7 +2535,7 @@
Xaa\=ps
Xaaa\=ps
Xaaaa\=ps
-
+
/X\d{2,4}b/
X\=ps
X3\=ps
@@ -2542,7 +2542,7 @@
X33\=ps
X333\=ps
X3333\=ps
-
+
/X\d{2,4}?b/
X\=ps
X3\=ps
@@ -2549,7 +2549,7 @@
X33\=ps
X333\=ps
X3333\=ps
-
+
/X\d{2,4}+b/
X\=ps
X3\=ps
@@ -2556,7 +2556,7 @@
X33\=ps
X333\=ps
X3333\=ps
-
+
/X\D{2,4}b/
X\=ps
Xa\=ps
@@ -2563,7 +2563,7 @@
Xaa\=ps
Xaaa\=ps
Xaaaa\=ps
-
+
/X\D{2,4}?b/
X\=ps
Xa\=ps
@@ -2570,7 +2570,7 @@
Xaa\=ps
Xaaa\=ps
Xaaaa\=ps
-
+
/X\D{2,4}+b/
X\=ps
Xa\=ps
@@ -2577,7 +2577,7 @@
Xaa\=ps
Xaaa\=ps
Xaaaa\=ps
-
+
/X[abc]{2,4}b/
X\=ps
Xa\=ps
@@ -2584,7 +2584,7 @@
Xaa\=ps
Xaaa\=ps
Xaaaa\=ps
-
+
/X[abc]{2,4}?b/
X\=ps
Xa\=ps
@@ -2591,7 +2591,7 @@
Xaa\=ps
Xaaa\=ps
Xaaaa\=ps
-
+
/X[abc]{2,4}+b/
X\=ps
Xa\=ps
@@ -2598,7 +2598,7 @@
Xaa\=ps
Xaaa\=ps
Xaaaa\=ps
-
+
/X[^a]{2,4}b/
X\=ps
Xz\=ps
@@ -2605,7 +2605,7 @@
Xzz\=ps
Xzzz\=ps
Xzzzz\=ps
-
+
/X[^a]{2,4}?b/
X\=ps
Xz\=ps
@@ -2612,7 +2612,7 @@
Xzz\=ps
Xzzz\=ps
Xzzzz\=ps
-
+
/X[^a]{2,4}+b/
X\=ps
Xz\=ps
@@ -2619,7 +2619,7 @@
Xzz\=ps
Xzzz\=ps
Xzzzz\=ps
-
+
/(Y)X\1{2,4}b/
YX\=ps
YXY\=ps
@@ -2626,7 +2626,7 @@
YXYY\=ps
YXYYY\=ps
YXYYYY\=ps
-
+
/(Y)X\1{2,4}?b/
YX\=ps
YXY\=ps
@@ -2633,7 +2633,7 @@
YXYY\=ps
YXYYY\=ps
YXYYYY\=ps
-
+
/(Y)X\1{2,4}+b/
YX\=ps
YXY\=ps
@@ -2640,7 +2640,7 @@
YXYY\=ps
YXYYY\=ps
YXYYYY\=ps
-
+
/\++\KZ|\d+X|9+Y/startchar
++++123999\=ps
++++123999Y\=ps
@@ -2650,7 +2650,7 @@
\= Expect no match
Z\=ps
ZA\=ps
-
+
/Z(?!)/
\= Expect no match
Z\=ps
@@ -2659,7 +2659,7 @@
/dog(sbody)?/
dogs\=ps
dogs\=ph
-
+
/dog(sbody)??/
dogs\=ps
dogs\=ph
@@ -2667,7 +2667,7 @@
/dog|dogsbody/
dogs\=ps
dogs\=ph
-
+
/dogsbody|dog/
dogs\=ps
dogs\=ph
@@ -2679,14 +2679,14 @@
/abc/
abc\=ps
abc\=ph
-
+
/abc\K123/startchar
xyzabc123pqr
xyzabc12\=ps
xyzabc12\=ph
-
+
/(?<=abc)123/
- xyzabc123pqr
+ xyzabc123pqr
xyzabc12\=ps
xyzabc12\=ph
@@ -2708,11 +2708,11 @@
\= Expect no match
abcdef\=notempty
xyzabcdef\=notempty
-
+
/^(?:(?=abc)|abc\K)/aftertext,startchar
abcdef
abcdef\=notempty_atstart
-\= Expect no match
+\= Expect no match
abcdef\=notempty
/a?b?/aftertext
@@ -2721,72 +2721,72 @@
xyzabc\=notempty
xyzabc\=notempty_atstart
xyz\=notempty_atstart
-\= Expect no match
+\= Expect no match
xyz\=notempty
/^a?b?/aftertext
xyz
xyzabc
-\= Expect no match
+\= Expect no match
xyzabc\=notempty
xyzabc\=notempty_atstart
xyz\=notempty_atstart
xyz\=notempty
-
+
/^(?<name>a|b\g<name>c)/
aaaa
bacxxx
- bbaccxxx
+ bbaccxxx
bbbacccxx
/^(?<name>a|b\g'name'c)/
aaaa
bacxxx
- bbaccxxx
+ bbaccxxx
bbbacccxx
/^(a|b\g<1>c)/
aaaa
bacxxx
- bbaccxxx
+ bbaccxxx
bbbacccxx
/^(a|b\g'1'c)/
aaaa
bacxxx
- bbaccxxx
+ bbaccxxx
bbbacccxx
/^(a|b\g'-1'c)/
aaaa
bacxxx
- bbaccxxx
+ bbaccxxx
bbbacccxx
/(^(a|b\g<-1>c))/
aaaa
bacxxx
- bbaccxxx
+ bbaccxxx
bbbacccxx
/(?-i:\g<name>)(?i:(?<name>a))/
XaaX
- XAAX
+ XAAX
/(?i:\g<name>)(?-i:(?<name>a))/
XaaX
-\= Expect no match
- XAAX
+\= Expect no match
+ XAAX
/(?-i:\g<+1>)(?i:(a))/
XaaX
- XAAX
+ XAAX
/(?=(?<regex>(?#simplesyntax)\$(?<name>[a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*)(?:\[(?<index>[a-zA-Z0-9_\x{7f}-\x{ff}]+|\$\g<name>)\]|->\g<name>(\(.*?\))?)?|(?#simple syntax withbraces)\$\{(?:\g<name>(?<indices>\[(?:\g<index>|'(?:\\.|[^'\\])*'|"(?:\g<regex>|\\.|[^"\\])*")\])?|\g<complex>|\$\{\g<complex>\})\}|(?#complexsyntax)\{(?<complex>\$(?<segment>\g<name>(\g<indices>*|\(.*?\))?)(?:->\g<segment>)*|\$\g<complex>|\$\{\g<complex>\})\}))\{/
/(?<n>a|b|c)\g<n>*/
abc
- accccbbb
+ accccbbb
/^X(?7)(a)(?|(b)|(q)(r)(s))(c)(d)(Y)/
XYabcdY
@@ -2793,7 +2793,7 @@
/(?<=b(?1)|zzz)(a)/
xbaax
- xzzzax
+ xzzzax
/(a)(?<=b\1)/
@@ -2844,7 +2844,7 @@
(?: [0-9a-f]{1,4} | # 1-4 hex digits or
(?(1)0 | () ) ) # if null previously matched, fail; else null
: # followed by colon
- ){1,7} # end item; 1-7 of them required
+ ){1,7} # end item; 1-7 of them required
[0-9a-f]{1,4} $ # final hex number at end of string
(?(1)|.) # check that there was an empty component
/Iix
@@ -2856,25 +2856,25 @@
/(?|(?<a>A)|(?<b>B))/
/(?:a(?<quote> (?<apostrophe>')|(?<realquote>")) |
- b(?<quote> (?<apostrophe>')|(?<realquote>")) )
+ b(?<quote> (?<apostrophe>')|(?<realquote>")) )
(?('quote')[a-z]+|[0-9]+)/Ix,dupnames
a"aaaaa
- b"aaaaa
-\= Expect no match
+ b"aaaaa
+\= Expect no match
b"11111
- a"11111
-
+ a"11111
+
/^(?|(a)(b)(c)(?<D>d)|(?<D>e)) (?('D')X|Y)/IBx,dupnames
abcdX
eX
\= Expect no match
abcdY
- ey
-
+ ey
+
/(?<A>a) (b)(c) (?<A>d (?(R&A)$ | (?4)) )/IBx,dupnames
abcdd
\= Expect no match
- abcdde
+ abcdde
/abcd*/
xxxxabcd\=ps
@@ -2910,7 +2910,7 @@
/i(?(DEFINE)(?<s>a))/I
i
-
+
/()i(?(1)a)/I
ia
@@ -2917,9 +2917,9 @@
/(?i)a(?-i)b|c/B
XabX
XAbX
- CcC
+ CcC
\= Expect no match
- XABX
+ XABX
/(?i)a(?s)b|c/B
@@ -2927,7 +2927,7 @@
/^(ab(c\1)d|x){2}$/B
xabcxd
-
+
/^(?&t)*+(?(DEFINE)(?<t>.))$/B
/^(?&t)*(?(DEFINE)(?<t>.))$/B
@@ -2934,13 +2934,13 @@
# This one is here because Perl gives the match as "b" rather than "ab". I
# believe this to be a Perl bug.
-
+
/(?>a\Kb)z|(ab)/
- ab\=startchar
+ ab\=startchar
/(?P<L1>(?P<L2>0|)|(?P>L2)(?P>L1))/
abcd
- 0abc
+ 0abc
/abc(*MARK:)pqr/
@@ -2948,7 +2948,7 @@
/abc(*FAIL:123)xyz/
-# This should, and does, fail. In Perl, it does not, which I think is a
+# This should, and does, fail. In Perl, it does not, which I think is a
# bug because replacing the B in the pattern by (B|D) does make it fail.
/A(*COMMIT)B/aftertext,mark
@@ -2964,7 +2964,7 @@
/A(*PRUNE)B|A(*PRUNE)C/mark
\= Expect no match
AC
-
+
# Mark names can be duplicated. Perl doesn't give a mark for this one,
# though PCRE2 does.
@@ -2971,30 +2971,30 @@
/^A(*:A)B|^X(*:A)Y/mark
\= Expect no match
XAQQ
-
-# COMMIT at the start of a pattern should be the same as an anchor. Perl
+
+# COMMIT at the start of a pattern should be the same as an anchor. Perl
# optimizations defeat this. So does the PCRE2 optimization unless we disable
# it.
/(*COMMIT)ABC/
ABCDEFG
-
+
/(*COMMIT)ABC/no_start_optimize
\= Expect no match
DEFGABC
-
+
/^(ab (c+(*THEN)cd) | xyz)/x
\= Expect no match
- abcccd
+ abcccd
/^(ab (c+(*PRUNE)cd) | xyz)/x
\= Expect no match
- abcccd
+ abcccd
/^(ab (c+(*FAIL)cd) | xyz)/x
\= Expect no match
- abcccd
-
+ abcccd
+
# Perl gets some of these wrong
/(?>.(*ACCEPT))*?5/
@@ -3013,19 +3013,19 @@
ACBD
\= Expect no match
A\nB
- ACB\n
+ ACB\n
/A\NB./Bs
ACBD
- ACB\n
+ ACB\n
\= Expect no match
- A\nB
-
+ A\nB
+
/A\NB/newline=crlf
A\nB
A\rB
\= Expect no match
- A\r\nB
+ A\r\nB
/\R+b/B
@@ -3096,7 +3096,7 @@
/.+/
\= Bad offsets
abc\=offset=4
- abc\=offset=-4
+ abc\=offset=-4
\= Valid data
abc\=offset=0
abc\=offset=1
@@ -3116,24 +3116,24 @@
/(?P<abn>(?P=axn)xxx)(?<axn>yy)/B
-# These tests are here because Perl gets the first one wrong.
+# These tests are here because Perl gets the first one wrong.
/(\R*)(.)/s
\r\n
- \r\r\n\n\r
- \r\r\n\n\r\n
+ \r\r\n\n\r
+ \r\r\n\n\r\n
/(\R)*(.)/s
\r\n
- \r\r\n\n\r
- \r\r\n\n\r\n
+ \r\r\n\n\r
+ \r\r\n\n\r\n
/((?>\r\n|\n|\x0b|\f|\r|\x85)*)(.)/s
\r\n
- \r\r\n\n\r
- \r\r\n\n\r\n
+ \r\r\n\n\r
+ \r\r\n\n\r\n
-# -------------
+# -------------
/^abc$/B
@@ -3141,12 +3141,12 @@
/^(a)*+(\w)/
aaaaX
-\= Expect no match
+\= Expect no match
aaaa
/^(?:a)*+(\w)/
aaaaX
-\= Expect no match
+\= Expect no match
aaaa
/(a)++1234/IB
@@ -3205,7 +3205,7 @@
/(abc)\1+/
-# Perl doesn't get these right IMO (the 3rd is PCRE2-specific)
+# Perl doesn't get these right IMO (the 3rd is PCRE2-specific)
/(?1)(?:(b(*ACCEPT))){0}/
b
@@ -3212,8 +3212,8 @@
/(?1)(?:(b(*ACCEPT))){0}c/
bc
-\= Expect no match
- b
+\= Expect no match
+ b
/(?1)(?:((*ACCEPT))){0}c/
c
@@ -3220,7 +3220,7 @@
c\=notempty
/^.*?(?(?=a)a|b(*THEN)c)/
-\= Expect no match
+\= Expect no match
ba
/^.*?(?(?=a)a|bc)/
@@ -3227,17 +3227,17 @@
ba
/^.*?(?(?=a)a(*THEN)b|c)/
-\= Expect no match
+\= Expect no match
ac
/^.*?(?(?=a)a(*THEN)b)c/
-\= Expect no match
+\= Expect no match
ac
/^.*?(a(*THEN)b)c/
-\= Expect no match
+\= Expect no match
aabc
-
+
/^.*? (?1) c (?(DEFINE)(a(*THEN)b))/x
aabc
@@ -3252,11 +3252,11 @@
/(*MARK:A)(*SKIP:B)(C|X)/mark
C
-\= Expect no match
+\= Expect no match
D
-
+
/(*:A)A+(*SKIP:A)(B|Z)/mark
-\= Expect no match
+\= Expect no match
AAAC
# ----------------------------
@@ -3264,14 +3264,14 @@
"(?=a*(*ACCEPT)b)c"
c
c\=notempty
-
+
/(?1)c(?(DEFINE)((*ACCEPT)b))/
c
c\=notempty
-
+
/(?>(*ACCEPT)b)c/
c
-\= Expect no match
+\= Expect no match
c\=notempty
/(?:(?>(a)))+a%/allaftertext
@@ -3279,7 +3279,7 @@
/(a)b|ac/allaftertext
ac\=ovector=1
-
+
/(a)(b)x|abc/allaftertext
abc\=ovector=2
@@ -3304,7 +3304,7 @@
foobazbarX
barfooX
bazX
- foobarbazX
+ foobarbazX
bazfooX\=ovector=0
bazfooX\=ovector=1
bazfooX\=ovector=2
@@ -3368,17 +3368,17 @@
/^(?>a+)(?>(z+))\w/B
aaaazzzzb
\= Expect no match
- aazz
+ aazz
/(.)(\1|a(?2))/
bab
-
+
/\1|(.)(?R)\1/
cbbbc
-
+
/(.)((?(1)c|a)|a(?2))/
\= Expect no match
- baa
+ baa
/(?P<abn>(?P=abn)xxx)/B
@@ -3419,7 +3419,7 @@
/a[\NB]c/
aNc
-
+
/a[B-\Nc]/
/a[B\Nc]/
@@ -3431,34 +3431,34 @@
# This test, with something more complicated than individual letters, causes
# different behaviour in Perl. Perhaps it disables some optimization; no tag is
# passed back for the failures, whereas in PCRE2 there is a tag.
-
+
/(A|P)(*:A)(B|P) | (X|P)(X|P)(*:B)(Y|P)/x,mark
AABC
- XXYZ
+ XXYZ
\= Expect no match
- XAQQ
- XAQQXZZ
- AXQQQ
- AXXQQQ
+ XAQQ
+ XAQQXZZ
+ AXQQQ
+ AXXQQQ
# Perl doesn't give marks for these, though it does if the alternatives are
-# replaced by single letters.
-
+# replaced by single letters.
+
/(b|q)(*:m)f|a(*:n)w/mark
- aw
-\= Expect no match
+ aw
+\= Expect no match
abc
/(q|b)(*:m)f|a(*:n)w/mark
- aw
-\= Expect no match
+ aw
+\= Expect no match
abc
-# After a partial match, the behaviour is as for a failure.
+# After a partial match, the behaviour is as for a failure.
/^a(*:X)bcde/mark
abc\=ps
-
+
# These are here because Perl doesn't return a mark, except for the first.
/(?=(*:x))(q|)/aftertext,mark
@@ -3526,7 +3526,7 @@
ababa\=ps
ababa\=ph
abababx
- ababababx
+ ababababx
/^(..)\1{2,3}?x/
aba\=ps
@@ -3533,8 +3533,8 @@
ababa\=ps
ababa\=ph
abababx
- ababababx
-
+ ababababx
+
/^(..)(\1{2,3})ab/
abababab
@@ -3541,7 +3541,7 @@
/^\R/
\r\=ps
\r\=ph
-
+
/^\R{2,3}x/
\r\=ps
\r\=ph
@@ -3550,7 +3550,7 @@
\r\r\r\=ps
\r\r\r\=ph
\r\rx
- \r\r\rx
+ \r\r\rx
/^\R{2,3}?x/
\r\=ps
@@ -3560,13 +3560,13 @@
\r\r\r\=ps
\r\r\r\=ph
\r\rx
- \r\r\rx
-
+ \r\r\rx
+
/^\R?x/
\r\=ps
\r\=ph
x
- \rx
+ \rx
/^\R+x/
\r\=ps
@@ -3573,7 +3573,7 @@
\r\=ph
\r\n\=ps
\r\n\=ph
- \rx
+ \rx
/^a$/newline=crlf
a\r\=ps
@@ -3594,7 +3594,7 @@
/./newline=crlf
\r\=ps
\r\=ph
-
+
/.{2,3}/newline=crlf
\r\=ps
\r\=ph
@@ -3613,9 +3613,9 @@
"AB(C(D))(E(F))?(?(?=\2)(?=\4))"
ABCDGHI\=ovector=01
-
+
# These are all run as real matches in test 1; here we are just checking the
-# settings of the anchored and startline bits.
+# settings of the anchored and startline bits.
/(?>.*?a)(?<=ba)/I
@@ -3651,10 +3651,10 @@
/(?:(a)+(?C1)bb|aa(?C2)b)/
aab\=callout_capture
-
+
/(?:(a)++(?C1)bb|aa(?C2)b)/
aab\=callout_capture
-
+
/(?:(?>(a))(?C1)bb|aa(?C2)b)/
aab\=callout_capture
@@ -3671,11 +3671,11 @@
/(ab)x|ab/
ab\=ovector=0
ab\=ovector=1
-
+
/(?<=123)(*MARK:xx)abc/mark
xxxx123a\=ph
xxxx123a\=ps
-
+
/123\Kabc/startchar
xxxx123a\=ph
xxxx123a\=ps
@@ -3690,22 +3690,22 @@
/aaaaa(*COMMIT)(*PRUNE)b|a+c/
aaaaaac
-
+
# Here are some that Perl treats differently because of the way it handles
-# backtracking verbs.
+# backtracking verbs.
/(?!a(*COMMIT)b)ac|ad/
ac
- ad
+ ad
/^(?!a(*THEN)b|ac)../
- ad
+ ad
\= Expect no match
ac
/^(?=a(*THEN)b|ac)/
ac
-
+
/\A.*?(?:a|b(*THEN)c)/
ba
@@ -3716,14 +3716,14 @@
ba
/(?:(a(*MARK:X)a+(*SKIP:X)b)){0}(?:(?1)|aac)/
- aac
+ aac
/\A.*?(a|b(*THEN)c)/
ba
/^(A(*THEN)B|A(*THEN)D)/
- AD
-
+ AD
+
/(?!b(*THEN)a)bn|bnn/
bnn
@@ -3733,7 +3733,7 @@
/(?=b(*THEN)a|)bn|bnn/
bnn
-# This test causes a segfault with Perl 5.18.0
+# This test causes a segfault with Perl 5.18.0
/^(?=(a)){0}b(?1)/
backgammon
@@ -3841,13 +3841,13 @@
/[a-c]{0,6}d/IB
-# End of special auto-possessive tests
+# End of special auto-possessive tests
/^A\o{1239}B/
A\123B
/^A\oB/
-
+
/^A\x{zz}B/
/^A\x{12Z/
@@ -3919,13 +3919,13 @@
/[[:<:]]red[[:>:]]/B
little red riding hood
- a /red/ thing
+ a /red/ thing
red is a colour
- put it all on red
+ put it all on red
\= Expect no match
no reduction
Alfred Winifred
-
+
/[a[:<:]] should give error/
/(?=ab\K)/aftertext
@@ -3934,7 +3934,7 @@
/abcd/newline=lf,firstline
\= Expect no match
xx\nxabcd
-
+
# Test stack guard external calls.
/(((a)))/stackguard=1
@@ -3965,26 +3965,26 @@
/A\9B/
-# This one is here because Perl fails to match "12" for this pattern when the $
+# This one is here because Perl fails to match "12" for this pattern when the $
# is present.
-
+
/^(?(?=abc)\w{3}:|\d\d)$/
abc:
12
\= Expect no match
123
- xyz
+ xyz
-# Perl gets this one wrong, giving "a" as the after text for ca and failing to
+# Perl gets this one wrong, giving "a" as the after text for ca and failing to
# match for cd.
/(?(?=ab)ab)/aftertext
abxxx
ca
- cd
-
-# This should test both paths for processing OP_RECURSE.
+ cd
+# This should test both paths for processing OP_RECURSE.
+
/(?(R)a+|(?R)b)/
aaaabcde
aaaabcde\=ovector=100
@@ -3995,15 +3995,15 @@
/(*NOTEMPTY)a*?b*?/
ab
ba
- cb
+ cb
/(*NOTEMPTY_ATSTART)a*?b*?/aftertext
ab
- cdab
+ cdab
/(?(VERSION>=10.0)yes|no)/I
yesno
-
+
/(?(VERSION=8)yes){3}/BI,aftertext
yesno
@@ -4010,7 +4010,7 @@
/(?(VERSION=8)yes|no){3}/I
yesnononoyes
\= Expect no match
- yesno
+ yesno
/(?:(?<VERSION>abc)|xyz)(?(VERSION)yes|no)/I
abcyes
@@ -4017,7 +4017,7 @@
xyzno
\= Expect no match
abcno
- xyzyes
+ xyzyes
/(?(VERSION<10)yes|no)/
@@ -4033,11 +4033,11 @@
/(|ab)*?d/I
abd
- xyd
+ xyd
/(|ab)*?d/I,no_start_optimize
abd
- xyd
+ xyd
/\k<A>*(?<A>aa)(?<A>bb)/match_unset_backref,dupnames
aabb
@@ -4097,7 +4097,7 @@
/abc/replace=[9]XYZ
123abc123
-
+
/abc/replace=xyz
1abc2\=partial_hard
@@ -4109,23 +4109,23 @@
/(?<=abc)(|def)/g,replace=<$0>
123abcxyzabcdef789abcpqr
-
+
/./replace=$0
a
-
+
/(.)(.)/replace=$2+$1
abc
-
+
/(?<A>.)(?<B>.)/replace=$B+$A
abc
-
+
/(.)(.)/g,replace=$2$1
- abcdefgh
-
+ abcdefgh
+
/(*:pear)apple|(*:orange)lemon|(*:strawberry)blackberry/g,replace=${*MARK}
apple lemon blackberry
apple strudel
- fruitless
+ fruitless
/(*:pear)apple|(*:orange)lemon|(*:strawberry)blackberry/replace=${*MARK} sauce,
apple lemon blackberry
@@ -4133,15 +4133,15 @@
/(*:pear)apple|(*:orange)lemon|(*:strawberry)blackberry/g,replace=<$*MARK>
apple lemon blackberry
apple strudel
- fruitless
-
-/(*:pear)apple/g,replace=${*MARKING}
+ fruitless
+
+/(*:pear)apple/g,replace=${*MARKING}
apple lemon blackberry
/(*:pear)apple/g,replace=${*MARK-time
apple lemon blackberry
-/(*:pear)apple/g,replace=${*mark}
+/(*:pear)apple/g,replace=${*mark}
apple lemon blackberry
/(*:pear)apple|(*:orange)lemon|(*:strawberry)blackberry/g,replace=<$*MARKET>
@@ -4177,10 +4177,10 @@
/(a)(b)|(c)/
XcX\=ovector=2,get=1,get=2,get=3,get=4,getall
-
+
/x(?=ab\K)/
- xab\=get=0
- xab\=copy=0
+ xab\=get=0
+ xab\=copy=0
xab\=getall
/(?<A>a)|(?<A>b)/dupnames
@@ -4243,16 +4243,16 @@
00765
456
\= Expect no match
- 356
+ 356
'^(a)*+(\w)'
g
- g\=ovector=1
+ g\=ovector=1
'^(?:a)*+(\w)'
g
- g\=ovector=1
-
+ g\=ovector=1
+
# These two pattern showeds up compile-time bugs
"((?2){0,1999}())?"
@@ -4293,11 +4293,11 @@
/^(?(?C25)(?=abc)abcd|xyz)/B,callout_info
abcdefg
- xyz123
+ xyz123
/^(?(?C$abc$)(?=abc)abcd|xyz)/B
abcdefg
- xyz123
+ xyz123
/^ab(?C'first')cd(?C"second")ef/
abcdefg
@@ -4314,8 +4314,8 @@
/(?(?!)a|b)/
bbb
-\= Expect no match
- aaa
+\= Expect no match
+ aaa
# JIT gives a different error message for the infinite recursion
@@ -4349,9 +4349,9 @@
/abc/
\= Expect no match
\[9x!xxx(]{9999}
-
+
/(abc)*/
- \[abc]{5}
+ \[abc]{5}
/^/gm
\n\n\n
@@ -4369,7 +4369,7 @@
/A\8B\9C/
A8B9C
-
+
/(?x:((?'a')) # comment (with parentheses) and | vertical
(?-x:#not a comment (?'b')) # this is a comment ()
(?'c')) # not a comment (?'d')/info
@@ -4376,10 +4376,10 @@
/(?|(?'a')(2)(?'b')|(?'a')(?'a')(3))/I,dupnames
A23B
- B32A
+ B32A
# These are some patterns that used to cause buffer overflows or other errors
-# while compiling.
+# while compiling.
/.((?2)(?R)|\1|$)()/B
@@ -4463,7 +4463,7 @@
{4,5a}bc
/\x0{ab}/
- \0{ab}
+ \0{ab}
/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-02}Z/
ababababbbabZXXXX
@@ -4505,8 +4505,8 @@
\= Expect no match
aacb
-/(*MARK:a\zb)z/alt_verbnames
-
+/(*MARK:a\zb)z/alt_verbnames
+
/(*:ab\t(d\)c)xxx/
/(*:ab\t(d\)c)xxx/alt_verbnames,mark
@@ -4514,28 +4514,28 @@
/(*:A\Qxx)x\EB)x/alt_verbnames,mark
x
-
+
/(*:A\ExxxB)x/alt_verbnames,mark
- x
-
+ x
+
/(*: A \ and #comment
\ B)x/x,alt_verbnames,mark
- x
-
+ x
+
/(*: A \ and #comment
\ B)x/alt_verbnames,mark
- x
-
+ x
+
/(*: A \ and #comment
\ B)x/x,mark
- x
-
+ x
+
/(*: A \ and #comment
\ B)x/mark
- x
-
+ x
+
/(*:A
-B)x/alt_verbnames,mark
+B)x/alt_verbnames,mark
x
/(*:abc\Qpqr)/alt_verbnames
@@ -4553,7 +4553,7 @@
1234abc\=offset_limit=7
\= Expect no match
1234abc\=offset_limit=6
-
+
/A/g,replace=-,use_offset_limit
XAXAXAXAXA\=offset_limit=4
@@ -4567,16 +4567,16 @@
/abcd/null_context
abcd\=null_context
-\= Expect error
+\= Expect error
abcd\=null_context,find_limits
- abcd\=allusedtext,startchar
+ abcd\=allusedtext,startchar
/abcd/replace=w\rx\x82y\o{333}z(\Q12\$34$$\x34\E5$$),substitute_extended
abcd
-
+
/a(bc)(DE)/replace=a\u$1\U$1\E$1\l$2\L$2\Eab\Uab\LYZ\EDone,substitute_extended
abcDE
-
+
/abcd/replace=xy\kz,substitute_extended
abcd
@@ -4614,8 +4614,8 @@
/(?J)(?:(?<A>a)|(?<A>b))/replace=<$A>
[a]
- [b]
-\= Expect error
+ [b]
+\= Expect error
(a)\=ovector=1
/(a)|(b)/replace=<$1>
@@ -4640,11 +4640,11 @@
/(?=a\K)/replace=z
BaCaD
-
+
/(?'abcdefghijklmnopqrstuvwxyzABCDEFG'toolong)/
-
-/(?'abcdefghijklmnopqrstuvwxyzABCDEF'justright)/
+/(?'abcdefghijklmnopqrstuvwxyzABCDEF'justright)/
+
# These two use zero-termination
/abcd/max_pattern_length=3
@@ -4766,7 +4766,7 @@
/a|(b)c/replace=>$1<,substitute_unset_empty
cat
- xbcom
+ xbcom
/a|(b)c/
cat\=replace=>$1<
@@ -4780,26 +4780,26 @@
/a|(?'X'b)c/replace=>$X<,substitute_unset_empty
cat
- xbcom
+ xbcom
/a|(?'X'b)c/replace=>$Y<,substitute_unset_empty
cat
- cat\=substitute_unknown_unset
- cat\=substitute_unknown_unset,-substitute_unset_empty
+ cat\=substitute_unknown_unset
+ cat\=substitute_unknown_unset,-substitute_unset_empty
/a|(b)c/replace=>$2<,substitute_unset_empty
cat
- cat\=substitute_unknown_unset
- cat\=substitute_unknown_unset,-substitute_unset_empty
+ cat\=substitute_unknown_unset
+ cat\=substitute_unknown_unset,-substitute_unset_empty
/()()()/use_offset_limit
\=ovector=11000000000
\=callout_fail=11000000000
\=callout_fail=1:11000000000
- \=callout_data=11000000000
- \=callout_data=-11000000000
- \=offset_limit=1100000000000000000000
- \=copy=11000000000
+ \=callout_data=11000000000
+ \=callout_data=-11000000000
+ \=offset_limit=1100000000000000000000
+ \=copy=11000000000
/(*MARK:A\x00b)/mark
abc
@@ -4848,22 +4848,22 @@
/([ab])...(?<=\1)z/
a11az
- b11bz
+ b11bz
\= Expect no match
- b11az
-
+ b11az
+
/(?|([ab]))...(?<=\1)z/
/([ab])(\1)...(?<=\2)z/
aa11az
-
-/(a\2)(b\1)(?<=\2)/
-
+
+/(a\2)(b\1)(?<=\2)/
+
/(?<A>[ab])...(?<=\k'A')z/
a11az
- b11bz
+ b11bz
\= Expect no match
- b11az
+ b11az
/(?<A>[ab])...(?<=\k'A')(?<A>)z/dupnames
@@ -4877,9 +4877,9 @@
/'ab(?C1)c'/hex,auto_callout
abc
-
-# Perl accepts these, but gives a warning. We can't warn, so give an error.
+# Perl accepts these, but gives a warning. We can't warn, so give an error.
+
/[a-[:digit:]]+/
a-a9-a
@@ -4943,7 +4943,7 @@
"()X|((((((((()))))))((((())))))\2())((((((\2\2)))\2)(\22((((\2\2)2))\2)))(2\ZZZ)+:)Z^|91ZiZZnter(ZZ |91Z(ZZ ZZ(\r2Z( or#(\Z2(Z\Z(\2\2)2))\2Z)Z(\22Z((\Z2(Z\Z(\2\2)2))\2Z+:)Z|91Z(ZZ ZZ(\r2Z( or#(\Z2(Z\Z((Z*(\2(Z\':))\0)i|||||||||||||||loZ\2\2)2))\2Z)Z(\22Z((\Z2(Z\Z(\2\2)2))\2Z)))int \)\0nte!rnal errpr\2\\21r(2\ZZZ)+:)Z!|91Z(ZZ ZZ(\r2Z( or#(\Z2(Z\Z(\2\2)2))\2Z)Z(\22Z((\Z2(Z\Z(\2\2)2))\2Z)))int \)\0(2\ZZZ)+:)Z^|91ZiZZnter(ZZ |91Z(ZZ ZZ(\r2Z( or#(\Z2(Z\Z(\2\2)2))\2Z)Z(\22Z((\Z2(Z\Z(\2\2)2))\2Z)))int \)\0(2\ZZZ)+:)Z^)))int \)\0(2\ZZZ)+:)Z^|91ZiZZnter(ZZernZal ZZ(\r2Z( or#(\Z2(Z\Z(\2\2)2))\2Z)Z(\22Z((\Z2(Z\Z(\2\2)2))\2Z)))int \))\ZZ(\r2Z( or#(\Z2(Z\Z(\2\2)2))\2Z)Z(\22Z((\Z2(Z\Z(\2\2)))\2))))((((((\2\2))))))"I
# This checks that new code for handling groups that may match an empty string
-# works on a very large number of alternatives. This pattern used to provoke a
+# works on a very large number of alternatives. This pattern used to provoke a
# complaint that it was too complicated.
/(?:\[A|B|C|D|E|F|G|H|I|J|]{200}Z)/expand
@@ -4975,35 +4975,35 @@
//
\=ovector=7777777777
-
-# This is here because Perl matches, even though a COMMIT is encountered
-# outside of the recursion.
+# This is here because Perl matches, even though a COMMIT is encountered
+# outside of the recursion.
+
/(?1)(A(*COMMIT)|B)D/
BAXBAD
-
+
"(?1){2}(a)"B
"(?1){2,4}(a)"B
# This test differs from Perl for the first subject. Perl ends up with
-# $1 set to 'B'; PCRE2 has it unset (which I think is right).
+# $1 set to 'B'; PCRE2 has it unset (which I think is right).
/^(?:
-(?:A| (?:B|B(*ACCEPT)) (?<=(.)) D)
+(?:A| (?:B|B(*ACCEPT)) (?<=(.)) D)
(Z)
)+$/x
AZB
- AZBDZ
-
-# The first of these, when run by Perl, gives the mark 'aa', which is wrong.
+ AZBDZ
+# The first of these, when run by Perl, gives the mark 'aa', which is wrong.
+
'(?>a(*:aa))b|ac' mark
ac
'(?:a(*:aa))b|ac' mark
ac
-
+
/(R?){65}/
(R?){65}
@@ -5023,7 +5023,7 @@
/^ (?(DEFINE) (..(*ACCEPT)|...) ) (?1)$/x
\= Expect no match
abc
-
+
# Perl gives no match for this one
/(a(*MARK:m)(*ACCEPT)){0}(?1)/mark
@@ -5088,7 +5088,7 @@
/^[^a]{3,}?x/i,no_start_optimize,no_auto_possess
\= Expect no match
bbb
- cc
+ cc
/^X\S/no_start_optimize,no_auto_possess
\= Expect no match
@@ -5145,7 +5145,7 @@
/^X\V+?/no_start_optimize,no_auto_possess
\= Expect no match
X
- X\n
+ X\n
/^X\D+?/no_start_optimize,no_auto_possess
\= Expect no match
@@ -5155,17 +5155,17 @@
/^X\S+?/no_start_optimize,no_auto_possess
\= Expect no match
X
- X\n
+ X\n
/^X\W+?/no_start_optimize,no_auto_possess
\= Expect no match
X
- XX
+ XX
/^X.+?Z/no_start_optimize,no_auto_possess
\= Expect no match
XY\n
-
+
/(*CRLF)^X.+?Z/no_start_optimize,no_auto_possess
\= Expect no match
XY\r\=ps
@@ -5176,8 +5176,8 @@
X\n\r\n
X\n\rY
X\n\nY
- X\n\x{0c}Y
-
+ X\n\x{0c}Y
+
/(*BSR_ANYCRLF)^X\R+?Z/no_start_optimize,no_auto_possess
\= Expect no match
X\nX
@@ -5184,12 +5184,12 @@
X\n\r\n
X\n\rY
X\n\nY
- X\n\x{0c}Y
-
+ X\n\x{0c}Y
+
/^X\H+?Z/no_start_optimize,no_auto_possess
\= Expect no match
XY\t
- XYY
+ XYY
/^X\h+?Z/no_start_optimize,no_auto_possess
\= Expect no match
@@ -5199,7 +5199,7 @@
/^X\V+?Z/no_start_optimize,no_auto_possess
\= Expect no match
XY\n
- XYY
+ XYY
/^X\v+?Z/no_start_optimize,no_auto_possess
\= Expect no match
@@ -5209,7 +5209,7 @@
/^X\D+?Z/no_start_optimize,no_auto_possess
\= Expect no match
XY9
- XYY
+ XYY
/^X\d+?Z/no_start_optimize,no_auto_possess
\= Expect no match
@@ -5219,7 +5219,7 @@
/^X\S+?Z/no_start_optimize,no_auto_possess
\= Expect no match
XY\n
- XYY
+ XYY
/^X\s+?Z/no_start_optimize,no_auto_possess
\= Expect no match
@@ -5229,12 +5229,12 @@
/^X\W+?Z/no_start_optimize,no_auto_possess
\= Expect no match
X.A
- X++
+ X++
/^X\w+?Z/no_start_optimize,no_auto_possess
\= Expect no match
Xa.
- Xaa
+ Xaa
/^X.{1,3}Z/s,no_start_optimize,no_auto_possess
\= Expect no match
@@ -5248,12 +5248,12 @@
/^X\V+Z/no_start_optimize,no_auto_possess
\= Expect no match
XY\n
- XYY
+ XYY
/^(X(*THEN)Y|AB){0}(?1)/
ABX
\= Expect no match
- XAB
+ XAB
/^(?!A(?C1)B)C/
ABC\=callout_error=1,no_jit
@@ -5332,7 +5332,7 @@
/cat|dog/match_word
the cat sat
-\= Expect no match
+\= Expect no match
caterpillar
snowcat
syndicate
@@ -5339,7 +5339,7 @@
/(cat)|dog/match_line,literal
(cat)|dog
-\= Expect no match
+\= Expect no match
the cat sat
caterpillar
snowcat
@@ -5348,6 +5348,21 @@
/a whole line/match_line,multiline
Rhubarb \na whole line\n custard
\= Expect no match
- Not a whole line
+ Not a whole line
-# End of testinput2
+# Perl gets this wrong, failing to capture 'b' in group 1.
+
+/^(b+|a){1,2}?bc/
+ bbc
+
+# And again here, for the "babc" subject string.
+
+/^(b*|ba){1,2}?bc/
+ babc
+ bbabc
+ bababc
+\= Expect no match
+ bababbc
+ babababc
+
+# End of testinput2
Modified: code/trunk/testdata/testoutput1
===================================================================
--- code/trunk/testdata/testoutput1 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/testdata/testoutput1 2017-07-19 16:04:15 UTC (rev 842)
@@ -183,27 +183,6 @@
abbbbbbbbbbbac
No match
-/^(b+|a){1,2}?bc/
- bbc
- 0: bbc
- 1: b
-
-/^(b*|ba){1,2}?bc/
- babc
- 0: babc
- 1: ba
- bbabc
- 0: bbabc
- 1: ba
- bababc
- 0: bababc
- 1: ba
-\= Expect no match
- bababbc
-No match
- babababc
-No match
-
/^(ba|b*){1,2}?bc/
babc
0: babc
Modified: code/trunk/testdata/testoutput2
===================================================================
--- code/trunk/testdata/testoutput2 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/testdata/testoutput2 2017-07-19 16:04:15 UTC (rev 842)
@@ -1,12 +1,12 @@
# This set of tests is not Perl-compatible. It checks on special features
# of PCRE2's API, error diagnostics, and the compiled code of some patterns.
-# It also checks the non-Perl syntax that PCRE2 supports (Python, .NET,
-# Oniguruma). There are also some tests where PCRE2 and Perl differ,
-# either because PCRE2 can't be compatible, or there is a possible Perl
+# It also checks the non-Perl syntax that PCRE2 supports (Python, .NET,
+# Oniguruma). There are also some tests where PCRE2 and Perl differ,
+# either because PCRE2 can't be compatible, or there is a possible Perl
# bug.
# NOTE: This is a non-UTF set of tests. When UTF support is needed, use
-# test 5.
+# test 5.
#forbid_utf
#newline_default lf any anycrlf
@@ -823,7 +823,7 @@
No match
aaaaaa
No match
-
+
# Perl does not fail these two for the final subjects. Neither did PCRE until
# release 8.01. The problem is in backtracking into a subpattern that contains
# a recursive reference to itself. PCRE has now made these into atomic patterns.
@@ -4400,7 +4400,7 @@
Callout data = 1
0: ab
1: ab
-\= Expect no match
+\= Expect no match
aaabbb\=callout_data=-1
--->aaabbb
1 ^ ^ b
@@ -4844,7 +4844,7 @@
+2 ^ ^ b
+3 ^ ^
0: aaaab
-\= Expect no match
+\= Expect no match
aaaacb
--->aaaacb
+0 ^ a+
@@ -4912,7 +4912,7 @@
+10 ^ ^
0: defx
1: def
-\= Expect no match
+\= Expect no match
abcdefzx
--->abcdefzx
+0 ^ (
@@ -4986,7 +4986,7 @@
+10 ^ ^
0: defx
1: def
-\= Expect no match
+\= Expect no match
abcdefzx
--->abcdefzx
+0 ^ (
@@ -5102,7 +5102,7 @@
Options: auto_callout
Starting code units: a b x
Subject length lower bound = 2
-\= Expect no match
+\= Expect no match
Note: that { does NOT introduce a quantifier
--->Note: that { does NOT introduce a quantifier
+0 ^ (
@@ -5152,7 +5152,7 @@
Options: auto_callout
Starting code units: a b x
Subject length lower bound = 2
-\= Expect no match
+\= Expect no match
Note: that { does NOT introduce a quantifier
--->Note: that { does NOT introduce a quantifier
+0 ^ (
@@ -5819,7 +5819,7 @@
Number not found for group 'Z'
Copy substring 'Z' failed (-49): unknown substring
C a1 (2) A (non-unique)
-
+
/(?|(?<a>)(?<b>)(?<a>)|(?<a>)(?<b>)(?<a>))/I,dupnames
Capturing subpattern count = 3
Named capturing subpatterns:
@@ -6147,7 +6147,7 @@
No match
xyz\rabclf
No match
-
+
/^abc/Im,newline=cr
Capturing subpattern count = 0
Options: multiline
@@ -7722,13 +7722,13 @@
0: \x0d\x0afoo
\nfoo
0: \x0afoo
-
+
/^$/gm,newline=any
abc\r\rxyz
0:
- abc\n\rxyz
+ abc\n\rxyz
0:
-\= Expect no match
+\= Expect no match
abc\r\nxyz
No match
@@ -7743,7 +7743,7 @@
0+ \x0d\x0a
0: \x0d\x0a
0+
-
+
/(?m)$/g,newline=any,aftertext
abc\r\n\r\n
0:
@@ -7763,7 +7763,7 @@
/^X/m
XABC
0: X
-\= Expect no match
+\= Expect no match
XABC\=notbol
No match
@@ -7798,9 +7798,9 @@
0: xyabcabc
1: abc
\= Expect no match
- xyabc
+ xyabc
No match
-
+
/x(?-0)y/
Failed: error 126 at offset 5: a relative value of zero is not allowed
@@ -7836,9 +7836,9 @@
Y
0: Y
\= Expect no match
- abcY
+ abcY
No match
-
+
/^((?(+1)X|Y)(abc))+/B
------------------------------------------------------------------
Bra
@@ -7866,7 +7866,7 @@
1: Xabc
2: abc
\= Expect no match
- XabcXabc
+ XabcXabc
No match
/(?(-1)a)/B
@@ -7912,11 +7912,11 @@
tom-tom
0: tom-tom
1: tom
- bon-bon
+ bon-bon
0: bon-bon
1: bon
\= Expect no match
- tom-bon
+ tom-bon
No match
/\g{A/
@@ -7940,7 +7940,7 @@
>abc<
0: abc
1: abc
- >xyz<
+ >xyz<
0: xyz
1: xyz
@@ -7970,7 +7970,7 @@
1: x
2: abc
3: x
- xxyzx
+ xxyzx
0: xxyzx
1: x
2: xyz
@@ -8006,7 +8006,7 @@
2: abc
3: pqr
4: x
- xxyzx
+ xxyzx
0: xxyzx
1: x
2: xyz
@@ -8024,7 +8024,7 @@
\= Expect no match
XXXX
No match
-
+
/\H+\hY/B
------------------------------------------------------------------
Bra
@@ -8034,7 +8034,7 @@
Ket
End
------------------------------------------------------------------
- XXXX Y
+ XXXX Y
0: XXXX Y
/\H+ Y/B
@@ -8261,7 +8261,7 @@
+3 ^ ^ (*FAIL)
+3 ^^ (*FAIL)
No match
-
+
/a+b?c+(*FAIL)/auto_callout
\= Expect no match
aaabccc
@@ -8325,7 +8325,7 @@
+15 ^ ^ (*FAIL)
+15 ^ ^ (*FAIL)
No match
-
+
/a+b?(*SKIP)c+(*FAIL)/auto_callout
\= Expect no match
aaabcccaaabccc
@@ -8372,7 +8372,7 @@
+13 ^ ^ (*FAIL)
+13 ^ ^ (*FAIL)
No match
-
+
/a(*MARK)b/
Failed: error 166 at offset 7: (*MARK) must have an argument
@@ -8397,17 +8397,17 @@
\= Expect no match
\r\nA
No match
-
+
/\nA/newline=crlf
- \r\nA
+ \r\nA
0: \x0aA
/[\r\n]A/newline=crlf
- \r\nA
+ \r\nA
0: \x0aA
/(\r|\n)A/newline=crlf
- \r\nA
+ \r\nA
0: \x0aA
1: \x0a
@@ -8418,7 +8418,7 @@
a\nb
0: a\x0ab
\= Expect no match
- a\rb
+ a\rb
No match
/(*CR)a.b/newline=lf
@@ -8425,7 +8425,7 @@
a\nb
0: a\x0ab
\= Expect no match
- a\rb
+ a\rb
No match
/(*LF)a.b/newline=CRLF
@@ -8432,16 +8432,16 @@
a\rb
0: a\x0db
\= Expect no match
- a\nb
+ a\nb
No match
/(*CRLF)a.b/
a\rb
0: a\x0db
- a\nb
+ a\nb
0: a\x0ab
\= Expect no match
- a\r\nb
+ a\r\nb
No match
/(*ANYCRLF)a.b/newline=CR
@@ -8448,9 +8448,9 @@
\= Expect no match
a\rb
No match
- a\nb
+ a\nb
No match
- a\r\nb
+ a\r\nb
No match
/(*ANY)a.b/newline=cr
@@ -8457,13 +8457,13 @@
\= Expect no match
a\rb
No match
- a\nb
+ a\nb
No match
- a\r\nb
+ a\r\nb
No match
- a\x85b
+ a\x85b
No match
-
+
/(*ANY).*/g
abc\r\ndef
0: abc
@@ -8484,21 +8484,21 @@
0:
0: def
0:
-
+
/(*NUL)^.*/
a\nb\x00ccc
0: a\x0ab
-
+
/(*NUL)^.*/s
a\nb\x00ccc
0: a\x0ab\x00ccc
-
+
/^x/m,newline=NUL
ab\x00xy
0: x
-
+
/'#comment' 0d 0a 00 '^x\' 0a 'y'/x,newline=nul,hex
- x\nyz
+ x\nyz
0: x\x0ay
/(*NUL)^X\NY/
@@ -8507,7 +8507,7 @@
X\rY
0: X\x0dY
\= Expect no match
- X\x00Y
+ X\x00Y
No match
/a\Rb/I,bsr=anycrlf
@@ -8525,7 +8525,7 @@
\= Expect no match
a\x85b
No match
- a\x0bb
+ a\x0bb
No match
/a\Rb/I,bsr=unicode
@@ -8542,9 +8542,9 @@
0: a\x0d\x0ab
a\x85b
0: a\x85b
- a\x0bb
+ a\x0bb
0: a\x0bb
-
+
/a\R?b/I,bsr=anycrlf
Capturing subpattern count = 0
\R matches CR, LF, or CRLF
@@ -8560,7 +8560,7 @@
\= Expect no match
a\x85b
No match
- a\x0bb
+ a\x0bb
No match
/a\R?b/I,bsr=unicode
@@ -8577,9 +8577,9 @@
0: a\x0d\x0ab
a\x85b
0: a\x85b
- a\x0bb
+ a\x0bb
0: a\x0bb
-
+
/a\R{2,4}b/I,bsr=anycrlf
Capturing subpattern count = 0
\R matches CR, LF, or CRLF
@@ -8595,7 +8595,7 @@
\= Expect no match
a\x85\x85b
No match
- a\x0b\x0bb
+ a\x0b\x0bb
No match
/a\R{2,4}b/I,bsr=unicode
@@ -8612,12 +8612,12 @@
0: a\x0d\x0a\x0a\x0d\x0db
a\x85\x85b
0: a\x85\x85b
- a\x0b\x0bb
+ a\x0b\x0bb
0: a\x0b\x0bb
-\= Expect no match
- a\r\r\r\r\rb
+\= Expect no match
+ a\r\r\r\r\rb
No match
-
+
/(*BSR_ANYCRLF)a\Rb/I
Capturing subpattern count = 0
\R matches CR, LF, or CRLF
@@ -8626,7 +8626,7 @@
Subject length lower bound = 3
a\nb
0: a\x0ab
- a\rb
+ a\rb
0: a\x0db
/(*BSR_UNICODE)a\Rb/I
@@ -8647,7 +8647,7 @@
Subject length lower bound = 3
a\nb
0: a\x0ab
- a\rb
+ a\rb
0: a\x0db
/(*CRLF)(*BSR_UNICODE)a\Rb/I
@@ -8750,10 +8750,10 @@
/^(?+1)(?<a>x|y){0}z/
xzxx
0: xz
- yzyy
+ yzyy
0: yz
\= Expect no match
- xxz
+ xxz
No match
/(\3)(\1)(a)/
@@ -8767,13 +8767,13 @@
1:
2:
3: a
-
+
/TA]/
- The ACTA] comes
+ The ACTA] comes
0: TA]
/TA]/alt_bsux,allow_empty_class,match_unset_backref,dupnames
- The ACTA] comes
+ The ACTA] comes
0: TA]
/(?2)[]a()b](abc)/
@@ -8788,7 +8788,7 @@
abcbabc
0: abcbabc
1: abc
-\= Expect no match
+\= Expect no match
abcXabc
No match
@@ -8796,7 +8796,7 @@
abcXabc
0: abcXabc
1: abc
-\= Expect no match
+\= Expect no match
abcbabc
No match
@@ -8827,30 +8827,30 @@
/a[]+b/alt_bsux,allow_empty_class,match_unset_backref,dupnames
\= Expect no match
- ab
+ ab
No match
/a[]*+b/alt_bsux,allow_empty_class,match_unset_backref,dupnames
\= Expect no match
- ab
+ ab
No match
/a[^]b/alt_bsux,allow_empty_class,match_unset_backref,dupnames
aXb
0: aXb
- a\nb
+ a\nb
0: a\x0ab
\= Expect no match
- ab
+ ab
No match
-
+
/a[^]+b/alt_bsux,allow_empty_class,match_unset_backref,dupnames
aXb
0: aXb
- a\nX\nXb
+ a\nX\nXb
0: a\x0aX\x0aXb
\= Expect no match
- ab
+ ab
No match
/a(?!)b/B
@@ -8902,7 +8902,7 @@
+12 ^ )
+13 ^
0:
- abc
+ abc
--->abc
+0 ^ (?
+2 ^ (?=
@@ -8923,7 +8923,7 @@
+10 ^^ |
+13 ^^
0: b
-
+
/(?(?=b).*b|^d)/I
Capturing subpattern count = 0
Subject length lower bound = 1
@@ -8933,7 +8933,7 @@
Subject length lower bound = 1
/xyz/auto_callout
- xyz
+ xyz
--->xyz
+0 ^ x
+1 ^^ y
@@ -8940,7 +8940,7 @@
+2 ^ ^ z
+3 ^ ^
0: xyz
- abcxyz
+ abcxyz
--->abcxyz
+0 ^ x
+1 ^^ y
@@ -8947,14 +8947,14 @@
+2 ^ ^ z
+3 ^ ^
0: xyz
-\= Expect no match
+\= Expect no match
abc
No match
- abcxypqr
+ abcxypqr
No match
-
+
/xyz/auto_callout,no_start_optimize
- abcxyz
+ abcxyz
--->abcxyz
+0 ^ x
+0 ^ x
@@ -8964,7 +8964,7 @@
+2 ^ ^ z
+3 ^ ^
0: xyz
-\= Expect no match
+\= Expect no match
abc
--->abc
+0 ^ x
@@ -8972,7 +8972,7 @@
+0 ^ x
+0 ^ x
No match
- abcxypqr
+ abcxypqr
--->abcxypqr
+0 ^ x
+0 ^ x
@@ -8986,7 +8986,7 @@
+0 ^ x
+0 ^ x
No match
-
+
/(*NO_START_OPT)xyz/auto_callout
abcxyz
--->abcxyz
@@ -8998,7 +8998,7 @@
+17 ^ ^ z
+18 ^ ^
0: xyz
-
+
/(*NO_AUTO_POSSESS)a+b/B
------------------------------------------------------------------
Bra
@@ -9009,7 +9009,7 @@
------------------------------------------------------------------
/xyz/auto_callout,no_start_optimize
- abcxyz
+ abcxyz
--->abcxyz
+0 ^ x
+0 ^ x
@@ -9067,7 +9067,7 @@
3: c
4: d
5: Y
-
+
/Xa{2,4}b/
X\=ps
Partial match: X
@@ -9079,7 +9079,7 @@
Partial match: Xaaa
Xaaaa\=ps
Partial match: Xaaaa
-
+
/Xa{2,4}?b/
X\=ps
Partial match: X
@@ -9091,7 +9091,7 @@
Partial match: Xaaa
Xaaaa\=ps
Partial match: Xaaaa
-
+
/Xa{2,4}+b/
X\=ps
Partial match: X
@@ -9103,7 +9103,7 @@
Partial match: Xaaa
Xaaaa\=ps
Partial match: Xaaaa
-
+
/X\d{2,4}b/
X\=ps
Partial match: X
@@ -9115,7 +9115,7 @@
Partial match: X333
X3333\=ps
Partial match: X3333
-
+
/X\d{2,4}?b/
X\=ps
Partial match: X
@@ -9127,7 +9127,7 @@
Partial match: X333
X3333\=ps
Partial match: X3333
-
+
/X\d{2,4}+b/
X\=ps
Partial match: X
@@ -9139,7 +9139,7 @@
Partial match: X333
X3333\=ps
Partial match: X3333
-
+
/X\D{2,4}b/
X\=ps
Partial match: X
@@ -9151,7 +9151,7 @@
Partial match: Xaaa
Xaaaa\=ps
Partial match: Xaaaa
-
+
/X\D{2,4}?b/
X\=ps
Partial match: X
@@ -9163,7 +9163,7 @@
Partial match: Xaaa
Xaaaa\=ps
Partial match: Xaaaa
-
+
/X\D{2,4}+b/
X\=ps
Partial match: X
@@ -9175,7 +9175,7 @@
Partial match: Xaaa
Xaaaa\=ps
Partial match: Xaaaa
-
+
/X[abc]{2,4}b/
X\=ps
Partial match: X
@@ -9187,7 +9187,7 @@
Partial match: Xaaa
Xaaaa\=ps
Partial match: Xaaaa
-
+
/X[abc]{2,4}?b/
X\=ps
Partial match: X
@@ -9199,7 +9199,7 @@
Partial match: Xaaa
Xaaaa\=ps
Partial match: Xaaaa
-
+
/X[abc]{2,4}+b/
X\=ps
Partial match: X
@@ -9211,7 +9211,7 @@
Partial match: Xaaa
Xaaaa\=ps
Partial match: Xaaaa
-
+
/X[^a]{2,4}b/
X\=ps
Partial match: X
@@ -9223,7 +9223,7 @@
Partial match: Xzzz
Xzzzz\=ps
Partial match: Xzzzz
-
+
/X[^a]{2,4}?b/
X\=ps
Partial match: X
@@ -9235,7 +9235,7 @@
Partial match: Xzzz
Xzzzz\=ps
Partial match: Xzzzz
-
+
/X[^a]{2,4}+b/
X\=ps
Partial match: X
@@ -9247,7 +9247,7 @@
Partial match: Xzzz
Xzzzz\=ps
Partial match: Xzzzz
-
+
/(Y)X\1{2,4}b/
YX\=ps
Partial match: YX
@@ -9259,7 +9259,7 @@
Partial match: YXYYY
YXYYYY\=ps
Partial match: YXYYYY
-
+
/(Y)X\1{2,4}?b/
YX\=ps
Partial match: YX
@@ -9271,7 +9271,7 @@
Partial match: YXYYY
YXYYYY\=ps
Partial match: YXYYYY
-
+
/(Y)X\1{2,4}+b/
YX\=ps
Partial match: YX
@@ -9283,7 +9283,7 @@
Partial match: YXYYY
YXYYYY\=ps
Partial match: YXYYYY
-
+
/\++\KZ|\d+X|9+Y/startchar
++++123999\=ps
Partial match: 123999
@@ -9299,7 +9299,7 @@
No match
ZA\=ps
No match
-
+
/Z(?!)/
\= Expect no match
Z\=ps
@@ -9312,7 +9312,7 @@
0: dog
dogs\=ph
Partial match: dogs
-
+
/dog(sbody)??/
dogs\=ps
0: dog
@@ -9324,7 +9324,7 @@
0: dog
dogs\=ph
0: dog
-
+
/dogsbody|dog/
dogs\=ps
0: dog
@@ -9342,7 +9342,7 @@
0: abc
abc\=ph
0: abc
-
+
/abc\K123/startchar
xyzabc123pqr
0: abc123
@@ -9351,9 +9351,9 @@
Partial match: abc12
xyzabc12\=ph
Partial match: abc12
-
+
/(?<=abc)123/
- xyzabc123pqr
+ xyzabc123pqr
0: 123
xyzabc12\=ps
Partial match: abc12
@@ -9458,7 +9458,7 @@
No match
xyzabcdef\=notempty
No match
-
+
/^(?:(?=abc)|abc\K)/aftertext,startchar
abcdef
0:
@@ -9467,7 +9467,7 @@
0: abc
^^^
0+ def
-\= Expect no match
+\= Expect no match
abcdef\=notempty
No match
@@ -9487,7 +9487,7 @@
xyz\=notempty_atstart
0:
0+ yz
-\= Expect no match
+\= Expect no match
xyz\=notempty
No match
@@ -9498,7 +9498,7 @@
xyzabc
0:
0+ xyzabc
-\= Expect no match
+\= Expect no match
xyzabc\=notempty
No match
xyzabc\=notempty_atstart
@@ -9507,7 +9507,7 @@
No match
xyz\=notempty
No match
-
+
/^(?<name>a|b\g<name>c)/
aaaa
0: a
@@ -9515,7 +9515,7 @@
bacxxx
0: bac
1: bac
- bbaccxxx
+ bbaccxxx
0: bbacc
1: bbacc
bbbacccxx
@@ -9529,7 +9529,7 @@
bacxxx
0: bac
1: bac
- bbaccxxx
+ bbaccxxx
0: bbacc
1: bbacc
bbbacccxx
@@ -9543,7 +9543,7 @@
bacxxx
0: bac
1: bac
- bbaccxxx
+ bbaccxxx
0: bbacc
1: bbacc
bbbacccxx
@@ -9557,7 +9557,7 @@
bacxxx
0: bac
1: bac
- bbaccxxx
+ bbaccxxx
0: bbacc
1: bbacc
bbbacccxx
@@ -9571,7 +9571,7 @@
bacxxx
0: bac
1: bac
- bbaccxxx
+ bbaccxxx
0: bbacc
1: bbacc
bbbacccxx
@@ -9587,7 +9587,7 @@
0: bac
1: bac
2: bac
- bbaccxxx
+ bbaccxxx
0: bbacc
1: bbacc
2: bbacc
@@ -9600,7 +9600,7 @@
XaaX
0: aa
1: a
- XAAX
+ XAAX
0: AA
1: A
@@ -9608,8 +9608,8 @@
XaaX
0: aa
1: a
-\= Expect no match
- XAAX
+\= Expect no match
+ XAAX
No match
/(?-i:\g<+1>)(?i:(a))/
@@ -9616,7 +9616,7 @@
XaaX
0: aa
1: a
- XAAX
+ XAAX
0: AA
1: A
@@ -9626,7 +9626,7 @@
abc
0: abc
1: a
- accccbbb
+ accccbbb
0: accccbbb
1: a
@@ -9645,7 +9645,7 @@
xbaax
0: a
1: a
- xzzzax
+ xzzzax
0: a
1: a
@@ -9762,7 +9762,7 @@
(?: [0-9a-f]{1,4} | # 1-4 hex digits or
(?(1)0 | () ) ) # if null previously matched, fail; else null
: # followed by colon
- ){1,7} # end item; 1-7 of them required
+ ){1,7} # end item; 1-7 of them required
[0-9a-f]{1,4} $ # final hex number at end of string
(?(1)|.) # check that there was an empty component
/Iix
@@ -9792,7 +9792,7 @@
Failed: error 165 at offset 16: different names for subpatterns of the same number are not allowed
/(?:a(?<quote> (?<apostrophe>')|(?<realquote>")) |
- b(?<quote> (?<apostrophe>')|(?<realquote>")) )
+ b(?<quote> (?<apostrophe>')|(?<realquote>")) )
(?('quote')[a-z]+|[0-9]+)/Ix,dupnames
Capturing subpattern count = 6
Max back reference = 4
@@ -9811,7 +9811,7 @@
1: "
2: <unset>
3: "
- b"aaaaa
+ b"aaaaa
0: b"aaaaa
1: <unset>
2: <unset>
@@ -9819,12 +9819,12 @@
4: "
5: <unset>
6: "
-\= Expect no match
+\= Expect no match
b"11111
No match
- a"11111
+ a"11111
No match
-
+
/^(?|(a)(b)(c)(?<D>d)|(?<D>e)) (?('D')X|Y)/IBx,dupnames
------------------------------------------------------------------
Bra
@@ -9877,9 +9877,9 @@
\= Expect no match
abcdY
No match
- ey
+ ey
No match
-
+
/(?<A>a) (b)(c) (?<A>d (?(R&A)$ | (?4)) )/IBx,dupnames
------------------------------------------------------------------
Bra
@@ -9920,7 +9920,7 @@
3: c
4: dd
\= Expect no match
- abcdde
+ abcdde
No match
/abcd*/
@@ -9994,7 +9994,7 @@
Subject length lower bound = 1
i
0: i
-
+
/()i(?(1)a)/I
Capturing subpattern count = 1
Max back reference = 1
@@ -10018,10 +10018,10 @@
0: ab
XAbX
0: Ab
- CcC
+ CcC
0: c
\= Expect no match
- XABX
+ XABX
No match
/(?i)a(?s)b|c/B
@@ -10081,7 +10081,7 @@
0: xabcxd
1: abcxd
2: cx
-
+
/^(?&t)*+(?(DEFINE)(?<t>.))$/B
------------------------------------------------------------------
Bra
@@ -10122,9 +10122,9 @@
# This one is here because Perl gives the match as "b" rather than "ab". I
# believe this to be a Perl bug.
-
+
/(?>a\Kb)z|(ab)/
- ab\=startchar
+ ab\=startchar
0: ab
1: ab
@@ -10133,7 +10133,7 @@
0:
1:
2:
- 0abc
+ 0abc
0: 0
1: 0
2: 0
@@ -10147,7 +10147,7 @@
/abc(*FAIL:123)xyz/
Failed: error 159 at offset 10: an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)
-# This should, and does, fail. In Perl, it does not, which I think is a
+# This should, and does, fail. In Perl, it does not, which I think is a
# bug because replacing the B in the pattern by (B|D) does make it fail.
/A(*COMMIT)B/aftertext,mark
@@ -10166,7 +10166,7 @@
\= Expect no match
AC
No match
-
+
# Mark names can be duplicated. Perl doesn't give a mark for this one,
# though PCRE2 does.
@@ -10174,8 +10174,8 @@
\= Expect no match
XAQQ
No match, mark = A
-
-# COMMIT at the start of a pattern should be the same as an anchor. Perl
+
+# COMMIT at the start of a pattern should be the same as an anchor. Perl
# optimizations defeat this. So does the PCRE2 optimization unless we disable
# it.
@@ -10182,27 +10182,27 @@
/(*COMMIT)ABC/
ABCDEFG
0: ABC
-
+
/(*COMMIT)ABC/no_start_optimize
\= Expect no match
DEFGABC
No match
-
+
/^(ab (c+(*THEN)cd) | xyz)/x
\= Expect no match
- abcccd
+ abcccd
No match
/^(ab (c+(*PRUNE)cd) | xyz)/x
\= Expect no match
- abcccd
+ abcccd
No match
/^(ab (c+(*FAIL)cd) | xyz)/x
\= Expect no match
- abcccd
+ abcccd
No match
-
+
# Perl gets some of these wrong
/(?>.(*ACCEPT))*?5/
@@ -10239,7 +10239,7 @@
\= Expect no match
A\nB
No match
- ACB\n
+ ACB\n
No match
/A\NB./Bs
@@ -10254,12 +10254,12 @@
------------------------------------------------------------------
ACBD
0: ACBD
- ACB\n
+ ACB\n
0: ACB\x0a
\= Expect no match
- A\nB
+ A\nB
No match
-
+
/A\NB/newline=crlf
A\nB
0: A\x0aB
@@ -10266,7 +10266,7 @@
A\rB
0: A\x0dB
\= Expect no match
- A\r\nB
+ A\r\nB
No match
/\R+b/B
@@ -10444,7 +10444,7 @@
\= Bad offsets
abc\=offset=4
Failed: error -33: bad offset value
- abc\=offset=-4
+ abc\=offset=-4
** Invalid value in 'offset=-4'
\= Valid data
abc\=offset=0
@@ -10507,7 +10507,7 @@
End
------------------------------------------------------------------
-# These tests are here because Perl gets the first one wrong.
+# These tests are here because Perl gets the first one wrong.
/(\R*)(.)/s
\r\n
@@ -10514,11 +10514,11 @@
0: \x0d
1:
2: \x0d
- \r\r\n\n\r
+ \r\r\n\n\r
0: \x0d\x0d\x0a\x0a\x0d
1: \x0d\x0d\x0a\x0a
2: \x0d
- \r\r\n\n\r\n
+ \r\r\n\n\r\n
0: \x0d\x0d\x0a\x0a\x0d
1: \x0d\x0d\x0a\x0a
2: \x0d
@@ -10528,11 +10528,11 @@
0: \x0d
1: <unset>
2: \x0d
- \r\r\n\n\r
+ \r\r\n\n\r
0: \x0d\x0d\x0a\x0a\x0d
1: \x0a
2: \x0d
- \r\r\n\n\r\n
+ \r\r\n\n\r\n
0: \x0d\x0d\x0a\x0a\x0d
1: \x0a
2: \x0d
@@ -10542,16 +10542,16 @@
0: \x0d
1:
2: \x0d
- \r\r\n\n\r
+ \r\r\n\n\r
0: \x0d\x0d\x0a\x0a\x0d
1: \x0d\x0d\x0a\x0a
2: \x0d
- \r\r\n\n\r\n
+ \r\r\n\n\r\n
0: \x0d\x0d\x0a\x0a\x0d
1: \x0d\x0d\x0a\x0a
2: \x0d
-# -------------
+# -------------
/^abc$/B
------------------------------------------------------------------
@@ -10578,7 +10578,7 @@
0: aaaaX
1: a
2: X
-\= Expect no match
+\= Expect no match
aaaa
No match
@@ -10586,7 +10586,7 @@
aaaaX
0: aaaaX
1: X
-\= Expect no match
+\= Expect no match
aaaa
No match
@@ -10765,7 +10765,7 @@
/(abc)\1+/
-# Perl doesn't get these right IMO (the 3rd is PCRE2-specific)
+# Perl doesn't get these right IMO (the 3rd is PCRE2-specific)
/(?1)(?:(b(*ACCEPT))){0}/
b
@@ -10774,8 +10774,8 @@
/(?1)(?:(b(*ACCEPT))){0}c/
bc
0: bc
-\= Expect no match
- b
+\= Expect no match
+ b
No match
/(?1)(?:((*ACCEPT))){0}c/
@@ -10785,7 +10785,7 @@
0: c
/^.*?(?(?=a)a|b(*THEN)c)/
-\= Expect no match
+\= Expect no match
ba
No match
@@ -10794,20 +10794,20 @@
0: ba
/^.*?(?(?=a)a(*THEN)b|c)/
-\= Expect no match
+\= Expect no match
ac
No match
/^.*?(?(?=a)a(*THEN)b)c/
-\= Expect no match
+\= Expect no match
ac
No match
/^.*?(a(*THEN)b)c/
-\= Expect no match
+\= Expect no match
aabc
No match
-
+
/^.*? (?1) c (?(DEFINE)(a(*THEN)b))/x
aabc
0: aabc
@@ -10830,12 +10830,12 @@
0: C
1: C
MK: A
-\= Expect no match
+\= Expect no match
D
No match, mark = A
-
+
/(*:A)A+(*SKIP:A)(B|Z)/mark
-\= Expect no match
+\= Expect no match
AAAC
No match, mark = A
@@ -10846,17 +10846,17 @@
0: c
c\=notempty
0: c
-
+
/(?1)c(?(DEFINE)((*ACCEPT)b))/
c
0: c
c\=notempty
0: c
-
+
/(?>(*ACCEPT)b)c/
c
0:
-\= Expect no match
+\= Expect no match
c\=notempty
No match
@@ -10871,7 +10871,7 @@
ac\=ovector=1
0: ac
0+
-
+
/(a)(b)x|abc/allaftertext
abc\=ovector=2
0: abc
@@ -10944,7 +10944,7 @@
1: <unset>
2: <unset>
3: baz
- foobarbazX
+ foobarbazX
0: bazX
1: <unset>
2: <unset>
@@ -11260,7 +11260,7 @@
0: aaaazzzzb
1: zzzz
\= Expect no match
- aazz
+ aazz
No match
/(.)(\1|a(?2))/
@@ -11268,15 +11268,15 @@
0: bab
1: b
2: ab
-
+
/\1|(.)(?R)\1/
cbbbc
0: cbbbc
1: c
-
+
/(.)((?(1)c|a)|a(?2))/
\= Expect no match
- baa
+ baa
No match
/(?P<abn>(?P=abn)xxx)/B
@@ -11386,7 +11386,7 @@
/a[\NB]c/
Failed: error 171 at offset 4: \N is not supported in a class
aNc
-
+
/a[B-\Nc]/
Failed: error 150 at offset 6: invalid range in character class
@@ -11400,7 +11400,7 @@
# This test, with something more complicated than individual letters, causes
# different behaviour in Perl. Perhaps it disables some optimization; no tag is
# passed back for the failures, whereas in PCRE2 there is a tag.
-
+
/(A|P)(*:A)(B|P) | (X|P)(X|P)(*:B)(Y|P)/x,mark
AABC
0: AB
@@ -11407,7 +11407,7 @@
1: A
2: B
MK: A
- XXYZ
+ XXYZ
0: XXY
1: <unset>
2: <unset>
@@ -11416,40 +11416,40 @@
5: Y
MK: B
\= Expect no match
- XAQQ
+ XAQQ
No match, mark = A
- XAQQXZZ
+ XAQQXZZ
No match, mark = A
- AXQQQ
+ AXQQQ
No match, mark = A
- AXXQQQ
+ AXXQQQ
No match, mark = B
# Perl doesn't give marks for these, though it does if the alternatives are
-# replaced by single letters.
-
+# replaced by single letters.
+
/(b|q)(*:m)f|a(*:n)w/mark
- aw
+ aw
0: aw
MK: n
-\= Expect no match
+\= Expect no match
abc
No match, mark = m
/(q|b)(*:m)f|a(*:n)w/mark
- aw
+ aw
0: aw
MK: n
-\= Expect no match
+\= Expect no match
abc
No match, mark = m
-# After a partial match, the behaviour is as for a failure.
+# After a partial match, the behaviour is as for a failure.
/^a(*:X)bcde/mark
abc\=ps
Partial match, mark=X: abc
-
+
# These are here because Perl doesn't return a mark, except for the first.
/(?=(*:x))(q|)/aftertext,mark
@@ -11579,7 +11579,7 @@
abababx
0: abababx
1: ab
- ababababx
+ ababababx
0: ababababx
1: ab
@@ -11593,10 +11593,10 @@
abababx
0: abababx
1: ab
- ababababx
+ ababababx
0: ababababx
1: ab
-
+
/^(..)(\1{2,3})ab/
abababab
0: abababab
@@ -11608,7 +11608,7 @@
0: \x0d
\r\=ph
Partial match: \x0d
-
+
/^\R{2,3}x/
\r\=ps
Partial match: \x0d
@@ -11624,7 +11624,7 @@
Partial match: \x0d\x0d\x0d
\r\rx
0: \x0d\x0dx
- \r\r\rx
+ \r\r\rx
0: \x0d\x0d\x0dx
/^\R{2,3}?x/
@@ -11642,9 +11642,9 @@
Partial match: \x0d\x0d\x0d
\r\rx
0: \x0d\x0dx
- \r\r\rx
+ \r\r\rx
0: \x0d\x0d\x0dx
-
+
/^\R?x/
\r\=ps
Partial match: \x0d
@@ -11652,7 +11652,7 @@
Partial match: \x0d
x
0: x
- \rx
+ \rx
0: \x0dx
/^\R+x/
@@ -11664,7 +11664,7 @@
Partial match: \x0d\x0a
\r\n\=ph
Partial match: \x0d\x0a
- \rx
+ \rx
0: \x0dx
/^a$/newline=crlf
@@ -11698,7 +11698,7 @@
0: \x0d
\r\=ph
Partial match: \x0d
-
+
/.{2,3}/newline=crlf
\r\=ps
Partial match: \x0d
@@ -11731,9 +11731,9 @@
ABCDGHI\=ovector=01
Matched, but too many substrings
0: ABCD
-
+
# These are all run as real matches in test 1; here we are just checking the
-# settings of the anchored and startline bits.
+# settings of the anchored and startline bits.
/(?>.*?a)(?<=ba)/I
Capturing subpattern count = 0
@@ -11845,7 +11845,7 @@
--->aab
^ ^ b
0: aab
-
+
/(?:(a)++(?C1)bb|aa(?C2)b)/
aab\=callout_capture
Callout 1: last capture = 1
@@ -11856,7 +11856,7 @@
--->aab
^ ^ b
0: aab
-
+
/(?:(?>(a))(?C1)bb|aa(?C2)b)/
aab\=callout_capture
Callout 1: last capture = 1
@@ -11926,7 +11926,7 @@
0: ab
ab\=ovector=1
0: ab
-
+
/(?<=123)(*MARK:xx)abc/mark
xxxx123a\=ph
Partial match, mark=xx: 123a
@@ -11934,7 +11934,7 @@
xxxx123a\=ps
Partial match, mark=xx: 123a
<<<
-
+
/123\Kabc/startchar
xxxx123a\=ph
Partial match: 123a
@@ -11972,18 +11972,18 @@
/aaaaa(*COMMIT)(*PRUNE)b|a+c/
aaaaaac
0: aaaac
-
+
# Here are some that Perl treats differently because of the way it handles
-# backtracking verbs.
+# backtracking verbs.
/(?!a(*COMMIT)b)ac|ad/
ac
0: ac
- ad
+ ad
0: ad
/^(?!a(*THEN)b|ac)../
- ad
+ ad
0: ad
\= Expect no match
ac
@@ -11992,7 +11992,7 @@
/^(?=a(*THEN)b|ac)/
ac
0:
-
+
/\A.*?(?:a|b(*THEN)c)/
ba
0: ba
@@ -12006,7 +12006,7 @@
0: ba
/(?:(a(*MARK:X)a+(*SKIP:X)b)){0}(?:(?1)|aac)/
- aac
+ aac
0: aac
/\A.*?(a|b(*THEN)c)/
@@ -12015,10 +12015,10 @@
1: a
/^(A(*THEN)B|A(*THEN)D)/
- AD
+ AD
0: AD
1: AD
-
+
/(?!b(*THEN)a)bn|bnn/
bnn
0: bn
@@ -12031,7 +12031,7 @@
bnn
0: bn
-# This test causes a segfault with Perl 5.18.0
+# This test causes a segfault with Perl 5.18.0
/^(?=(a)){0}b(?1)/
backgammon
@@ -13162,7 +13162,7 @@
Last code unit = 'd'
Subject length lower bound = 1
-# End of special auto-possessive tests
+# End of special auto-possessive tests
/^A\o{1239}B/
Failed: error 164 at offset 8: non-octal character in \o{} (closing brace missing?)
@@ -13170,7 +13170,7 @@
/^A\oB/
Failed: error 155 at offset 4: missing opening brace after \o
-
+
/^A\x{zz}B/
Failed: error 167 at offset 5: non-hex character in \x{} (closing brace missing?)
@@ -13332,11 +13332,11 @@
------------------------------------------------------------------
little red riding hood
0: red
- a /red/ thing
+ a /red/ thing
0: red
red is a colour
0: red
- put it all on red
+ put it all on red
0: red
\= Expect no match
no reduction
@@ -13343,7 +13343,7 @@
No match
Alfred Winifred
No match
-
+
/[a[:<:]] should give error/
Failed: error 130 at offset 4: unknown POSIX class name
@@ -13357,7 +13357,7 @@
\= Expect no match
xx\nxabcd
No match
-
+
# Test stack guard external calls.
/(((a)))/stackguard=1
@@ -13411,9 +13411,9 @@
/A\9B/
Failed: error 115 at offset 2: reference to non-existent subpattern
-# This one is here because Perl fails to match "12" for this pattern when the $
+# This one is here because Perl fails to match "12" for this pattern when the $
# is present.
-
+
/^(?(?=abc)\w{3}:|\d\d)$/
abc:
0: abc:
@@ -13422,10 +13422,10 @@
\= Expect no match
123
No match
- xyz
+ xyz
No match
-# Perl gets this one wrong, giving "a" as the after text for ca and failing to
+# Perl gets this one wrong, giving "a" as the after text for ca and failing to
# match for cd.
/(?(?=ab)ab)/aftertext
@@ -13435,12 +13435,12 @@
ca
0:
0+ ca
- cd
+ cd
0:
0+ cd
-
-# This should test both paths for processing OP_RECURSE.
+# This should test both paths for processing OP_RECURSE.
+
/(?(R)a+|(?R)b)/
aaaabcde
0: aaaab
@@ -13456,7 +13456,7 @@
0: a
ba
0: b
- cb
+ cb
0: b
/(*NOTEMPTY_ATSTART)a*?b*?/aftertext
@@ -13463,7 +13463,7 @@
ab
0: a
0+ b
- cdab
+ cdab
0:
0+ dab
@@ -13472,7 +13472,7 @@
Subject length lower bound = 2
yesno
0: yes
-
+
/(?(VERSION=8)yes){3}/BI,aftertext
------------------------------------------------------------------
Bra
@@ -13496,7 +13496,7 @@
yesnononoyes
0: nonono
\= Expect no match
- yesno
+ yesno
No match
/(?:(?<VERSION>abc)|xyz)(?(VERSION)yes|no)/I
@@ -13514,7 +13514,7 @@
\= Expect no match
abcno
No match
- xyzyes
+ xyzyes
No match
/(?(VERSION<10)yes|no)/
@@ -13548,7 +13548,7 @@
abd
0: abd
1: ab
- xyd
+ xyd
0: d
/(|ab)*?d/I,no_start_optimize
@@ -13558,7 +13558,7 @@
abd
0: abd
1: ab
- xyd
+ xyd
0: d
/\k<A>*(?<A>aa)(?<A>bb)/match_unset_backref,dupnames
@@ -13645,7 +13645,7 @@
/abc/replace=[9]XYZ
123abc123
Failed: error -48: no more memory
-
+
/abc/replace=xyz
1abc2\=partial_hard
Failed: error -34: bad option value
@@ -13663,29 +13663,29 @@
/(?<=abc)(|def)/g,replace=<$0>
123abcxyzabcdef789abcpqr
4: 123abc<>xyzabc<><def>789abc<>pqr
-
+
/./replace=$0
a
1: a
-
+
/(.)(.)/replace=$2+$1
abc
1: b+ac
-
+
/(?<A>.)(?<B>.)/replace=$B+$A
abc
1: b+ac
-
+
/(.)(.)/g,replace=$2$1
- abcdefgh
+ abcdefgh
4: badcfehg
-
+
/(*:pear)apple|(*:orange)lemon|(*:strawberry)blackberry/g,replace=${*MARK}
apple lemon blackberry
3: pear orange strawberry
apple strudel
1: pear strudel
- fruitless
+ fruitless
0: fruitless
/(*:pear)apple|(*:orange)lemon|(*:strawberry)blackberry/replace=${*MARK} sauce,
@@ -13697,10 +13697,10 @@
3: <pear> <orange> <strawberry>
apple strudel
1: <pear> strudel
- fruitless
+ fruitless
0: fruitless
-
-/(*:pear)apple/g,replace=${*MARKING}
+
+/(*:pear)apple/g,replace=${*MARKING}
apple lemon blackberry
Failed: error -35 at offset 11 in replacement: invalid replacement string
@@ -13708,7 +13708,7 @@
apple lemon blackberry
Failed: error -58 at offset 7 in replacement: expected closing curly bracket in replacement string
-/(*:pear)apple/g,replace=${*mark}
+/(*:pear)apple/g,replace=${*mark}
apple lemon blackberry
Failed: error -35 at offset 8 in replacement: invalid replacement string
@@ -13772,13 +13772,13 @@
Get substring 4 failed (-49): unknown substring
0L c
1L
-
+
/x(?=ab\K)/
- xab\=get=0
+ xab\=get=0
Start of matched string is beyond its end - displaying from end to start.
0: ab
0G (0)
- xab\=copy=0
+ xab\=copy=0
Start of matched string is beyond its end - displaying from end to start.
0: ab
0C (0)
@@ -13944,7 +13944,7 @@
456
0: 456
\= Expect no match
- 356
+ 356
No match
'^(a)*+(\w)'
@@ -13952,7 +13952,7 @@
0: g
1: <unset>
2: g
- g\=ovector=1
+ g\=ovector=1
Matched, but too many substrings
0: g
@@ -13960,10 +13960,10 @@
g
0: g
1: g
- g\=ovector=1
+ g\=ovector=1
Matched, but too many substrings
0: g
-
+
# These two pattern showeds up compile-time bugs
"((?2){0,1999}())?"
@@ -14135,7 +14135,7 @@
--->abcdefg
25 ^ (?=
0: abcd
- xyz123
+ xyz123
--->xyz123
25 ^ (?=
0: xyz
@@ -14161,7 +14161,7 @@
--->abcdefg
^ (?=
0: abcd
- xyz123
+ xyz123
Callout (7): $abc$
--->xyz123
^ (?=
@@ -14205,8 +14205,8 @@
/(?(?!)a|b)/
bbb
0: b
-\= Expect no match
- aaa
+\= Expect no match
+ aaa
No match
# JIT gives a different error message for the infinite recursion
@@ -14308,9 +14308,9 @@
\= Expect no match
\[9x!xxx(]{9999}
No match
-
+
/(abc)*/
- \[abc]{5}
+ \[abc]{5}
0: abcabcabcabcabc
1: abc
@@ -14356,7 +14356,7 @@
/A\8B\9C/
Failed: error 115 at offset 2: reference to non-existent subpattern
A8B9C
-
+
/(?x:((?'a')) # comment (with parentheses) and | vertical
(?-x:#not a comment (?'b')) # this is a comment ()
(?'c')) # not a comment (?'d')/info
@@ -14384,7 +14384,7 @@
1:
2: 2
3:
- B32A
+ B32A
0: 3
1:
2:
@@ -14391,7 +14391,7 @@
3: 3
# These are some patterns that used to cause buffer overflows or other errors
-# while compiling.
+# while compiling.
/.((?2)(?R)|\1|$)()/B
------------------------------------------------------------------
@@ -14623,7 +14623,7 @@
0: {4,5a}bc
/\x0{ab}/
- \0{ab}
+ \0{ab}
0: \x00{ab}
/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-02}Z/
@@ -14683,9 +14683,9 @@
aacb
No match
-/(*MARK:a\zb)z/alt_verbnames
+/(*MARK:a\zb)z/alt_verbnames
Failed: error 140 at offset 10: invalid escape sequence in (*VERB) name
-
+
/(*:ab\t(d\)c)xxx/
Failed: error 122 at offset 12: unmatched closing parenthesis
@@ -14698,38 +14698,38 @@
x
0: x
MK: Axx)xB
-
+
/(*:A\ExxxB)x/alt_verbnames,mark
- x
+ x
0: x
MK: AxxxB
-
+
/(*: A \ and #comment
\ B)x/x,alt_verbnames,mark
- x
+ x
0: x
MK: A and B
-
+
/(*: A \ and #comment
\ B)x/alt_verbnames,mark
- x
+ x
0: x
MK: A and #comment\x0a B
-
+
/(*: A \ and #comment
\ B)x/x,mark
- x
+ x
0: x
MK: A \ and #comment\x0a \ B
-
+
/(*: A \ and #comment
\ B)x/mark
- x
+ x
0: x
MK: A \ and #comment\x0a \ B
-
+
/(*:A
-B)x/alt_verbnames,mark
+B)x/alt_verbnames,mark
x
0: x
MK: A\x0aB
@@ -14758,7 +14758,7 @@
\= Expect no match
1234abc\=offset_limit=6
No match
-
+
/A/g,replace=-,use_offset_limit
XAXAXAXAXA\=offset_limit=4
2: X-X-XAXAXA
@@ -14777,20 +14777,20 @@
/abcd/null_context
abcd\=null_context
0: abcd
-\= Expect error
+\= Expect error
abcd\=null_context,find_limits
** Not allowed together: find_limits null_context
- abcd\=allusedtext,startchar
+ abcd\=allusedtext,startchar
** Not allowed together: allusedtext startchar
/abcd/replace=w\rx\x82y\o{333}z(\Q12\$34$$\x34\E5$$),substitute_extended
abcd
1: w\x0dx\x82y\xdbz(12\$34$$\x345$)
-
+
/a(bc)(DE)/replace=a\u$1\U$1\E$1\l$2\L$2\Eab\Uab\LYZ\EDone,substitute_extended
abcDE
1: aBcBCbcdEdeabAByzDone
-
+
/abcd/replace=xy\kz,substitute_extended
abcd
Failed: error -57 at offset 4 in replacement: bad escape sequence in replacement string
@@ -14844,9 +14844,9 @@
/(?J)(?:(?<A>a)|(?<A>b))/replace=<$A>
[a]
1: [<a>]
- [b]
+ [b]
1: [<b>]
-\= Expect error
+\= Expect error
(a)\=ovector=1
Failed: error -54 at offset 3 in replacement: requested value is not available
@@ -14890,12 +14890,12 @@
/(?=a\K)/replace=z
BaCaD
Failed: error -60: match with end before start is not supported
-
+
/(?'abcdefghijklmnopqrstuvwxyzABCDEFG'toolong)/
Failed: error 148 at offset 36: subpattern name is too long (maximum 32 characters)
-
-/(?'abcdefghijklmnopqrstuvwxyzABCDEF'justright)/
+/(?'abcdefghijklmnopqrstuvwxyzABCDEF'justright)/
+
# These two use zero-termination
/abcd/max_pattern_length=3
Failed: error 188 at offset 0: pattern string is longer than the limit set by the application
@@ -15246,7 +15246,7 @@
/a|(b)c/replace=>$1<,substitute_unset_empty
cat
1: c><t
- xbcom
+ xbcom
1: x>b<om
/a|(b)c/
@@ -15268,23 +15268,23 @@
/a|(?'X'b)c/replace=>$X<,substitute_unset_empty
cat
1: c><t
- xbcom
+ xbcom
1: x>b<om
/a|(?'X'b)c/replace=>$Y<,substitute_unset_empty
cat
Failed: error -49 at offset 3 in replacement: unknown substring
- cat\=substitute_unknown_unset
+ cat\=substitute_unknown_unset
1: c><t
- cat\=substitute_unknown_unset,-substitute_unset_empty
+ cat\=substitute_unknown_unset,-substitute_unset_empty
Failed: error -55 at offset 3 in replacement: requested value is not set
/a|(b)c/replace=>$2<,substitute_unset_empty
cat
Failed: error -49 at offset 3 in replacement: unknown substring
- cat\=substitute_unknown_unset
+ cat\=substitute_unknown_unset
1: c><t
- cat\=substitute_unknown_unset,-substitute_unset_empty
+ cat\=substitute_unknown_unset,-substitute_unset_empty
Failed: error -55 at offset 3 in replacement: requested value is not set
/()()()/use_offset_limit
@@ -15294,13 +15294,13 @@
** Invalid value in 'callout_fail=11000000000'
\=callout_fail=1:11000000000
** Invalid value in 'callout_fail=1:11000000000'
- \=callout_data=11000000000
+ \=callout_data=11000000000
** Invalid value in 'callout_data=11000000000'
- \=callout_data=-11000000000
+ \=callout_data=-11000000000
** Invalid value in 'callout_data=-11000000000'
- \=offset_limit=1100000000000000000000
+ \=offset_limit=1100000000000000000000
** Invalid value in 'offset_limit=1100000000000000000000'
- \=copy=11000000000
+ \=copy=11000000000
** Invalid value in 'copy=11000000000'
/(*MARK:A\x00b)/mark
@@ -15380,13 +15380,13 @@
a11az
0: a11az
1: a
- b11bz
+ b11bz
0: b11bz
1: b
\= Expect no match
- b11az
+ b11az
No match
-
+
/(?|([ab]))...(?<=\1)z/
Failed: error 125 at offset 13: lookbehind assertion is not fixed length
@@ -15395,19 +15395,19 @@
0: aa11az
1: a
2: a
-
-/(a\2)(b\1)(?<=\2)/
+
+/(a\2)(b\1)(?<=\2)/
Failed: error 125 at offset 10: lookbehind assertion is not fixed length
-
+
/(?<A>[ab])...(?<=\k'A')z/
a11az
0: a11az
1: a
- b11bz
+ b11bz
0: b11bz
1: b
\= Expect no match
- b11az
+ b11az
No match
/(?<A>[ab])...(?<=\k'A')(?<A>)z/dupnames
@@ -15439,9 +15439,9 @@
1 ^ ^ c
+8 ^ ^
0: abc
-
-# Perl accepts these, but gives a warning. We can't warn, so give an error.
+# Perl accepts these, but gives a warning. We can't warn, so give an error.
+
/[a-[:digit:]]+/
Failed: error 150 at offset 4: invalid range in character class
a-a9-a
@@ -15567,7 +15567,7 @@
Subject length lower bound = 1
# This checks that new code for handling groups that may match an empty string
-# works on a very large number of alternatives. This pattern used to provoke a
+# works on a very large number of alternatives. This pattern used to provoke a
# complaint that it was too complicated.
/(?:\[A|B|C|D|E|F|G|H|I|J|]{200}Z)/expand
@@ -15630,14 +15630,14 @@
//
\=ovector=7777777777
** Invalid value in 'ovector=7777777777'
-
-# This is here because Perl matches, even though a COMMIT is encountered
-# outside of the recursion.
+# This is here because Perl matches, even though a COMMIT is encountered
+# outside of the recursion.
+
/(?1)(A(*COMMIT)|B)D/
BAXBAD
No match
-
+
"(?1){2}(a)"B
------------------------------------------------------------------
Bra
@@ -15673,10 +15673,10 @@
------------------------------------------------------------------
# This test differs from Perl for the first subject. Perl ends up with
-# $1 set to 'B'; PCRE2 has it unset (which I think is right).
+# $1 set to 'B'; PCRE2 has it unset (which I think is right).
/^(?:
-(?:A| (?:B|B(*ACCEPT)) (?<=(.)) D)
+(?:A| (?:B|B(*ACCEPT)) (?<=(.)) D)
(Z)
)+$/x
AZB
@@ -15683,13 +15683,13 @@
0: AZB
1: <unset>
2: Z
- AZBDZ
+ AZBDZ
0: AZBDZ
1: B
2: Z
-
-# The first of these, when run by Perl, gives the mark 'aa', which is wrong.
+# The first of these, when run by Perl, gives the mark 'aa', which is wrong.
+
'(?>a(*:aa))b|ac' mark
ac
0: ac
@@ -15697,7 +15697,7 @@
'(?:a(*:aa))b|ac' mark
ac
0: ac
-
+
/(R?){65}/
(R?){65}
0:
@@ -15735,7 +15735,7 @@
\= Expect no match
abc
No match
-
+
# Perl gives no match for this one
/(a(*MARK:m)(*ACCEPT)){0}(?1)/mark
@@ -15838,7 +15838,7 @@
\= Expect no match
bbb
No match
- cc
+ cc
No match
/^X\S/no_start_optimize,no_auto_possess
@@ -15910,7 +15910,7 @@
\= Expect no match
X
No match
- X\n
+ X\n
No match
/^X\D+?/no_start_optimize,no_auto_possess
@@ -15924,7 +15924,7 @@
\= Expect no match
X
No match
- X\n
+ X\n
No match
/^X\W+?/no_start_optimize,no_auto_possess
@@ -15931,7 +15931,7 @@
\= Expect no match
X
No match
- XX
+ XX
No match
/^X.+?Z/no_start_optimize,no_auto_possess
@@ -15938,7 +15938,7 @@
\= Expect no match
XY\n
No match
-
+
/(*CRLF)^X.+?Z/no_start_optimize,no_auto_possess
\= Expect no match
XY\r\=ps
@@ -15954,9 +15954,9 @@
No match
X\n\nY
No match
- X\n\x{0c}Y
+ X\n\x{0c}Y
No match
-
+
/(*BSR_ANYCRLF)^X\R+?Z/no_start_optimize,no_auto_possess
\= Expect no match
X\nX
@@ -15967,14 +15967,14 @@
No match
X\n\nY
No match
- X\n\x{0c}Y
+ X\n\x{0c}Y
No match
-
+
/^X\H+?Z/no_start_optimize,no_auto_possess
\= Expect no match
XY\t
No match
- XYY
+ XYY
No match
/^X\h+?Z/no_start_optimize,no_auto_possess
@@ -15988,7 +15988,7 @@
\= Expect no match
XY\n
No match
- XYY
+ XYY
No match
/^X\v+?Z/no_start_optimize,no_auto_possess
@@ -16002,7 +16002,7 @@
\= Expect no match
XY9
No match
- XYY
+ XYY
No match
/^X\d+?Z/no_start_optimize,no_auto_possess
@@ -16016,7 +16016,7 @@
\= Expect no match
XY\n
No match
- XYY
+ XYY
No match
/^X\s+?Z/no_start_optimize,no_auto_possess
@@ -16030,7 +16030,7 @@
\= Expect no match
X.A
No match
- X++
+ X++
No match
/^X\w+?Z/no_start_optimize,no_auto_possess
@@ -16037,7 +16037,7 @@
\= Expect no match
Xa.
No match
- Xaa
+ Xaa
No match
/^X.{1,3}Z/s,no_start_optimize,no_auto_possess
@@ -16056,7 +16056,7 @@
\= Expect no match
XY\n
No match
- XYY
+ XYY
No match
/^(X(*THEN)Y|AB){0}(?1)/
@@ -16063,7 +16063,7 @@
ABX
0: AB
\= Expect no match
- XAB
+ XAB
No match
/^(?!A(?C1)B)C/
@@ -16272,7 +16272,7 @@
/cat|dog/match_word
the cat sat
0: cat
-\= Expect no match
+\= Expect no match
caterpillar
No match
snowcat
@@ -16283,7 +16283,7 @@
/(cat)|dog/match_line,literal
(cat)|dog
0: (cat)|dog
-\= Expect no match
+\= Expect no match
the cat sat
No match
caterpillar
@@ -16297,10 +16297,35 @@
Rhubarb \na whole line\n custard
0: a whole line
\= Expect no match
- Not a whole line
+ Not a whole line
No match
-# End of testinput2
+# Perl gets this wrong, failing to capture 'b' in group 1.
+
+/^(b+|a){1,2}?bc/
+ bbc
+ 0: bbc
+ 1: b
+
+# And again here, for the "babc" subject string.
+
+/^(b*|ba){1,2}?bc/
+ babc
+ 0: babc
+ 1: ba
+ bbabc
+ 0: bbabc
+ 1: ba
+ bababc
+ 0: bababc
+ 1: ba
+\= Expect no match
+ bababbc
+No match
+ babababc
+No match
+
+# End of testinput2
Error -65: PCRE2_ERROR_BADDATA (unknown error number)
Error -62: bad serialized data
Error -2: partial match
Modified: code/trunk/testdata/testoutput8-32-3
===================================================================
--- code/trunk/testdata/testoutput8-32-3 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/testdata/testoutput8-32-3 2017-07-19 16:04:15 UTC (rev 842)
@@ -853,10 +853,8 @@
# with link size - hence multiple tests with different values.
/(?'ABC'\[[bar](]{792}*THEN:\[A]{255}\[)]{793}/expand,-fullbincode,parens_nest_limit=1000
-Failed: error 186 at offset 5813: regular expression is too complicated
/(?'ABC'\[[bar](]{793}*THEN:\[A]{255}\[)]{794}/expand,-fullbincode,parens_nest_limit=1000
-Failed: error 186 at offset 5820: regular expression is too complicated
/(?'ABC'\[[bar](]{1793}*THEN:\[A]{255}\[)]{1794}/expand,-fullbincode,parens_nest_limit=2000
Failed: error 186 at offset 12820: regular expression is too complicated
Modified: code/trunk/testdata/testoutput8-32-4
===================================================================
--- code/trunk/testdata/testoutput8-32-4 2017-07-18 17:22:39 UTC (rev 841)
+++ code/trunk/testdata/testoutput8-32-4 2017-07-19 16:04:15 UTC (rev 842)
@@ -853,10 +853,8 @@
# with link size - hence multiple tests with different values.
/(?'ABC'\[[bar](]{792}*THEN:\[A]{255}\[)]{793}/expand,-fullbincode,parens_nest_limit=1000
-Failed: error 186 at offset 5813: regular expression is too complicated
/(?'ABC'\[[bar](]{793}*THEN:\[A]{255}\[)]{794}/expand,-fullbincode,parens_nest_limit=1000
-Failed: error 186 at offset 5820: regular expression is too complicated
/(?'ABC'\[[bar](]{1793}*THEN:\[A]{255}\[)]{1794}/expand,-fullbincode,parens_nest_limit=2000
Failed: error 186 at offset 12820: regular expression is too complicated
