Revert "Simplify rescue stack management; ref #3683"

This reverts commit eb5a606fe209944d0757301edb331ed7ff0fd31f and
079f310fbc9c23b97f062230c32bd91ac65e4835.
The rescue stack works differently from ensure stack, so the change
caused #3686 and #3688. It might take long to solve the problems,
so that I would revert the changes for now. Fix #3688

1 files changed, 2 insertions, 2 deletions

diff --git a/include/mruby.h b/include/mruby.h
index 3895c4ec3..bd824ea91 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -112,7 +112,7 @@ typedef struct {
   struct RProc *proc;
   mrb_value *stackent;
   int nregs;
-  int rpos;
+  int ridx;
   int epos;
   struct REnv *env;
   mrb_code *pc;                 /* return address */
@@ -141,7 +141,7 @@ struct mrb_context {
   mrb_callinfo *cibase, *ciend;
 
   mrb_code **rescue;                      /* exception handler stack */
-  int rsize, ridx;
+  int rsize;
   struct RProc **ensure;                  /* ensure handler stack */
   int esize, eidx;