rename CALLOUT_DIRECTION_XXX to CALLOUT_IN_XXX

diff --git a/sample/callout.c b/sample/callout.c
index 53fb42c4281866f908d604a19cf6996a5c1ba7fb..db102b0c94d96aeab331dddd82122f702ffab432 100644 (file)
--- a/sample/callout.c
+++ b/sample/callout.c
@@ -23,7 +23,7 @@ callout_body(OnigCalloutArgs* args, void* user_data)
 
   fprintf(stdout,
           "%s: id: %d, content: \"%s\", start: \"%s\", current: \"%s\"\n",
-          args->direction == ONIG_CALLOUT_DIRECTION_NORMAL ? "NORMAL" : "RETRACTION",
+          args->in == ONIG_CALLOUT_IN_PROGRESS ? "PROGRESS" : "RETRACTION",
           args->id, content, args->start, args->current);
   free(content);
 

diff --git a/src/oniguruma.h b/src/oniguruma.h
index cf85c55954ed99ceafef482a550523ee1dd15ba6..f6e0d0cb73c82d7bb83c9583692a432be7ba0007 100644 (file)
--- a/src/oniguruma.h
+++ b/src/oniguruma.h
@@ -746,8 +746,8 @@ typedef struct {
 
 /* types for callout */
 enum {
-  ONIG_CALLOUT_DIRECTION_NORMAL     = 0,
-  ONIG_CALLOUT_DIRECTION_RETRACTION = 1,
+  ONIG_CALLOUT_IN_PROGRESS   = 0,
+  ONIG_CALLOUT_IN_RETRACTION = 1,
 };
 
 enum {
@@ -756,7 +756,7 @@ enum {
 };
 
 typedef struct {
-  int   direction;
+  int   in;
   int   of;
   int   id;
   const OnigUChar* content;

diff --git a/src/regexec.c b/src/regexec.c
index d860982ff001f1c27e21f8811b0f6a6f3d3ac159..f44a86ba123797f0fe3b5395bf349bcd48eae149 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -799,8 +799,8 @@ onig_region_copy(OnigRegion* to, OnigRegion* from)
 #endif
 }
 
-#define CALLOUT_CODE_BODY(func, dir, sid, cstart, cend, user, args, result) do { \
-  args.direction     = dir;\
+#define CALLOUT_CODE_BODY(func, ain, sid, cstart, cend, user, args, result) do { \
+  args.in            = ain;\
   args.of            = ONIG_CALLOUT_OF_CODE;\
   args.id            = sid;\
   args.content       = cstart;\
@@ -822,7 +822,7 @@ onig_region_copy(OnigRegion* to, OnigRegion* from)
 #define RETRACTION_CALLOUT_CODE(func, sid, cstart, cend, user) do {\
   int result;\
   CalloutArgs args;\
-  CALLOUT_CODE_BODY(func, ONIG_CALLOUT_DIRECTION_RETRACTION, sid, cstart, cend, user, args, result);\
+  CALLOUT_CODE_BODY(func, ONIG_CALLOUT_IN_RETRACTION, sid, cstart, cend, user, args, result);\
   switch (result) {\
   case ONIG_CALLOUT_FAIL:\
     goto fail;\
@@ -924,7 +924,7 @@ typedef struct _StackType {
 
 /* Synchronize visible part of the type with OnigCalloutArgs */
 typedef struct {
-  int   direction;
+  int   in;
   int   of;
   int   id;
   const OnigUChar* content;
@@ -3551,8 +3551,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
         GET_POINTER_INC(content_end,   p);
 
         if (IS_NOT_NULL(msa->mp->callout_of_code) &&
-            (dirs & CALLOUT_DIRECTION_NORMAL) != 0) {
-          CALLOUT_CODE_BODY(msa->mp->callout_of_code, ONIG_CALLOUT_DIRECTION_NORMAL,
+            (dirs & CALLOUT_IN_PROGRESS) != 0) {
+          CALLOUT_CODE_BODY(msa->mp->callout_of_code, ONIG_CALLOUT_IN_PROGRESS,
                             id, content_start, content_end,
                             msa->mp->callout_user_data, args, call_result);
           switch (call_result) {
@@ -3575,7 +3575,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
         }
         else {
         retraction_callout:
-          if ((dirs & CALLOUT_DIRECTION_RETRACTION) != 0 &&
+          if ((dirs & CALLOUT_IN_RETRACTION) != 0 &&
               IS_NOT_NULL(msa->mp->retraction_callout_of_code)) {
             STACK_PUSH_CALLOUT_CODE(id, content_start, content_end);
           }

diff --git a/src/regint.h b/src/regint.h
index c8f5550f2bf347a52d856764bf0cf5dcf6085b3a..d37cbec608f2aec7ed6091ebb73d5818fadd850c 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -615,8 +615,8 @@ enum UpdateVarType {
 };
 
 enum CalloutDirectionFlagType {
-  CALLOUT_DIRECTION_NORMAL     = 1,  /* == 1<<0 */
-  CALLOUT_DIRECTION_RETRACTION = 2   /* == 1<<1 */
+  CALLOUT_IN_PROGRESS   = 1,  /* == 1<<ONIG_CALLOUT_IN_PROGRESS */
+  CALLOUT_IN_RETRACTION = 2   /* == 1<<ONIG_CALLOUT_IN_RETRACTION */
 };
 
 typedef int RelAddrType;

diff --git a/src/regparse.c b/src/regparse.c
index a628d3f14b1c84f1e316df4d4ab8184354b24414..7bb4cc0d944e4d066d75de23bd3c643645f27650 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -5726,7 +5726,7 @@ parse_code_callout(Node** np, int cterm, UChar** src, UChar* end, ScanEnv* env)
     if (PEND) return ONIGERR_INVALID_CALLOUT_PATTERN;
   }
 
-  dirs = CALLOUT_DIRECTION_NORMAL;
+  dirs = CALLOUT_IN_PROGRESS;
   code_start = p;
   while (1) {
     if (PEND) return ONIGERR_INVALID_CALLOUT_PATTERN;
@@ -5748,12 +5748,12 @@ parse_code_callout(Node** np, int cterm, UChar** src, UChar* end, ScanEnv* env)
   if (PEND) return ONIGERR_END_PATTERN_IN_GROUP;
   PFETCH_S(c);
   if (c == '+') {
-    dirs |= CALLOUT_DIRECTION_RETRACTION;
+    dirs |= CALLOUT_IN_RETRACTION;
     if (PEND) return ONIGERR_END_PATTERN_IN_GROUP;
     PFETCH_S(c);
   }
   else if (c == '-') {
-    dirs = CALLOUT_DIRECTION_RETRACTION;
+    dirs = CALLOUT_IN_RETRACTION;
     if (PEND) return ONIGERR_END_PATTERN_IN_GROUP;
     PFETCH_S(c);
   }