summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-06-21 15:36:06 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-06-21 15:36:06 +0000
commit47b57348e6d85926d8da91b2136b22f0a079388a (patch)
tree5e27602804e97f5c59cd0d161a13bebb37508b12
parent9060b3355a9d67e547b71e81a6bb20d7199822f2 (diff)
* 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
-rw-r--r--ChangeLog3
-rw-r--r--eval.c6
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a54e479..07b1b1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
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.
[ruby-talk:74006]
diff --git a/eval.c b/eval.c
index c4cd1ac..5746d60 100644
--- a/eval.c
+++ b/eval.c
@@ -7000,13 +7000,11 @@ proc_invoke(proc, args, self, klass)
state == TAG_BREAK ? "break" : "return");
localjump_error(mesg, prot_tag->retval, state);
}
- else {
+ else if (state == incoming_state) {
ruby_block->tag->dst = incoming_state;
- JUMP_TAG(incoming_state);
}
- break;
default:
- JUMP_TAG(incoming_state);
+ JUMP_TAG(state);
}
return result;
}