Revision: 805
http://www.exim.org/viewvc/pcre2?view=rev&revision=805
Author: ph10
Date: 2017-05-25 17:34:22 +0100 (Thu, 25 May 2017)
Log Message:
-----------
More conversion development.
Modified Paths:
--------------
code/trunk/src/pcre2.h
code/trunk/src/pcre2.h.in
code/trunk/src/pcre2_convert.c
code/trunk/src/pcre2test.c
Modified: code/trunk/src/pcre2.h
===================================================================
--- code/trunk/src/pcre2.h 2017-05-25 13:19:42 UTC (rev 804)
+++ code/trunk/src/pcre2.h 2017-05-25 16:34:22 UTC (rev 805)
@@ -187,10 +187,10 @@
#define PCRE2_CONVERT_POSIX_BASIC 0x00000004u
#define PCRE2_CONVERT_POSIX_EXTENDED 0x00000008u
#define PCRE2_CONVERT_GLOB 0x00000010u
-#define PCRE2_CONVERT_GLOB_NO_DOT_SPECIAL 0x00000030u
-#define PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR 0x00000050u
-#define PCRE2_CONVERT_GLOB_NO_STARSTAR 0x00000090u
-#define PCRE2_CONVERT_GLOB_BASIC 0x000000f0u
+#define PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR 0x00000030u
+#define PCRE2_CONVERT_GLOB_NO_STARSTAR 0x00000050u
+#define PCRE2_CONVERT_GLOB_BASIC 0x00000070u
+#define PCRE2_CONVERT_GLOB_IGNORE_DOT_START 0x00000080u
/* 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
Modified: code/trunk/src/pcre2.h.in
===================================================================
--- code/trunk/src/pcre2.h.in 2017-05-25 13:19:42 UTC (rev 804)
+++ code/trunk/src/pcre2.h.in 2017-05-25 16:34:22 UTC (rev 805)
@@ -187,10 +187,10 @@
#define PCRE2_CONVERT_POSIX_BASIC 0x00000004u
#define PCRE2_CONVERT_POSIX_EXTENDED 0x00000008u
#define PCRE2_CONVERT_GLOB 0x00000010u
-#define PCRE2_CONVERT_GLOB_NO_DOT_SPECIAL 0x00000030u
-#define PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR 0x00000050u
-#define PCRE2_CONVERT_GLOB_NO_STARSTAR 0x00000090u
-#define PCRE2_CONVERT_GLOB_BASIC 0x000000f0u
+#define PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR 0x00000030u
+#define PCRE2_CONVERT_GLOB_NO_STARSTAR 0x00000050u
+#define PCRE2_CONVERT_GLOB_BASIC 0x00000070u
+#define PCRE2_CONVERT_GLOB_IGNORE_DOT_START 0x00000080u
/* 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
Modified: code/trunk/src/pcre2_convert.c
===================================================================
--- code/trunk/src/pcre2_convert.c 2017-05-25 13:19:42 UTC (rev 804)
+++ code/trunk/src/pcre2_convert.c 2017-05-25 16:34:22 UTC (rev 805)
@@ -49,7 +49,7 @@
PCRE2_CONVERT_POSIX_BASIC|PCRE2_CONVERT_POSIX_EXTENDED)
#define ALL_OPTIONS (PCRE2_CONVERT_UTF|PCRE2_CONVERT_NO_UTF_CHECK| \
- PCRE2_CONVERT_GLOB_NO_DOT_SPECIAL| \
+ PCRE2_CONVERT_GLOB_IGNORE_DOT_START| \
PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR| \
PCRE2_CONVERT_GLOB_NO_STARSTAR| \
TYPE_OPTIONS)
Modified: code/trunk/src/pcre2test.c
===================================================================
--- code/trunk/src/pcre2test.c 2017-05-25 13:19:42 UTC (rev 804)
+++ code/trunk/src/pcre2test.c 2017-05-25 16:34:22 UTC (rev 805)
@@ -402,7 +402,7 @@
static convertstruct convertlist[] = {
{ "glob", PCRE2_CONVERT_GLOB },
{ "glob_basic", PCRE2_CONVERT_GLOB_BASIC },
- { "glob_no_dot_special", PCRE2_CONVERT_GLOB_NO_DOT_SPECIAL },
+ { "glob_ignore_dot_start", PCRE2_CONVERT_GLOB_IGNORE_DOT_START },
{ "glob_no_starstar", PCRE2_CONVERT_GLOB_NO_STARSTAR },
{ "glob_no_wild_separator", PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR },
{ "posix_basic", PCRE2_CONVERT_POSIX_BASIC },
