Revision: 472
http://www.exim.org/viewvc/pcre2?view=rev&revision=472
Author: ph10
Date: 2015-12-18 10:35:03 +0000 (Fri, 18 Dec 2015)
Log Message:
-----------
Final file tidies for 8.21-RC1.
Modified Paths:
--------------
code/trunk/Makefile.am
code/trunk/src/pcre2.h.generic
Modified: code/trunk/Makefile.am
===================================================================
--- code/trunk/Makefile.am 2015-12-17 18:44:06 UTC (rev 471)
+++ code/trunk/Makefile.am 2015-12-18 10:35:03 UTC (rev 472)
@@ -590,6 +590,9 @@
testdata/testinput18 \
testdata/testinput19 \
testdata/testinput20 \
+ testdata/testinput21 \
+ testdata/testinput22 \
+ testdata/testinput23 \
testdata/testinputEBC \
testdata/testoutput1 \
testdata/testoutput2 \
@@ -600,9 +603,15 @@
testdata/testoutput5 \
testdata/testoutput6 \
testdata/testoutput7 \
- testdata/testoutput8-16 \
- testdata/testoutput8-32 \
- testdata/testoutput8-8 \
+ testdata/testoutput8-16-2 \
+ testdata/testoutput8-16-3 \
+ testdata/testoutput8-16-3 \
+ testdata/testoutput8-32-2 \
+ testdata/testoutput8-32-3 \
+ testdata/testoutput8-32-4 \
+ testdata/testoutput8-8-2 \
+ testdata/testoutput8-8-3 \
+ testdata/testoutput8-8-4 \
testdata/testoutput9 \
testdata/testoutput10 \
testdata/testoutput11-16 \
@@ -619,6 +628,11 @@
testdata/testoutput18 \
testdata/testoutput19 \
testdata/testoutput20 \
+ testdata/testoutput21 \
+ testdata/testoutput22-16 \
+ testdata/testoutput22-32 \
+ testdata/testoutput22-8 \
+ testdata/testoutput23 \
testdata/testoutputEBC \
testdata/valgrind-jit.supp \
testdata/wintestinput3 \
Modified: code/trunk/src/pcre2.h.generic
===================================================================
--- code/trunk/src/pcre2.h.generic 2015-12-17 18:44:06 UTC (rev 471)
+++ code/trunk/src/pcre2.h.generic 2015-12-18 10:35:03 UTC (rev 472)
@@ -44,7 +44,7 @@
#define PCRE2_MAJOR 10
#define PCRE2_MINOR 21
#define PCRE2_PRERELEASE -RC1
-#define PCRE2_DATE 2015-07-06
+#define PCRE2_DATE 2015-12-15
/* 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
@@ -146,9 +146,13 @@
#define PCRE2_DFA_RESTART 0x00000040u
#define PCRE2_DFA_SHORTEST 0x00000080u
-/* This is an additional option for pcre2_substitute(). */
+/* These are additional options for pcre2_substitute(). */
-#define PCRE2_SUBSTITUTE_GLOBAL 0x00000100u
+#define PCRE2_SUBSTITUTE_GLOBAL 0x00000100u
+#define PCRE2_SUBSTITUTE_EXTENDED 0x00000200u
+#define PCRE2_SUBSTITUTE_UNSET_EMPTY 0x00000400u
+#define PCRE2_SUBSTITUTE_UNKNOWN_UNSET 0x00000800u
+#define PCRE2_SUBSTITUTE_OVERFLOW_LENGTH 0x00001000u
/* 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
@@ -236,6 +240,11 @@
#define PCRE2_ERROR_UNAVAILABLE (-54)
#define PCRE2_ERROR_UNSET (-55)
#define PCRE2_ERROR_BADOFFSETLIMIT (-56)
+#define PCRE2_ERROR_BADREPESCAPE (-57)
+#define PCRE2_ERROR_REPMISSINGBRACE (-58)
+#define PCRE2_ERROR_BADSUBSTITUTION (-59)
+#define PCRE2_ERROR_BADSUBSPATTERN (-60)
+#define PCRE2_ERROR_TOOMANYREPLACE (-61)
/* Request types for pcre2_pattern_info() */
@@ -262,6 +271,7 @@
#define PCRE2_INFO_NEWLINE 20
#define PCRE2_INFO_RECURSIONLIMIT 21
#define PCRE2_INFO_SIZE 22
+#define PCRE2_INFO_HASBACKSLASHC 23
/* Request types for pcre2_config(). */
@@ -294,6 +304,7 @@
the offset vector (ovector). */
#define PCRE2_SIZE size_t
+#define PCRE2_SIZE_MAX SIZE_MAX
#define PCRE2_ZERO_TERMINATED (~(PCRE2_SIZE)0)
#define PCRE2_UNSET (~(PCRE2_SIZE)0)
@@ -391,6 +402,8 @@
PCRE2_EXP_DECL int pcre2_set_bsr(pcre2_compile_context *, uint32_t); \
PCRE2_EXP_DECL int pcre2_set_character_tables(pcre2_compile_context *, \
const unsigned char *); \
+PCRE2_EXP_DECL int pcre2_set_max_pattern_length(pcre2_compile_context *, \
+ PCRE2_SIZE); \
PCRE2_EXP_DECL int pcre2_set_newline(pcre2_compile_context *, uint32_t); \
PCRE2_EXP_DECL int pcre2_set_parens_nest_limit(pcre2_compile_context *, \
uint32_t); \
@@ -611,6 +624,7 @@
#define pcre2_set_character_tables PCRE2_SUFFIX(pcre2_set_character_tables_)
#define pcre2_set_compile_recursion_guard PCRE2_SUFFIX(pcre2_set_compile_recursion_guard_)
#define pcre2_set_match_limit PCRE2_SUFFIX(pcre2_set_match_limit_)
+#define pcre2_set_max_pattern_length PCRE2_SUFFIX(pcre2_set_max_pattern_length_)
#define pcre2_set_newline PCRE2_SUFFIX(pcre2_set_newline_)
#define pcre2_set_parens_nest_limit PCRE2_SUFFIX(pcre2_set_parens_nest_limit_)
#define pcre2_set_offset_limit PCRE2_SUFFIX(pcre2_set_offset_limit_)
