* eval.c (proc_invoke): should not propagate distination tag if
tag is already handled in this level. (ruby-bugs-ja PR#501) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
9060b3355a
commit
47b57348e6
@ -1,5 +1,8 @@
|
|||||||
Sat Jun 21 23:15:08 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
|
Sat Jun 21 23:15:08 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
|
* eval.c (proc_invoke): should not propagate distination tag if
|
||||||
|
tag is already handled in this level. (ruby-bugs-ja PR#501)
|
||||||
|
|
||||||
* object.c (str_to_id): check for empty string before intern.
|
* object.c (str_to_id): check for empty string before intern.
|
||||||
[ruby-talk:74006]
|
[ruby-talk:74006]
|
||||||
|
|
||||||
|
6
eval.c
6
eval.c
@ -7000,13 +7000,11 @@ proc_invoke(proc, args, self, klass)
|
|||||||
state == TAG_BREAK ? "break" : "return");
|
state == TAG_BREAK ? "break" : "return");
|
||||||
localjump_error(mesg, prot_tag->retval, state);
|
localjump_error(mesg, prot_tag->retval, state);
|
||||||
}
|
}
|
||||||
else {
|
else if (state == incoming_state) {
|
||||||
ruby_block->tag->dst = incoming_state;
|
ruby_block->tag->dst = incoming_state;
|
||||||
JUMP_TAG(incoming_state);
|
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
JUMP_TAG(incoming_state);
|
JUMP_TAG(state);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user