MdeModulePkg RegularExpressionDxe: Update Oniguruma to 6.9.0

[mirror_edk2.git] / MdeModulePkg / Universal / RegularExpressionDxe / Oniguruma / regsyntax.c

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regsyntax.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regsyntax.c
index dc4d68183b149d2e4d0dd9dbd295ab72f4109598..95a4434e6402ad87c78ff77b396b08385445864b 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regsyntax.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regsyntax.c
@@ -2,7 +2,7 @@
   regsyntax.c -  Oniguruma (regular expression library)\r
 **********************************************************************/\r
 /*-\r
- * Copyright (c) 2002-2006  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>\r
+ * Copyright (c) 2002-2018  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
@@ -168,13 +168,22 @@ OnigSyntaxType OnigSyntaxJava = {
 OnigSyntaxType OnigSyntaxPerl = {\r
   (( SYN_GNU_REGEX_OP | ONIG_SYN_OP_QMARK_NON_GREEDY |\r
      ONIG_SYN_OP_ESC_OCTAL3 | ONIG_SYN_OP_ESC_X_HEX2 |\r
-     ONIG_SYN_OP_ESC_X_BRACE_HEX8 | ONIG_SYN_OP_ESC_CONTROL_CHARS |\r
+     ONIG_SYN_OP_ESC_X_BRACE_HEX8 | ONIG_SYN_OP_ESC_O_BRACE_OCTAL |\r
+     ONIG_SYN_OP_ESC_CONTROL_CHARS |\r
      ONIG_SYN_OP_ESC_C_CONTROL )\r
    & ~ONIG_SYN_OP_ESC_LTGT_WORD_BEGIN_END )\r
   , ( ONIG_SYN_OP2_ESC_CAPITAL_Q_QUOTE |\r
       ONIG_SYN_OP2_QMARK_GROUP_EFFECT | ONIG_SYN_OP2_OPTION_PERL |\r
+      ONIG_SYN_OP2_QMARK_LPAREN_IF_ELSE |\r
+      ONIG_SYN_OP2_QMARK_TILDE_ABSENT_GROUP |\r
+      ONIG_SYN_OP2_QMARK_BRACE_CALLOUT_CONTENTS |\r
+      ONIG_SYN_OP2_ASTERISK_CALLOUT_NAME    |\r
+      ONIG_SYN_OP2_ESC_X_Y_GRAPHEME_CLUSTER |\r
       ONIG_SYN_OP2_ESC_P_BRACE_CHAR_PROPERTY |\r
-      ONIG_SYN_OP2_ESC_P_BRACE_CIRCUMFLEX_NOT )\r
+      ONIG_SYN_OP2_ESC_P_BRACE_CIRCUMFLEX_NOT |\r
+      ONIG_SYN_OP2_ESC_CAPITAL_K_KEEP |\r
+      ONIG_SYN_OP2_ESC_CAPITAL_R_GENERAL_NEWLINE |\r
+      ONIG_SYN_OP2_ESC_CAPITAL_N_O_SUPER_DOT )\r
   , SYN_GNU_REGEX_BV\r
   , ONIG_OPTION_SINGLELINE\r
   ,\r
@@ -192,16 +201,26 @@ OnigSyntaxType OnigSyntaxPerl = {
 OnigSyntaxType OnigSyntaxPerl_NG = {\r
   (( SYN_GNU_REGEX_OP | ONIG_SYN_OP_QMARK_NON_GREEDY |\r
      ONIG_SYN_OP_ESC_OCTAL3 | ONIG_SYN_OP_ESC_X_HEX2 |\r
-     ONIG_SYN_OP_ESC_X_BRACE_HEX8 | ONIG_SYN_OP_ESC_CONTROL_CHARS |\r
+     ONIG_SYN_OP_ESC_X_BRACE_HEX8 | ONIG_SYN_OP_ESC_O_BRACE_OCTAL |\r
+     ONIG_SYN_OP_ESC_CONTROL_CHARS |\r
      ONIG_SYN_OP_ESC_C_CONTROL )\r
    & ~ONIG_SYN_OP_ESC_LTGT_WORD_BEGIN_END )\r
   , ( ONIG_SYN_OP2_ESC_CAPITAL_Q_QUOTE |\r
       ONIG_SYN_OP2_QMARK_GROUP_EFFECT | ONIG_SYN_OP2_OPTION_PERL |\r
+      ONIG_SYN_OP2_QMARK_LPAREN_IF_ELSE |\r
+      ONIG_SYN_OP2_QMARK_TILDE_ABSENT_GROUP |\r
+      ONIG_SYN_OP2_QMARK_BRACE_CALLOUT_CONTENTS |\r
+      ONIG_SYN_OP2_ASTERISK_CALLOUT_NAME    |\r
+      ONIG_SYN_OP2_ESC_X_Y_GRAPHEME_CLUSTER |\r
       ONIG_SYN_OP2_ESC_P_BRACE_CHAR_PROPERTY  |\r
       ONIG_SYN_OP2_ESC_P_BRACE_CIRCUMFLEX_NOT |\r
       ONIG_SYN_OP2_QMARK_LT_NAMED_GROUP       |\r
       ONIG_SYN_OP2_ESC_K_NAMED_BACKREF        |\r
-      ONIG_SYN_OP2_ESC_G_SUBEXP_CALL )\r
+      ONIG_SYN_OP2_ESC_G_SUBEXP_CALL |\r
+      ONIG_SYN_OP2_ESC_CAPITAL_K_KEEP |\r
+      ONIG_SYN_OP2_ESC_CAPITAL_R_GENERAL_NEWLINE |\r
+      ONIG_SYN_OP2_ESC_CAPITAL_N_O_SUPER_DOT |\r
+      ONIG_SYN_OP2_QMARK_PERL_SUBEXP_CALL )\r
   , ( SYN_GNU_REGEX_BV |\r
       ONIG_SYN_CAPTURE_ONLY_NAMED_GROUP |\r
       ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME )\r
@@ -223,7 +242,7 @@ extern int
 onig_set_default_syntax(OnigSyntaxType* syntax)\r
 {\r
   if (IS_NULL(syntax))\r
-    syntax = ONIG_SYNTAX_RUBY;\r
+    syntax = ONIG_SYNTAX_ONIGURUMA;\r
 \r
   OnigDefaultSyntax = syntax;\r
   return 0;\r