summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-12 08:33:32 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-12 08:33:32 +0000
commit559d770690a3954e0d0f4cb1337f6783e72f46cc (patch)
tree973cf7be5688562869c27b98f8504796a82407fe
parent28ffefc51d8be3501e05851dbb3bc8be864faa39 (diff)
downloadruby-559d770690a3954e0d0f4cb1337f6783e72f46cc.tar.gz
ruby-559d770690a3954e0d0f4cb1337f6783e72f46cc.tar.xz
ruby-559d770690a3954e0d0f4cb1337f6783e72f46cc.zip
* eval.c (break_jump): break should not cross functions.
[ruby-list:40818] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 02e86d1b6..7c3c36d47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,11 @@ Wed May 11 16:20:01 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape_path): should
not use String#split("/"). (backported from HEAD)
+Wed May 11 15:58:39 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (break_jump): break should not cross functions.
+ [ruby-list:40818]
+
Wed May 11 10:39:37 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/tempfile.rb (Tempfile#unlink): fixed typo.
diff --git a/eval.c b/eval.c
index 65329ff7b..e7daf7699 100644
--- a/eval.c
+++ b/eval.c
@@ -4672,6 +4672,9 @@ break_jump(retval)
tt->retval = retval;
JUMP_TAG(TAG_BREAK);
break;
+ case PROT_FUNC:
+ tt = 0;
+ continue;
default:
break;
}