Regex: Update compiled libraries and pcre.h to v8.35.
This commit is contained in:
parent
d4de0e6f1e
commit
0714354f52
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -5,7 +5,7 @@
|
||||||
/* This is the public header file for the PCRE library, to be #included by
|
/* This is the public header file for the PCRE library, to be #included by
|
||||||
applications that call the PCRE functions.
|
applications that call the PCRE functions.
|
||||||
|
|
||||||
Copyright (c) 1997-2012 University of Cambridge
|
Copyright (c) 1997-2014 University of Cambridge
|
||||||
|
|
||||||
-----------------------------------------------------------------------------
|
-----------------------------------------------------------------------------
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||||
/* The current PCRE version information. */
|
/* The current PCRE version information. */
|
||||||
|
|
||||||
#define PCRE_MAJOR 8
|
#define PCRE_MAJOR 8
|
||||||
#define PCRE_MINOR 32
|
#define PCRE_MINOR 35
|
||||||
#define PCRE_PRERELEASE
|
#define PCRE_PRERELEASE
|
||||||
#define PCRE_DATE 2012-11-30
|
#define PCRE_DATE 2014-04-04
|
||||||
|
|
||||||
/* When an application links to a PCRE DLL in Windows, the symbols that are
|
/* When an application links to a PCRE DLL in Windows, the symbols that are
|
||||||
imported have to be identified as such. When building PCRE, the appropriate
|
imported have to be identified as such. When building PCRE, the appropriate
|
||||||
|
@ -96,11 +96,14 @@ extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Public options. Some are compile-time only, some are run-time only, and some
|
/* Public options. Some are compile-time only, some are run-time only, and some
|
||||||
are both, so we keep them all distinct. However, almost all the bits in the
|
are both. Most of the compile-time options are saved with the compiled regex so
|
||||||
options word are now used. In the long run, we may have to re-use some of the
|
that they can be inspected during studying (and therefore JIT compiling). Note
|
||||||
compile-time only bits for runtime options, or vice versa. Any of the
|
that pcre_study() has its own set of options. Originally, all the options
|
||||||
compile-time options may be inspected during studying (and therefore JIT
|
defined here used distinct bits. However, almost all the bits in a 32-bit word
|
||||||
compiling).
|
are now used, so in order to conserve them, option bits that were previously
|
||||||
|
only recognized at matching time (i.e. by pcre_exec() or pcre_dfa_exec()) may
|
||||||
|
also be used for compile-time options that affect only compiling and are not
|
||||||
|
relevant for studying or JIT compiling.
|
||||||
|
|
||||||
Some options for pcre_compile() change its behaviour but do not affect the
|
Some options for pcre_compile() change its behaviour but do not affect the
|
||||||
behaviour of the execution functions. Other options are passed through to the
|
behaviour of the execution functions. Other options are passed through to the
|
||||||
|
@ -142,8 +145,15 @@ extern "C" {
|
||||||
#define PCRE_AUTO_CALLOUT 0x00004000 /* C1 */
|
#define PCRE_AUTO_CALLOUT 0x00004000 /* C1 */
|
||||||
#define PCRE_PARTIAL_SOFT 0x00008000 /* E D J ) Synonyms */
|
#define PCRE_PARTIAL_SOFT 0x00008000 /* E D J ) Synonyms */
|
||||||
#define PCRE_PARTIAL 0x00008000 /* E D J ) */
|
#define PCRE_PARTIAL 0x00008000 /* E D J ) */
|
||||||
#define PCRE_DFA_SHORTEST 0x00010000 /* D */
|
|
||||||
#define PCRE_DFA_RESTART 0x00020000 /* D */
|
/* This pair use the same bit. */
|
||||||
|
#define PCRE_NEVER_UTF 0x00010000 /* C1 ) Overlaid */
|
||||||
|
#define PCRE_DFA_SHORTEST 0x00010000 /* D ) Overlaid */
|
||||||
|
|
||||||
|
/* This pair use the same bit. */
|
||||||
|
#define PCRE_NO_AUTO_POSSESS 0x00020000 /* C1 ) Overlaid */
|
||||||
|
#define PCRE_DFA_RESTART 0x00020000 /* D ) Overlaid */
|
||||||
|
|
||||||
#define PCRE_FIRSTLINE 0x00040000 /* C3 */
|
#define PCRE_FIRSTLINE 0x00040000 /* C3 */
|
||||||
#define PCRE_DUPNAMES 0x00080000 /* C1 */
|
#define PCRE_DUPNAMES 0x00080000 /* C1 */
|
||||||
#define PCRE_NEWLINE_CR 0x00100000 /* C3 E D */
|
#define PCRE_NEWLINE_CR 0x00100000 /* C3 E D */
|
||||||
|
@ -199,6 +209,7 @@ extern "C" {
|
||||||
#define PCRE_ERROR_DFA_BADRESTART (-30)
|
#define PCRE_ERROR_DFA_BADRESTART (-30)
|
||||||
#define PCRE_ERROR_JIT_BADOPTION (-31)
|
#define PCRE_ERROR_JIT_BADOPTION (-31)
|
||||||
#define PCRE_ERROR_BADLENGTH (-32)
|
#define PCRE_ERROR_BADLENGTH (-32)
|
||||||
|
#define PCRE_ERROR_UNSET (-33)
|
||||||
|
|
||||||
/* Specific error codes for UTF-8 validity checks */
|
/* Specific error codes for UTF-8 validity checks */
|
||||||
|
|
||||||
|
@ -224,7 +235,7 @@ extern "C" {
|
||||||
#define PCRE_UTF8_ERR19 19
|
#define PCRE_UTF8_ERR19 19
|
||||||
#define PCRE_UTF8_ERR20 20
|
#define PCRE_UTF8_ERR20 20
|
||||||
#define PCRE_UTF8_ERR21 21
|
#define PCRE_UTF8_ERR21 21
|
||||||
#define PCRE_UTF8_ERR22 22
|
#define PCRE_UTF8_ERR22 22 /* Unused (was non-character) */
|
||||||
|
|
||||||
/* Specific error codes for UTF-16 validity checks */
|
/* Specific error codes for UTF-16 validity checks */
|
||||||
|
|
||||||
|
@ -232,13 +243,13 @@ extern "C" {
|
||||||
#define PCRE_UTF16_ERR1 1
|
#define PCRE_UTF16_ERR1 1
|
||||||
#define PCRE_UTF16_ERR2 2
|
#define PCRE_UTF16_ERR2 2
|
||||||
#define PCRE_UTF16_ERR3 3
|
#define PCRE_UTF16_ERR3 3
|
||||||
#define PCRE_UTF16_ERR4 4
|
#define PCRE_UTF16_ERR4 4 /* Unused (was non-character) */
|
||||||
|
|
||||||
/* Specific error codes for UTF-32 validity checks */
|
/* Specific error codes for UTF-32 validity checks */
|
||||||
|
|
||||||
#define PCRE_UTF32_ERR0 0
|
#define PCRE_UTF32_ERR0 0
|
||||||
#define PCRE_UTF32_ERR1 1
|
#define PCRE_UTF32_ERR1 1
|
||||||
#define PCRE_UTF32_ERR2 2
|
#define PCRE_UTF32_ERR2 2 /* Unused (was non-character) */
|
||||||
#define PCRE_UTF32_ERR3 3
|
#define PCRE_UTF32_ERR3 3
|
||||||
|
|
||||||
/* Request types for pcre_fullinfo() */
|
/* Request types for pcre_fullinfo() */
|
||||||
|
@ -267,6 +278,9 @@ extern "C" {
|
||||||
#define PCRE_INFO_FIRSTCHARACTERFLAGS 20
|
#define PCRE_INFO_FIRSTCHARACTERFLAGS 20
|
||||||
#define PCRE_INFO_REQUIREDCHAR 21
|
#define PCRE_INFO_REQUIREDCHAR 21
|
||||||
#define PCRE_INFO_REQUIREDCHARFLAGS 22
|
#define PCRE_INFO_REQUIREDCHARFLAGS 22
|
||||||
|
#define PCRE_INFO_MATCHLIMIT 23
|
||||||
|
#define PCRE_INFO_RECURSIONLIMIT 24
|
||||||
|
#define PCRE_INFO_MATCH_EMPTY 25
|
||||||
|
|
||||||
/* Request types for pcre_config(). Do not re-arrange, in order to remain
|
/* Request types for pcre_config(). Do not re-arrange, in order to remain
|
||||||
compatible. */
|
compatible. */
|
||||||
|
@ -284,6 +298,7 @@ extern "C" {
|
||||||
#define PCRE_CONFIG_UTF16 10
|
#define PCRE_CONFIG_UTF16 10
|
||||||
#define PCRE_CONFIG_JITTARGET 11
|
#define PCRE_CONFIG_JITTARGET 11
|
||||||
#define PCRE_CONFIG_UTF32 12
|
#define PCRE_CONFIG_UTF32 12
|
||||||
|
#define PCRE_CONFIG_PARENS_LIMIT 13
|
||||||
|
|
||||||
/* Request types for pcre_study(). Do not re-arrange, in order to remain
|
/* Request types for pcre_study(). Do not re-arrange, in order to remain
|
||||||
compatible. */
|
compatible. */
|
||||||
|
@ -476,36 +491,42 @@ extern "C" {
|
||||||
PCRE_EXP_DECL void *(*pcre_stack_malloc)(size_t);
|
PCRE_EXP_DECL void *(*pcre_stack_malloc)(size_t);
|
||||||
PCRE_EXP_DECL void (*pcre_stack_free)(void *);
|
PCRE_EXP_DECL void (*pcre_stack_free)(void *);
|
||||||
PCRE_EXP_DECL int (*pcre_callout)(pcre_callout_block *);
|
PCRE_EXP_DECL int (*pcre_callout)(pcre_callout_block *);
|
||||||
|
PCRE_EXP_DECL int (*pcre_stack_guard)(void);
|
||||||
|
|
||||||
PCRE_EXP_DECL void *(*pcre16_malloc)(size_t);
|
PCRE_EXP_DECL void *(*pcre16_malloc)(size_t);
|
||||||
PCRE_EXP_DECL void (*pcre16_free)(void *);
|
PCRE_EXP_DECL void (*pcre16_free)(void *);
|
||||||
PCRE_EXP_DECL void *(*pcre16_stack_malloc)(size_t);
|
PCRE_EXP_DECL void *(*pcre16_stack_malloc)(size_t);
|
||||||
PCRE_EXP_DECL void (*pcre16_stack_free)(void *);
|
PCRE_EXP_DECL void (*pcre16_stack_free)(void *);
|
||||||
PCRE_EXP_DECL int (*pcre16_callout)(pcre16_callout_block *);
|
PCRE_EXP_DECL int (*pcre16_callout)(pcre16_callout_block *);
|
||||||
|
PCRE_EXP_DECL int (*pcre16_stack_guard)(void);
|
||||||
|
|
||||||
PCRE_EXP_DECL void *(*pcre32_malloc)(size_t);
|
PCRE_EXP_DECL void *(*pcre32_malloc)(size_t);
|
||||||
PCRE_EXP_DECL void (*pcre32_free)(void *);
|
PCRE_EXP_DECL void (*pcre32_free)(void *);
|
||||||
PCRE_EXP_DECL void *(*pcre32_stack_malloc)(size_t);
|
PCRE_EXP_DECL void *(*pcre32_stack_malloc)(size_t);
|
||||||
PCRE_EXP_DECL void (*pcre32_stack_free)(void *);
|
PCRE_EXP_DECL void (*pcre32_stack_free)(void *);
|
||||||
PCRE_EXP_DECL int (*pcre32_callout)(pcre32_callout_block *);
|
PCRE_EXP_DECL int (*pcre32_callout)(pcre32_callout_block *);
|
||||||
|
PCRE_EXP_DECL int (*pcre32_stack_guard)(void);
|
||||||
#else /* VPCOMPAT */
|
#else /* VPCOMPAT */
|
||||||
PCRE_EXP_DECL void *pcre_malloc(size_t);
|
PCRE_EXP_DECL void *pcre_malloc(size_t);
|
||||||
PCRE_EXP_DECL void pcre_free(void *);
|
PCRE_EXP_DECL void pcre_free(void *);
|
||||||
PCRE_EXP_DECL void *pcre_stack_malloc(size_t);
|
PCRE_EXP_DECL void *pcre_stack_malloc(size_t);
|
||||||
PCRE_EXP_DECL void pcre_stack_free(void *);
|
PCRE_EXP_DECL void pcre_stack_free(void *);
|
||||||
PCRE_EXP_DECL int pcre_callout(pcre_callout_block *);
|
PCRE_EXP_DECL int pcre_callout(pcre_callout_block *);
|
||||||
|
PCRE_EXP_DECL int pcre_stack_guard(void);
|
||||||
|
|
||||||
PCRE_EXP_DECL void *pcre16_malloc(size_t);
|
PCRE_EXP_DECL void *pcre16_malloc(size_t);
|
||||||
PCRE_EXP_DECL void pcre16_free(void *);
|
PCRE_EXP_DECL void pcre16_free(void *);
|
||||||
PCRE_EXP_DECL void *pcre16_stack_malloc(size_t);
|
PCRE_EXP_DECL void *pcre16_stack_malloc(size_t);
|
||||||
PCRE_EXP_DECL void pcre16_stack_free(void *);
|
PCRE_EXP_DECL void pcre16_stack_free(void *);
|
||||||
PCRE_EXP_DECL int pcre16_callout(pcre16_callout_block *);
|
PCRE_EXP_DECL int pcre16_callout(pcre16_callout_block *);
|
||||||
|
PCRE_EXP_DECL int pcre16_stack_guard(void);
|
||||||
|
|
||||||
PCRE_EXP_DECL void *pcre32_malloc(size_t);
|
PCRE_EXP_DECL void *pcre32_malloc(size_t);
|
||||||
PCRE_EXP_DECL void pcre32_free(void *);
|
PCRE_EXP_DECL void pcre32_free(void *);
|
||||||
PCRE_EXP_DECL void *pcre32_stack_malloc(size_t);
|
PCRE_EXP_DECL void *pcre32_stack_malloc(size_t);
|
||||||
PCRE_EXP_DECL void pcre32_stack_free(void *);
|
PCRE_EXP_DECL void pcre32_stack_free(void *);
|
||||||
PCRE_EXP_DECL int pcre32_callout(pcre32_callout_block *);
|
PCRE_EXP_DECL int pcre32_callout(pcre32_callout_block *);
|
||||||
|
PCRE_EXP_DECL int pcre32_stack_guard(void);
|
||||||
#endif /* VPCOMPAT */
|
#endif /* VPCOMPAT */
|
||||||
|
|
||||||
/* User defined callback which provides a stack just before the match starts. */
|
/* User defined callback which provides a stack just before the match starts. */
|
||||||
|
@ -645,6 +666,9 @@ extern "C" {
|
||||||
pcre16_jit_callback, void *);
|
pcre16_jit_callback, void *);
|
||||||
PCRE_EXP_DECL void pcre32_assign_jit_stack(pcre32_extra *,
|
PCRE_EXP_DECL void pcre32_assign_jit_stack(pcre32_extra *,
|
||||||
pcre32_jit_callback, void *);
|
pcre32_jit_callback, void *);
|
||||||
|
PCRE_EXP_DECL void pcre_jit_free_unused_memory(void);
|
||||||
|
PCRE_EXP_DECL void pcre16_jit_free_unused_memory(void);
|
||||||
|
PCRE_EXP_DECL void pcre32_jit_free_unused_memory(void);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} /* extern "C" */
|
} /* extern "C" */
|
||||||
|
|
Loading…
Reference in New Issue
Block a user