Revision: 916
http://www.exim.org/viewvc/pcre2?view=rev&revision=916
Author: ph10
Date: 2018-02-19 16:55:47 +0000 (Mon, 19 Feb 2018)
Log Message:
-----------
Fix pcre2test -C to correctly show what \R matches.
Modified Paths:
--------------
code/trunk/ChangeLog
code/trunk/configure.ac
code/trunk/src/pcre2.h
code/trunk/src/pcre2test.c
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2018-02-19 14:49:42 UTC (rev 915)
+++ code/trunk/ChangeLog 2018-02-19 16:55:47 UTC (rev 916)
@@ -14,7 +14,12 @@
groups altogether. Now it shows those that come before any actual captures as
"<unset>", as happens for non-POSIX matching.
+3. Running "pcre2test -C" always stated "\R matches CR, LF, or CRLF only",
+whatever the build configuration was. It now correctly says "\R matches all
+Unicode newlines" in the default case when --enable-bsr-anycrlf has not been
+specified.
+
Version 10.31 12-February-2018
------------------------------
Modified: code/trunk/configure.ac
===================================================================
--- code/trunk/configure.ac 2018-02-19 14:49:42 UTC (rev 915)
+++ code/trunk/configure.ac 2018-02-19 16:55:47 UTC (rev 916)
@@ -9,9 +9,9 @@
dnl be defined as -RC2, for example. For real releases, it should be empty.
m4_define(pcre2_major, [10])
-m4_define(pcre2_minor, [31])
-m4_define(pcre2_prerelease, [])
-m4_define(pcre2_date, [2018-02-12])
+m4_define(pcre2_minor, [32])
+m4_define(pcre2_prerelease, [-RC1])
+m4_define(pcre2_date, [2018-02-19])
# 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.
Modified: code/trunk/src/pcre2.h
===================================================================
--- code/trunk/src/pcre2.h 2018-02-19 14:49:42 UTC (rev 915)
+++ code/trunk/src/pcre2.h 2018-02-19 16:55:47 UTC (rev 916)
@@ -42,9 +42,9 @@
/* The current PCRE version information. */
#define PCRE2_MAJOR 10
-#define PCRE2_MINOR 31
-#define PCRE2_PRERELEASE
-#define PCRE2_DATE 2018-02-12
+#define PCRE2_MINOR 32
+#define PCRE2_PRERELEASE -RC1
+#define PCRE2_DATE 2018-02-19
/* 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/pcre2test.c
===================================================================
--- code/trunk/src/pcre2test.c 2018-02-19 14:49:42 UTC (rev 915)
+++ code/trunk/src/pcre2test.c 2018-02-19 16:55:47 UTC (rev 916)
@@ -7877,7 +7877,8 @@
(void)PCRE2_CONFIG(PCRE2_CONFIG_NEWLINE, &optval);
print_newline_config(optval, FALSE);
(void)PCRE2_CONFIG(PCRE2_CONFIG_BSR, &optval);
-printf(" \\R matches %s\n", optval? "CR, LF, or CRLF only" :
+printf(" \\R matches %s\n",
+ (optval == PCRE2_BSR_ANYCRLF)? "CR, LF, or CRLF only" :
"all Unicode newlines");
(void)PCRE2_CONFIG(PCRE2_CONFIG_NEVER_BACKSLASH_C, &optval);
printf(" \\C is %ssupported\n", optval? "not ":"");
