kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

* compile.c (iseq_set_arguments), insnhelper.ci 

(vm_callee_setup_arg, vm_yield_setup_args):
* bootstraptest/test_block.rb: add tests for above.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2007-08-18 02:48:13 +00:00
parent 69dd06ae68
commit 4d3a58bc69
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Sat Aug 18 11:44:59 2007 Koichi Sasada <ko1@atdot.net>
* compile.c (iseq_set_arguments), insnhelper.ci
(vm_callee_setup_arg, vm_yield_setup_args):
* bootstraptest/test_block.rb: add tests for above.
Sat Aug 18 01:12:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (frame_func_id): return proper method ID.

9
bootstraptest/test_block.rb
View File

@ -423,4 +423,13 @@ assert_equal '[0]', %q{
end
m{|v, &b| v}.inspect
}, '[ruby-dev:31440]'
assert_equal 'ok', %q{
begin
lambda{|a|}.call(1, 2)
rescue ArgumentError
:ok
else
:ng
end
}, '[ruby-dev:31464]'

2
compile.c
View File

@ -904,7 +904,7 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
if (iseq->arg_opts == 0 && iseq->arg_post_len == 0 && iseq->arg_rest == -1) {
if (iseq->argc == 1 && last_comma == 0) {
/* {|a|} */
iseq->arg_simple = 2;
iseq->arg_simple |= 0x02;
}
}
}

9
insnhelper.ci
View File

@ -103,7 +103,7 @@ vm_callee_setup_arg(rb_thread_t *th, rb_iseq_t *iseq,
const int m = iseq->argc;
const int orig_argc = argc;
if (iseq->arg_simple == 1) {
if (iseq->arg_simple & 0x01) {
/* simple check */
if (argc != m) {
rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
@ -683,7 +683,9 @@ vm_yield_setup_args(rb_thread_t *th, rb_iseq_t *iseq,
* => {|a|} => a = [1, 2]
* => {|a, b|} => a, b = [1, 2]
*/
if (iseq->arg_simple != 2 && (m + iseq->arg_post_len) > 0 && argc == 1 && TYPE(argv[0]) == T_ARRAY) {
if (!(iseq->arg_simple & 0x02) &&
(m + iseq->arg_post_len) > 0 &&
argc == 1 && TYPE(argv[0]) == T_ARRAY) {
VALUE ary = argv[0];
th->mark_stack_len = argc = RARRAY_LEN(ary);
@ -1316,7 +1318,8 @@ vm_throw(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_num_t throw_state, VAL
th->state = GET_THROWOBJ_STATE(err);
}
else {
th->state = FIX2INT(rb_ivar_get(err, idThrowState));
th->state = TAG_RAISE;
//th->state = FIX2INT(rb_ivar_get(err, idThrowState));
}
return err;
}