More conversion development.

This commit is contained in:
Philip.Hazel 2017-05-25 16:34:22 +00:00
parent bf6f53b089
commit 772d857f69
4 changed files with 10 additions and 10 deletions

View File

@ -187,10 +187,10 @@ ignored for pcre2_jit_match(). */
#define PCRE2_CONVERT_POSIX_BASIC 0x00000004u #define PCRE2_CONVERT_POSIX_BASIC 0x00000004u
#define PCRE2_CONVERT_POSIX_EXTENDED 0x00000008u #define PCRE2_CONVERT_POSIX_EXTENDED 0x00000008u
#define PCRE2_CONVERT_GLOB 0x00000010u #define PCRE2_CONVERT_GLOB 0x00000010u
#define PCRE2_CONVERT_GLOB_NO_DOT_SPECIAL 0x00000030u #define PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR 0x00000030u
#define PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR 0x00000050u #define PCRE2_CONVERT_GLOB_NO_STARSTAR 0x00000050u
#define PCRE2_CONVERT_GLOB_NO_STARSTAR 0x00000090u #define PCRE2_CONVERT_GLOB_BASIC 0x00000070u
#define PCRE2_CONVERT_GLOB_BASIC 0x000000f0u #define PCRE2_CONVERT_GLOB_IGNORE_DOT_START 0x00000080u
/* Newline and \R settings, for use in compile contexts. The newline values /* 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 must be kept in step with values set in config.h and both sets must all be

View File

@ -187,10 +187,10 @@ ignored for pcre2_jit_match(). */
#define PCRE2_CONVERT_POSIX_BASIC 0x00000004u #define PCRE2_CONVERT_POSIX_BASIC 0x00000004u
#define PCRE2_CONVERT_POSIX_EXTENDED 0x00000008u #define PCRE2_CONVERT_POSIX_EXTENDED 0x00000008u
#define PCRE2_CONVERT_GLOB 0x00000010u #define PCRE2_CONVERT_GLOB 0x00000010u
#define PCRE2_CONVERT_GLOB_NO_DOT_SPECIAL 0x00000030u #define PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR 0x00000030u
#define PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR 0x00000050u #define PCRE2_CONVERT_GLOB_NO_STARSTAR 0x00000050u
#define PCRE2_CONVERT_GLOB_NO_STARSTAR 0x00000090u #define PCRE2_CONVERT_GLOB_BASIC 0x00000070u
#define PCRE2_CONVERT_GLOB_BASIC 0x000000f0u #define PCRE2_CONVERT_GLOB_IGNORE_DOT_START 0x00000080u
/* Newline and \R settings, for use in compile contexts. The newline values /* 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 must be kept in step with values set in config.h and both sets must all be

View File

@ -49,7 +49,7 @@ POSSIBILITY OF SUCH DAMAGE.
PCRE2_CONVERT_POSIX_BASIC|PCRE2_CONVERT_POSIX_EXTENDED) PCRE2_CONVERT_POSIX_BASIC|PCRE2_CONVERT_POSIX_EXTENDED)
#define ALL_OPTIONS (PCRE2_CONVERT_UTF|PCRE2_CONVERT_NO_UTF_CHECK| \ #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_WILD_SEPARATOR| \
PCRE2_CONVERT_GLOB_NO_STARSTAR| \ PCRE2_CONVERT_GLOB_NO_STARSTAR| \
TYPE_OPTIONS) TYPE_OPTIONS)

View File

@ -402,7 +402,7 @@ typedef struct convertstruct {
static convertstruct convertlist[] = { static convertstruct convertlist[] = {
{ "glob", PCRE2_CONVERT_GLOB }, { "glob", PCRE2_CONVERT_GLOB },
{ "glob_basic", PCRE2_CONVERT_GLOB_BASIC }, { "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_starstar", PCRE2_CONVERT_GLOB_NO_STARSTAR },
{ "glob_no_wild_separator", PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR }, { "glob_no_wild_separator", PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR },
{ "posix_basic", PCRE2_CONVERT_POSIX_BASIC }, { "posix_basic", PCRE2_CONVERT_POSIX_BASIC },