[Pcre-svn] [789] code/trunk/src: Conversion code update (rev…

Top Page
Delete this message
Author: Subversion repository
Date:  
To: pcre-svn
Subject: [Pcre-svn] [789] code/trunk/src: Conversion code update (revised option definitions).
Revision: 789
          http://www.exim.org/viewvc/pcre2?view=rev&revision=789
Author:   ph10
Date:     2017-05-18 15:42:19 +0100 (Thu, 18 May 2017)
Log Message:
-----------
Conversion code update (revised option definitions).


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-18 14:21:55 UTC (rev 788)
+++ code/trunk/src/pcre2.h    2017-05-18 14:42:19 UTC (rev 789)
@@ -182,12 +182,15 @@


/* Options for pcre2_pattern_convert(). */

-#define PCRE2_CONVERT_UTF             0x00000001u
-#define PCRE2_CONVERT_NO_UTF_CHECK    0x00000002u
-#define PCRE2_CONVERT_GLOB_BASIC      0x00000004u
-#define PCRE2_CONVERT_GLOB_BASH       0x00000008u
-#define PCRE2_CONVERT_POSIX_BASIC     0x00000010u
-#define PCRE2_CONVERT_POSIX_EXTENDED  0x00000020u
+#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_BACKSLASH      0x00000030u
+#define PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR 0x00000050u
+#define PCRE2_CONVERT_GLOB_NO_STARSTAR       0x00000090u
+#define PCRE2_CONVERT_GLOB_BASIC             0x000000f0u


/* 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-18 14:21:55 UTC (rev 788)
+++ code/trunk/src/pcre2.h.in    2017-05-18 14:42:19 UTC (rev 789)
@@ -182,12 +182,15 @@


/* Options for pcre2_pattern_convert(). */

-#define PCRE2_CONVERT_UTF             0x00000001u
-#define PCRE2_CONVERT_NO_UTF_CHECK    0x00000002u
-#define PCRE2_CONVERT_GLOB_BASIC      0x00000004u
-#define PCRE2_CONVERT_GLOB_BASH       0x00000008u
-#define PCRE2_CONVERT_POSIX_BASIC     0x00000010u
-#define PCRE2_CONVERT_POSIX_EXTENDED  0x00000020u
+#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_BACKSLASH      0x00000030u
+#define PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR 0x00000050u
+#define PCRE2_CONVERT_GLOB_NO_STARSTAR       0x00000090u
+#define PCRE2_CONVERT_GLOB_BASIC             0x000000f0u


/* 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-18 14:21:55 UTC (rev 788)
+++ code/trunk/src/pcre2_convert.c    2017-05-18 14:42:19 UTC (rev 789)
@@ -45,11 +45,12 @@


#include "pcre2_internal.h"

-#define TYPE_OPTIONS (PCRE2_CONVERT_GLOB_BASIC|PCRE2_CONVERT_GLOB_BASH| \
+#define TYPE_OPTIONS (PCRE2_CONVERT_GLOB| \
PCRE2_CONVERT_POSIX_BASIC|PCRE2_CONVERT_POSIX_EXTENDED)

#define ALL_OPTIONS (PCRE2_CONVERT_UTF|PCRE2_CONVERT_NO_UTF_CHECK| \
- TYPE_OPTIONS)
+ PCRE2_CONVERT_GLOB_NO_BACKSLASH|PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR| \
+ PCRE2_CONVERT_GLOB_NO_STARSTAR|TYPE_OPTIONS)

#define DUMMY_BUFFER_SIZE 100

@@ -1128,15 +1129,17 @@

   switch(pattype)
     {
-    case PCRE2_CONVERT_GLOB_BASIC:
+    case PCRE2_CONVERT_GLOB:
     rc = convert_glob(pattype, pattern, plength, utf, use_buffer, use_length,
       bufflenptr, dummyrun, ccontext);
     break;


+/*
     case PCRE2_CONVERT_GLOB_BASH:
     rc = convert_glob_bash(options, pattern, plength, utf, use_buffer, use_length,
       bufflenptr, dummyrun, ccontext);
     break;
+*/     


     case PCRE2_CONVERT_POSIX_BASIC:
     case PCRE2_CONVERT_POSIX_EXTENDED:


Modified: code/trunk/src/pcre2test.c
===================================================================
--- code/trunk/src/pcre2test.c    2017-05-18 14:21:55 UTC (rev 788)
+++ code/trunk/src/pcre2test.c    2017-05-18 14:42:19 UTC (rev 789)
@@ -400,11 +400,14 @@
 } convertstruct;


 static convertstruct convertlist[] = {
-  { "glob_basic",     PCRE2_CONVERT_GLOB_BASIC },
-  { "glob_bash",      PCRE2_CONVERT_GLOB_BASH },
-  { "posix_basic",    PCRE2_CONVERT_POSIX_BASIC },
-  { "posix_extended", PCRE2_CONVERT_POSIX_EXTENDED },
-  { "unset",          CONVERT_UNSET }};
+  { "glob",              PCRE2_CONVERT_GLOB },
+  { "glob_basic",        PCRE2_CONVERT_GLOB_BASIC },
+  { "glob_no_backslash", PCRE2_CONVERT_GLOB_NO_BACKSLASH }, 
+  { "glob_no_starstar",  PCRE2_CONVERT_GLOB_NO_STARSTAR }, 
+  { "glob_no_wild_separator", PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR }, 
+  { "posix_basic",       PCRE2_CONVERT_POSIX_BASIC },
+  { "posix_extended",    PCRE2_CONVERT_POSIX_EXTENDED },
+  { "unset",             CONVERT_UNSET }};


#define convertlistcount (sizeof(convertlist)/sizeof(convertstruct))