remove enum CalloutDirectionFlagType

diff --git a/src/oniguruma.h b/src/oniguruma.h
index 05659b3d0832bd11c4753585c8e52f7b07bf7904..3c7e23557a3dafe45e7d2ee827e34712c4a9bdda 100644 (file)
--- a/src/oniguruma.h
+++ b/src/oniguruma.h
@@ -724,13 +724,13 @@ typedef struct {
 
 /* types for callout */
 enum OnigCalloutIn {
-  ONIG_CALLOUT_IN_PROGRESS   = 0,
-  ONIG_CALLOUT_IN_RETRACTION = 1,
+  ONIG_CALLOUT_IN_PROGRESS   = 1, /* 1<<0 */
+  ONIG_CALLOUT_IN_RETRACTION = 2  /* 1<<1 */
 };
 
 enum OnigCalloutOf {
   ONIG_CALLOUT_OF_CODE = 0,
-  ONIG_CALLOUT_OF_NAME = 1,
+  ONIG_CALLOUT_OF_NAME = 1
 };
 
 #define ONIG_NO_NAME_ID   -1

diff --git a/src/regexec.c b/src/regexec.c
index 4c7cd47559c40824e6b6abed7b97b975a8ba6d91..2ce818fb6a519a920a4286f3db218da9d19dc269 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -3696,7 +3696,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
         GET_POINTER_INC(content_start, p);
         GET_POINTER_INC(content_end,   p);
 
-        if (IS_NOT_NULL(func) && (dirs & CALLOUT_IN_PROGRESS) != 0) {
+        if (IS_NOT_NULL(func) && (dirs & ONIG_CALLOUT_IN_PROGRESS) != 0) {
           CALLOUT_BODY(func, ONIG_CALLOUT_IN_PROGRESS, of, name_id,
                        num, content_start, content_end,
                        msa->mp->callout_user_data, args, call_result);
@@ -3720,7 +3720,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
         }
         else {
         retraction_callout2:
-          if ((dirs & CALLOUT_IN_RETRACTION) != 0) {
+          if ((dirs & ONIG_CALLOUT_IN_RETRACTION) != 0) {
             if (of == ONIG_CALLOUT_OF_NAME) {
               func = onig_get_callout_func_from_id(name_id);
               if (IS_NOT_NULL(func)) {

diff --git a/src/regint.h b/src/regint.h
index eac8346e2f4debbbc0d1dfad6db32f4948419e8b..ea3553fefadeb4083b319ffa42908646509fc491 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -629,13 +629,6 @@ enum UpdateVarType {
   UPDATE_VAR_RIGHT_RANGE_INIT         = 4,
 };
 
-#ifdef USE_CALLOUT
-enum CalloutDirectionFlagType {
-  CALLOUT_IN_PROGRESS   = 1,  /* == 1<<ONIG_CALLOUT_IN_PROGRESS */
-  CALLOUT_IN_RETRACTION = 2   /* == 1<<ONIG_CALLOUT_IN_RETRACTION */
-};
-#endif
-
 typedef int RelAddrType;
 typedef int AbsAddrType;
 typedef int LengthType;

diff --git a/src/regparse.c b/src/regparse.c
index d6830c263c3c2547d4f1e88aef07d570917852f6..874ddcdfdf14c6ad4f26dc13ef21087f1fa51ec5 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -6223,7 +6223,7 @@ parse_callout_of_code(Node** np, int cterm, UChar** src, UChar* end, ScanEnv* en
     if (PEND) return ONIGERR_INVALID_CALLOUT_PATTERN;
   }
 
-  dirs = CALLOUT_IN_PROGRESS;
+  dirs = ONIG_CALLOUT_IN_PROGRESS;
   code_start = p;
   while (1) {
     if (PEND) return ONIGERR_INVALID_CALLOUT_PATTERN;
@@ -6245,12 +6245,12 @@ parse_callout_of_code(Node** np, int cterm, UChar** src, UChar* end, ScanEnv* en
   if (PEND) return ONIGERR_END_PATTERN_IN_GROUP;
   PFETCH_S(c);
   if (c == '+') {
-    dirs |= CALLOUT_IN_RETRACTION;
+    dirs |= ONIG_CALLOUT_IN_RETRACTION;
     if (PEND) return ONIGERR_END_PATTERN_IN_GROUP;
     PFETCH_S(c);
   }
   else if (c == '-') {
-    dirs = CALLOUT_IN_RETRACTION;
+    dirs = ONIG_CALLOUT_IN_RETRACTION;
     if (PEND) return ONIGERR_END_PATTERN_IN_GROUP;
     PFETCH_S(c);
   }
@@ -6293,14 +6293,14 @@ parse_callout_of_name(Node** np, int cterm, UChar** src, UChar* end, ScanEnv* en
   if (PEND) return ONIGERR_INVALID_CALLOUT_PATTERN;
 
   node = 0;
-  dirs = CALLOUT_IN_PROGRESS;
+  dirs = ONIG_CALLOUT_IN_PROGRESS;
   name_start = p;
   while (! PEND) {
     name_end = p;
     PFETCH_S(c);
     if (c == '+' || c == '-') {
-      if (c == '+') dirs |= CALLOUT_IN_RETRACTION;
-      else          dirs  = CALLOUT_IN_RETRACTION;
+      if (c == '+') dirs |= ONIG_CALLOUT_IN_RETRACTION;
+      else          dirs  = ONIG_CALLOUT_IN_RETRACTION;
 
       if (PEND) return ONIGERR_END_PATTERN_IN_GROUP;
       PFETCH_S(c);