diff --git a/ChangeLog b/ChangeLog index 41a946902c..cbfe954c46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu May 21 16:52:44 2015 Koichi Sasada + + * proc.c (rb_method_get_iseq): rename to rb_method_iseq. + + * iseq.c: catch up this fix. + Thu May 21 15:41:45 2015 SHIBATA Hiroshi * lib/net/telnet.rb: gemify net-telnet. diff --git a/iseq.c b/iseq.c index b4cdda3185..3ae92e8555 100644 --- a/iseq.c +++ b/iseq.c @@ -1520,7 +1520,7 @@ iseq_s_of(VALUE klass, VALUE body) ret = iseq->self; } } - else if ((iseq = rb_method_get_iseq(body)) != 0) { + else if ((iseq = rb_method_iseq(body)) != 0) { ret = iseq->self; } return ret; diff --git a/proc.c b/proc.c index 42a5d13a0a..b1a5bb03e5 100644 --- a/proc.c +++ b/proc.c @@ -924,7 +924,7 @@ rb_proc_get_iseq(VALUE self, int *is_proc) iseq = 0; if (IS_METHOD_PROC_ISEQ(ifunc)) { /* method(:foo).to_proc */ - iseq = rb_method_get_iseq((VALUE)ifunc->data); + iseq = rb_method_iseq((VALUE)ifunc->data); if (is_proc) *is_proc = 0; } } @@ -2216,7 +2216,7 @@ method_get_cref(rb_method_definition_t *def) rb_iseq_t * -rb_method_get_iseq(VALUE method) +rb_method_iseq(VALUE method) { return method_get_iseq(method_get_def(method)); } @@ -2277,7 +2277,7 @@ rb_method_location(VALUE method) static VALUE rb_method_parameters(VALUE method) { - rb_iseq_t *iseq = rb_method_get_iseq(method); + rb_iseq_t *iseq = rb_method_iseq(method); if (!iseq) { return unnamed_parameters(method_arity(method)); } @@ -2506,7 +2506,7 @@ proc_binding(VALUE self) if (!IS_METHOD_PROC_ISEQ(iseq)) { rb_raise(rb_eArgError, "Can't create Binding from C level Proc"); } - iseq = rb_method_get_iseq((VALUE)((struct vm_ifunc *)iseq)->data); + iseq = rb_method_iseq((VALUE)((struct vm_ifunc *)iseq)->data); GetEnvPtr(envval, env); if (iseq && env->local_size < iseq->local_size) { int prev_local_size = env->local_size;