From: K.Kosako <kkosako0@gmail.com>
Date: Sat, 22 Jul 2017 14:11:52 +0000 (+0900)
Subject: refactoring
X-Git-Tag: v6.5.0^2~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ce2a1d9ff27cc6ce029fa57dda313ee7e7f0f5a;p=onig

refactoring
---

diff --git a/src/regexec.c b/src/regexec.c
index 102c075..7f010c7 100644
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -2944,13 +2944,13 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
         case UPDATE_VAR_KEEP_FROM_STACK_LAST:
           STACK_GET_SAVE_VAL_TYPE_LAST(SAVE_KEEP, keep);
           break;
-        case UPDATE_VAR_S_FROM_STACK_LAST:
+        case UPDATE_VAR_S_FROM_STACK:
           STACK_GET_SAVE_VAL_TYPE_LAST_ID(SAVE_S, mem, s);
           break;
-        case UPDATE_VAR_RIGHT_RANGE_FROM_S_STACK_LAST:
+        case UPDATE_VAR_RIGHT_RANGE_FROM_S_STACK:
           STACK_GET_SAVE_VAL_TYPE_LAST_ID(SAVE_S, mem, right_range);
           break;
-        case UPDATE_VAR_RIGHT_RANGE_FROM_STACK_LAST:
+        case UPDATE_VAR_RIGHT_RANGE_FROM_STACK:
           {
             StackType* from;
             if (right_range_index != INVALID_STACK_INDEX &&
diff --git a/src/regint.h b/src/regint.h
index 7a4fa8f..d06b355 100644
--- a/src/regint.h
+++ b/src/regint.h
@@ -563,11 +563,11 @@ enum SaveType {
 };
 
 enum UpdateVarType {
-  UPDATE_VAR_KEEP_FROM_STACK_LAST          = 0,
-  UPDATE_VAR_S_FROM_STACK_LAST             = 1,
-  UPDATE_VAR_RIGHT_RANGE_FROM_STACK_LAST   = 2,
-  UPDATE_VAR_RIGHT_RANGE_FROM_S_STACK_LAST = 3,
-  UPDATE_VAR_RIGHT_RANGE_SPREV             = 4,
+  UPDATE_VAR_KEEP_FROM_STACK_LAST     = 0,
+  UPDATE_VAR_S_FROM_STACK             = 1,
+  UPDATE_VAR_RIGHT_RANGE_FROM_STACK   = 2,
+  UPDATE_VAR_RIGHT_RANGE_FROM_S_STACK = 3,
+  UPDATE_VAR_RIGHT_RANGE_SPREV        = 4,
 };
 
 typedef int RelAddrType;
diff --git a/src/regparse.c b/src/regparse.c
index e320e8f..9da9cc7 100644
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -1814,7 +1814,7 @@ make_absent_group_restore_fail_for_lower_no_zero(Node** node, Node* repeat_line,
   restore = NULL_NODE;
   ns[0] = ns[1] = NULL_NODE;
   r = node_new_update_var_gimmick(&ns[0],
-                                  UPDATE_VAR_RIGHT_RANGE_FROM_STACK_LAST, id, env);
+                                  UPDATE_VAR_RIGHT_RANGE_FROM_STACK, id, env);
   if (r != 0) goto err;
 
   r = node_new_fail(&ns[1], env);
@@ -1950,7 +1950,7 @@ make_absent_group_tree(Node** node, Node* absent_body,
   ns[0] = save;
   ns[1] = IS_NULL(stop_bt) ? repeat : stop_bt;
 
-  r = node_new_update_var_gimmick(&update, UPDATE_VAR_RIGHT_RANGE_FROM_STACK_LAST,
+  r = node_new_update_var_gimmick(&update, UPDATE_VAR_RIGHT_RANGE_FROM_STACK,
                                   id, env);
   if (r != 0) goto err2;
   ns[2] = update;