mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* proc.c (rb_method_get_iseq): rename to rb_method_iseq.
* iseq.c: catch up this fix. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
0b5ecba435
commit
0dba10a47f
3 changed files with 11 additions and 5 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
Thu May 21 16:52:44 2015 Koichi Sasada <ko1@atdot.net>
|
||||||
|
|
||||||
|
* 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 <hsbt@ruby-lang.org>
|
Thu May 21 15:41:45 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
|
||||||
|
|
||||||
* lib/net/telnet.rb: gemify net-telnet.
|
* lib/net/telnet.rb: gemify net-telnet.
|
||||||
|
|
2
iseq.c
2
iseq.c
|
@ -1520,7 +1520,7 @@ iseq_s_of(VALUE klass, VALUE body)
|
||||||
ret = iseq->self;
|
ret = iseq->self;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ((iseq = rb_method_get_iseq(body)) != 0) {
|
else if ((iseq = rb_method_iseq(body)) != 0) {
|
||||||
ret = iseq->self;
|
ret = iseq->self;
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
|
|
8
proc.c
8
proc.c
|
@ -924,7 +924,7 @@ rb_proc_get_iseq(VALUE self, int *is_proc)
|
||||||
iseq = 0;
|
iseq = 0;
|
||||||
if (IS_METHOD_PROC_ISEQ(ifunc)) {
|
if (IS_METHOD_PROC_ISEQ(ifunc)) {
|
||||||
/* method(:foo).to_proc */
|
/* 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;
|
if (is_proc) *is_proc = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2216,7 +2216,7 @@ method_get_cref(rb_method_definition_t *def)
|
||||||
|
|
||||||
|
|
||||||
rb_iseq_t *
|
rb_iseq_t *
|
||||||
rb_method_get_iseq(VALUE method)
|
rb_method_iseq(VALUE method)
|
||||||
{
|
{
|
||||||
return method_get_iseq(method_get_def(method));
|
return method_get_iseq(method_get_def(method));
|
||||||
}
|
}
|
||||||
|
@ -2277,7 +2277,7 @@ rb_method_location(VALUE method)
|
||||||
static VALUE
|
static VALUE
|
||||||
rb_method_parameters(VALUE method)
|
rb_method_parameters(VALUE method)
|
||||||
{
|
{
|
||||||
rb_iseq_t *iseq = rb_method_get_iseq(method);
|
rb_iseq_t *iseq = rb_method_iseq(method);
|
||||||
if (!iseq) {
|
if (!iseq) {
|
||||||
return unnamed_parameters(method_arity(method));
|
return unnamed_parameters(method_arity(method));
|
||||||
}
|
}
|
||||||
|
@ -2506,7 +2506,7 @@ proc_binding(VALUE self)
|
||||||
if (!IS_METHOD_PROC_ISEQ(iseq)) {
|
if (!IS_METHOD_PROC_ISEQ(iseq)) {
|
||||||
rb_raise(rb_eArgError, "Can't create Binding from C level Proc");
|
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);
|
GetEnvPtr(envval, env);
|
||||||
if (iseq && env->local_size < iseq->local_size) {
|
if (iseq && env->local_size < iseq->local_size) {
|
||||||
int prev_local_size = env->local_size;
|
int prev_local_size = env->local_size;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue