MdeModulePkg RegularExpressionDxe: Update Oniguruma from v6.9.0 to v6.9.3

[mirror_edk2.git] / MdeModulePkg / Universal / RegularExpressionDxe / Oniguruma / oniguruma.h

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniguruma.h b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniguruma.h
index 5f31a91c67f1465bbe0bedf13105c66fc6f6cdb9..a2158e5cf9715aee3d81698aa934699415648953 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniguruma.h
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniguruma.h
@@ -4,7 +4,7 @@
   oniguruma.h - Oniguruma (regular expression library)\r
 **********************************************************************/\r
 /*-\r
- * Copyright (c) 2002-2018  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>\r
+ * Copyright (c) 2002-2019  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>\r
  * All rights reserved.\r
  *\r
  * Redistribution and use in source and binary forms, with or without\r
@@ -38,9 +38,9 @@ extern "C" {
 #define ONIGURUMA\r
 #define ONIGURUMA_VERSION_MAJOR   6\r
 #define ONIGURUMA_VERSION_MINOR   9\r
-#define ONIGURUMA_VERSION_TEENY   0\r
+#define ONIGURUMA_VERSION_TEENY   3\r
 \r
-#define ONIGURUMA_VERSION_INT     60900\r
+#define ONIGURUMA_VERSION_INT     60903\r
 \r
 #ifndef P_\r
 #if defined(__STDC__) || defined(_WIN32)\r
@@ -54,6 +54,7 @@ extern "C" {
 # define PV_(args) args\r
 #endif\r
 \r
+#ifndef ONIG_STATIC\r
 #ifndef ONIG_EXTERN\r
 #if defined(_WIN32) && !defined(__GNUC__)\r
 #if defined(ONIGURUMA_EXPORT)\r
@@ -67,6 +68,9 @@ extern "C" {
 #ifndef ONIG_EXTERN\r
 #define ONIG_EXTERN   extern\r
 #endif\r
+#else\r
+#define ONIG_EXTERN   extern\r
+#endif\r
 \r
 /* PART: character encoding */\r
 \r
@@ -387,8 +391,10 @@ typedef unsigned int        OnigOptionType;
 #define ONIG_OPTION_DIGIT_IS_ASCII       (ONIG_OPTION_WORD_IS_ASCII << 1)\r
 #define ONIG_OPTION_SPACE_IS_ASCII       (ONIG_OPTION_DIGIT_IS_ASCII << 1)\r
 #define ONIG_OPTION_POSIX_IS_ASCII       (ONIG_OPTION_SPACE_IS_ASCII << 1)\r
+#define ONIG_OPTION_TEXT_SEGMENT_EXTENDED_GRAPHEME_CLUSTER  (ONIG_OPTION_POSIX_IS_ASCII << 1)\r
+#define ONIG_OPTION_TEXT_SEGMENT_WORD    (ONIG_OPTION_TEXT_SEGMENT_EXTENDED_GRAPHEME_CLUSTER << 1)\r
 \r
-#define ONIG_OPTION_MAXBIT               ONIG_OPTION_POSIX_IS_ASCII  /* limit */\r
+#define ONIG_OPTION_MAXBIT               ONIG_OPTION_TEXT_SEGMENT_WORD  /* limit */\r
 \r
 #define ONIG_OPTION_ON(options,regopt)      ((options) |= (regopt))\r
 #define ONIG_OPTION_OFF(options,regopt)     ((options) &= ~(regopt))\r
@@ -492,10 +498,12 @@ ONIG_EXTERN OnigSyntaxType*   OnigDefaultSyntax;
 #define ONIG_SYN_OP2_ESC_CAPITAL_R_GENERAL_NEWLINE (1U<<23) /* \R \r\n else [\x0a-\x0d] */\r
 #define ONIG_SYN_OP2_ESC_CAPITAL_N_O_SUPER_DOT  (1U<<24) /* \N (?-m:.), \O (?m:.) */\r
 #define ONIG_SYN_OP2_QMARK_TILDE_ABSENT_GROUP   (1U<<25) /* (?~...) */\r
-#define ONIG_SYN_OP2_ESC_X_Y_GRAPHEME_CLUSTER   (1U<<26) /* \X \y \Y */\r
+#define ONIG_SYN_OP2_ESC_X_Y_GRAPHEME_CLUSTER   (1U<<26) /* obsoleted: use next */\r
+#define ONIG_SYN_OP2_ESC_X_Y_TEXT_SEGMENT       (1U<<26) /* \X \y \Y */\r
 #define ONIG_SYN_OP2_QMARK_PERL_SUBEXP_CALL     (1U<<27) /* (?R), (?&name)... */\r
 #define ONIG_SYN_OP2_QMARK_BRACE_CALLOUT_CONTENTS (1U<<28) /* (?{...}) (?{{...}}) */\r
 #define ONIG_SYN_OP2_ASTERISK_CALLOUT_NAME      (1U<<29) /* (*name) (*name{a,..}) */\r
+#define ONIG_SYN_OP2_OPTION_ONIGURUMA           (1U<<30) /* (?imxWDSPy) */\r
 \r
 /* syntax (behavior) */\r
 #define ONIG_SYN_CONTEXT_INDEP_ANCHORS           (1U<<31) /* not implemented */\r
@@ -515,6 +523,7 @@ ONIG_EXTERN OnigSyntaxType*   OnigDefaultSyntax;
 #define ONIG_SYN_BACKSLASH_ESCAPE_IN_CC          (1U<<21) /* [..\w..] etc.. */\r
 #define ONIG_SYN_ALLOW_EMPTY_RANGE_IN_CC         (1U<<22)\r
 #define ONIG_SYN_ALLOW_DOUBLE_RANGE_OP_IN_CC     (1U<<23) /* [0-9-a]=[0-9\-a] */\r
+#define ONIG_SYN_ALLOW_INVALID_CODE_END_OF_RANGE_IN_CC (1U<<26)\r
 /* syntax (behavior) warning */\r
 #define ONIG_SYN_WARN_CC_OP_NOT_ESCAPED          (1U<<24) /* [,-,] */\r
 #define ONIG_SYN_WARN_REDUNDANT_NESTED_REPEAT    (1U<<25) /* (?:a*)+ */\r
@@ -764,6 +773,8 @@ int onig_init P_((void));
 ONIG_EXTERN\r
 int EFIAPI onig_error_code_to_str PV_((OnigUChar* s, int err_code, ...));\r
 ONIG_EXTERN\r
+int onig_is_error_code_needs_param PV_((int code));\r
+ONIG_EXTERN\r
 void onig_set_warn_func P_((OnigWarnFunc f));\r
 ONIG_EXTERN\r
 void onig_set_verb_warn_func P_((OnigWarnFunc f));\r