summaryrefslogtreecommitdiff
path: root/vm_insnhelper.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-14 13:19:30 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-10-14 13:19:30 +0000
commit559fd3e439194bbc8d55cae30c8c1ba13832c8e8 (patch)
treeef41db126b616ae21c633176f9256e19f02fa8fe /vm_insnhelper.c
parent5825359dd87a26d5daf7a604583baa0ab48cc543 (diff)
* insns.def, iseq.c, vm_insnhelper.c: rename variable name
(ip -> iseq). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r--vm_insnhelper.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index ac24cd1ffc..75e0f91b36 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1375,24 +1375,24 @@ vm_search_normal_superclass(VALUE klass, VALUE recv)
}
static void
-vm_search_superclass(rb_control_frame_t *reg_cfp, rb_iseq_t *ip,
+vm_search_superclass(rb_control_frame_t *reg_cfp, rb_iseq_t *iseq,
VALUE recv, VALUE sigval,
ID *idp, VALUE *klassp)
{
ID id;
VALUE klass;
- while (ip && !ip->klass) {
- ip = ip->parent_iseq;
+ while (iseq && !iseq->klass) {
+ iseq = iseq->parent_iseq;
}
- if (ip == 0) {
+ if (iseq == 0) {
rb_raise(rb_eNoMethodError, "super called outside of method");
}
- id = ip->defined_method_id;
+ id = iseq->defined_method_id;
- if (ip != ip->local_iseq) {
+ if (iseq != iseq->local_iseq) {
/* defined by Module#define_method() */
rb_control_frame_t *lcfp = GET_CFP();
@@ -1401,7 +1401,7 @@ vm_search_superclass(rb_control_frame_t *reg_cfp, rb_iseq_t *ip,
rb_raise(rb_eRuntimeError, "implicit argument passing of super from method defined by define_method() is not supported. Specify all arguments explicitly.");
}
- while (lcfp->iseq != ip) {
+ while (lcfp->iseq != iseq) {
VALUE *tdfp = GET_PREV_DFP(lcfp->dfp);
while (1) {
lcfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(lcfp);
@@ -1420,7 +1420,7 @@ vm_search_superclass(rb_control_frame_t *reg_cfp, rb_iseq_t *ip,
klass = vm_search_normal_superclass(lcfp->me->klass, recv);
}
else {
- klass = vm_search_normal_superclass(ip->klass, recv);
+ klass = vm_search_normal_superclass(iseq->klass, recv);
}
*idp = id;