refactoring

diff --git a/src/oniguruma.h b/src/oniguruma.h
index c5ece42945bf13b986920c4e656c8d0ef749bf21..bb5fe74f31ae21711754d9a305b41f3e69a87769 100644 (file)
--- a/src/oniguruma.h
+++ b/src/oniguruma.h
@@ -521,7 +521,7 @@ ONIG_EXTERN OnigSyntaxType*   OnigDefaultSyntax;
 #define ONIG_SYN_BACKSLASH_ESCAPE_IN_CC          (1U<<21) /* [..\w..] etc.. */
 #define ONIG_SYN_ALLOW_EMPTY_RANGE_IN_CC         (1U<<22)
 #define ONIG_SYN_ALLOW_DOUBLE_RANGE_OP_IN_CC     (1U<<23) /* [0-9-a]=[0-9\-a] */
-#define ONIG_SYN_ALLOW_INVALID_CODE_END_OF_RANGE (1U<<26)
+#define ONIG_SYN_ALLOW_INVALID_CODE_END_OF_RANGE_IN_CC (1U<<26)
 /* syntax (behavior) warning */
 #define ONIG_SYN_WARN_CC_OP_NOT_ESCAPED          (1U<<24) /* [,-,] */
 #define ONIG_SYN_WARN_REDUNDANT_NESTED_REPEAT    (1U<<25) /* (?:a*)+ */

diff --git a/src/regparse.c b/src/regparse.c
index e10edbe9c5d301a75f4c33ce280851c3e64880c8..7f8b1a98ae191b29a3e7d54047446f13eb7ad678 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -77,7 +77,7 @@ OnigSyntaxType OnigSyntaxOniguruma = {
       ONIG_SYN_CAPTURE_ONLY_NAMED_GROUP |
       ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME |
       ONIG_SYN_FIXED_INTERVAL_IS_GREEDY_ONLY |
-      ONIG_SYN_ALLOW_INVALID_CODE_END_OF_RANGE |
+      ONIG_SYN_ALLOW_INVALID_CODE_END_OF_RANGE_IN_CC |
       ONIG_SYN_WARN_CC_OP_NOT_ESCAPED |
       ONIG_SYN_WARN_REDUNDANT_NESTED_REPEAT )
   , ONIG_OPTION_NONE
@@ -6386,7 +6386,8 @@ parse_char_class(Node** np, PToken* tok, UChar** src, UChar* end, ScanEnv* env)
       len = ONIGENC_CODE_TO_MBCLEN(env->enc, v);
       if (len < 0) {
         if (state != CCS_RANGE ||
-            ! IS_SYNTAX_BV(env->syntax, ONIG_SYN_ALLOW_INVALID_CODE_END_OF_RANGE) ||
+            ! IS_SYNTAX_BV(env->syntax,
+                           ONIG_SYN_ALLOW_INVALID_CODE_END_OF_RANGE_IN_CC) ||
             v < 0x100 || ONIGENC_MBC_MAXLEN(env->enc) == 1) {
           r = len;
           goto err;