mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* compile.c (iseq_build_from_ary): initialize arg_opts, a patch from
Adam Strzelecki <ono@java.pl> in [ruby-core:17220]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
a1c3a776e8
commit
59e103794e
2 changed files with 8 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Tue Jun 24 00:21:53 2008 Yusuke Endoh <mame@tsg.ne.jp>
|
||||||
|
|
||||||
|
* compile.c (iseq_build_from_ary): initialize arg_opts, a patch from
|
||||||
|
Adam Strzelecki <ono@java.pl> in [ruby-core:17220].
|
||||||
|
|
||||||
Tue Jun 24 00:10:53 2008 wanabe <s.wanabe@gmail.com>
|
Tue Jun 24 00:10:53 2008 wanabe <s.wanabe@gmail.com>
|
||||||
* compile.c (iseq_build_from_ary): fix expression to obtain
|
* compile.c (iseq_build_from_ary): fix expression to obtain
|
||||||
iseq->local_size and iseq->local_table_size. [ruby-dev:35205]
|
iseq->local_size and iseq->local_table_size. [ruby-dev:35205]
|
||||||
|
|
|
@ -5019,7 +5019,8 @@ iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args,
|
||||||
iseq->arg_post_len = FIX2INT(arg_post_len);
|
iseq->arg_post_len = FIX2INT(arg_post_len);
|
||||||
iseq->arg_post_start = FIX2INT(arg_post_start);
|
iseq->arg_post_start = FIX2INT(arg_post_start);
|
||||||
iseq->arg_block = FIX2INT(arg_block);
|
iseq->arg_block = FIX2INT(arg_block);
|
||||||
iseq->arg_opt_table = (VALUE *)ALLOC_N(VALUE, RARRAY_LEN(arg_opt_labels));
|
iseq->arg_opts = RARRAY_LEN(arg_opt_labels);
|
||||||
|
iseq->arg_opt_table = (VALUE *)ALLOC_N(VALUE, iseq->arg_opts);
|
||||||
|
|
||||||
if (iseq->arg_block != -1) {
|
if (iseq->arg_block != -1) {
|
||||||
iseq->arg_size = iseq->arg_block + 1;
|
iseq->arg_size = iseq->arg_block + 1;
|
||||||
|
@ -5031,7 +5032,7 @@ iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args,
|
||||||
iseq->arg_size = iseq->arg_rest + 1;
|
iseq->arg_size = iseq->arg_rest + 1;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
iseq->arg_size = iseq->argc + iseq->arg_opts;
|
iseq->arg_size = iseq->argc + (iseq->arg_opts ? iseq->arg_opts - 1 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i=0; i<RARRAY_LEN(arg_opt_labels); i++) {
|
for (i=0; i<RARRAY_LEN(arg_opt_labels); i++) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue