summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/beginmainend.rb18
-rw-r--r--test/ruby/test_beginendblock.rb2
3 files changed, 24 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 611c033ffc..c6b436c53b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 6 11:57:06 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/ruby/test_beginendblock.rb, test/ruby/beginmainend.rb: added
+ test for eval-ed BEGIN END order.
+
Mon Oct 6 09:19:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* marshal.c (w_object): should pass "weak" value to next level.
diff --git a/test/ruby/beginmainend.rb b/test/ruby/beginmainend.rb
index f89c09207e..4710a7aeb1 100644
--- a/test/ruby/beginmainend.rb
+++ b/test/ruby/beginmainend.rb
@@ -27,6 +27,24 @@ END {
puts "should not be dumped"
}
+eval <<EOE
+ BEGIN {
+ puts "innerbegin1"
+ }
+
+ BEGIN {
+ puts "innerbegin2"
+ }
+
+ END {
+ puts "innerend2"
+ }
+
+ END {
+ puts "innerend1"
+ }
+EOE
+
END {
exit
puts "should not be dumped"
diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb
index 06b1519189..8fee163996 100644
--- a/test/ruby/test_beginendblock.rb
+++ b/test/ruby/test_beginendblock.rb
@@ -7,7 +7,7 @@ class TestBeginEndBlock < Test::Unit::TestCase
def test_beginendblock
ruby = EnvUtil.rubybin
io = IO.popen("\"#{ruby}\" \"#{DIR}/beginmainend.rb\"")
- assert_equal(%w(begin1 begin2 main end1 end2).join("\n") << "\n", io.read)
+ assert_equal(%w(begin1 begin2 main innerbegin1 innerbegin2 end1 innerend1 innerend2 end2).join("\n") << "\n", io.read)
end
def test_begininmethod