refactoring

diff --git a/src/regexec.c b/src/regexec.c
index 102c07571f404c9d2927eda25d21f83cd9a124da..7f010c71eefe71056773b52c22ce4472a3324e06 100644 (file)
--- 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 7a4fa8f85b2fa0d5cc4fde75d0380e45a62568f2..d06b355ed60dcf0d2f0400e6cb521c4c79213075 100644 (file)
--- 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 e320e8f7aec10514764616fea3d2890f9b055204..9da9cc77f73bfe6389d9e1ea1d746891d994f00b 100644 (file)
--- 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;