diff options
author | Rickard Green <[email protected]> | 2017-08-29 18:28:23 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2017-08-29 18:28:23 +0200 |
commit | cdcbf85b4f00f8dc2f61e895055943fc7209027c (patch) | |
tree | 1045f81f2a5a825222c355701cf4b5e30f20c393 /erts/emulator/pcre/pcre_internal.h | |
parent | a230f26086b3db9097f06d4bb91fb3b2e9379c77 (diff) | |
download | otp-cdcbf85b4f00f8dc2f61e895055943fc7209027c.tar.gz otp-cdcbf85b4f00f8dc2f61e895055943fc7209027c.tar.bz2 otp-cdcbf85b4f00f8dc2f61e895055943fc7209027c.zip |
Upgrade to PCRE 8.41 from PCRE 8.40
Diffstat (limited to 'erts/emulator/pcre/pcre_internal.h')
-rw-r--r-- | erts/emulator/pcre/pcre_internal.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/erts/emulator/pcre/pcre_internal.h b/erts/emulator/pcre/pcre_internal.h index cc4f171438..c84dcb5a38 100644 --- a/erts/emulator/pcre/pcre_internal.h +++ b/erts/emulator/pcre/pcre_internal.h @@ -2791,6 +2791,9 @@ extern const pcre_uint8 PRIV(ucd_stage1)[]; extern const pcre_uint16 PRIV(ucd_stage2)[]; extern const pcre_uint32 PRIV(ucp_gentype)[]; extern const pcre_uint32 PRIV(ucp_gbtable)[]; +#ifdef COMPILE_PCRE32 +extern const ucd_record PRIV(dummy_ucd_record)[]; +#endif #ifdef SUPPORT_JIT extern const int PRIV(ucp_typerange)[]; #endif @@ -2799,10 +2802,16 @@ extern const int PRIV(ucp_typerange)[]; /* UCD access macros */ #define UCD_BLOCK_SIZE 128 -#define GET_UCD(ch) (PRIV(ucd_records) + \ +#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \ PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \ UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE]) +#ifdef COMPILE_PCRE32 +#define GET_UCD(ch) ((ch > 0x10ffff)? PRIV(dummy_ucd_record) : REAL_GET_UCD(ch)) +#else +#define GET_UCD(ch) REAL_GET_UCD(ch) +#endif + #define UCD_CHARTYPE(ch) GET_UCD(ch)->chartype #define UCD_SCRIPT(ch) GET_UCD(ch)->script #define UCD_CATEGORY(ch) PRIV(ucp_gentype)[UCD_CHARTYPE(ch)] |