refactoring

diff --git a/src/regcomp.c b/src/regcomp.c
index 365b6348b8141896729d0d9ca7240eb97c6ac5c3..90fc8321118d49a39438926026dea7204f34d81d 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -2303,11 +2303,11 @@ disable_noname_group_capture(Node** root, regex_t* reg, ScanEnv* env)
     }
   }
 
-  loc = env->capture_history;
-  MEM_STATUS_CLEAR(env->capture_history);
+  loc = env->cap_history;
+  MEM_STATUS_CLEAR(env->cap_history);
   for (i = 1; i <= ONIG_MAX_CAPTURE_HISTORY_GROUP; i++) {
     if (MEM_STATUS_AT(loc, i)) {
-      MEM_STATUS_ON_SIMPLE(env->capture_history, map[i].new_val);
+      MEM_STATUS_ON_SIMPLE(env->cap_history, map[i].new_val);
     }
   }
 
@@ -6374,7 +6374,7 @@ onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
   print_tree(stderr, root);
 #endif
 
-  reg->capture_history  = scan_env.capture_history;
+  reg->capture_history  = scan_env.cap_history;
   reg->bt_mem_start     = scan_env.st_mem_start;
   reg->bt_mem_start    |= reg->capture_history;
   if (IS_FIND_CONDITION(reg->options))

diff --git a/src/regparse.c b/src/regparse.c
index fa96f2d8f68c7219cd89daff3381a7e1bae8ed1f..72de9f7f84129a275a89011075c3a016f4cfcb33 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -1945,7 +1945,7 @@ callout_tag_entry(ScanEnv* env, regex_t* reg, UChar* name, UChar* name_end,
 static void
 scan_env_clear(ScanEnv* env)
 {
-  MEM_STATUS_CLEAR(env->capture_history);
+  MEM_STATUS_CLEAR(env->cap_history);
   MEM_STATUS_CLEAR(env->st_mem_start);
   MEM_STATUS_CLEAR(env->st_mem_end);
   MEM_STATUS_CLEAR(env->backrefed_mem);
@@ -7115,7 +7115,7 @@ parse_bag(Node** np, PToken* tok, int term, UChar** src, UChar* end,
           CHECK_NULL_RETURN_MEMERR(*np);
           BAG_(*np)->m.regnum = num;
           if (list_capture != 0)
-            MEM_STATUS_ON_SIMPLE(env->capture_history, num);
+            MEM_STATUS_ON_SIMPLE(env->cap_history, num);
           env->num_named++;
         }
         else {
@@ -7434,7 +7434,7 @@ parse_bag(Node** np, PToken* tok, int term, UChar** src, UChar* end,
           return ONIGERR_GROUP_NUMBER_OVER_FOR_CAPTURE_HISTORY;
         }
         BAG_(*np)->m.regnum = num;
-        MEM_STATUS_ON_SIMPLE(env->capture_history, num);
+        MEM_STATUS_ON_SIMPLE(env->cap_history, num);
       }
       else {
         return ONIGERR_UNDEFINED_GROUP_OPTION;

diff --git a/src/regparse.h b/src/regparse.h
index 2ce2d39390d4a9248ab2eae3c2b40f1daf4ba709..d97db915d4245d632d36b1a8a250cd5a71af1831 100644 (file)
--- a/src/regparse.h
+++ b/src/regparse.h
@@ -380,7 +380,7 @@ typedef struct {
   OnigCaseFoldType case_fold_flag;
   OnigEncoding     enc;
   OnigSyntaxType*  syntax;
-  MemStatusType    capture_history;
+  MemStatusType    cap_history;
   MemStatusType    st_mem_start;
   MemStatusType    st_mem_end;
   MemStatusType    backrefed_mem;