merges r22363 from trunk into ruby_1_9_1.

* compile.c: fix to add "ensure" codes across "while" clause
  before "return" expression.  [ruby-dev:37967]
* bootstraptest/test_flow.rb: add a test.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@22536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 15 insertions, 2 deletions

diff --git a/bootstraptest/test_flow.rb b/bootstraptest/test_flow.rb
index 9964dfb2e..46ca1a0c6 100644
--- a/bootstraptest/test_flow.rb
+++ b/bootstraptest/test_flow.rb
@@ -200,7 +200,9 @@ assert_equal %q{[1, 2, 3, 5, 8, 9]}, %q{$a = []; begin; ; $a << 1
   end; $a << 8
 ; $a << 9
 ; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 5, 99]}, %q{$a = []; begin; ; $a << 1
+assert_equal %q{[1, 2, 3, 5, 99]}, %q{
+$a = [];
+begin; ; $a << 1
   while true; $a << 2
     begin; $a << 3
       break; $a << 4
@@ -488,4 +490,15 @@ assert_equal %q{[:ok, :ok2, :last]}, %q{
     a << :last
   end
   a
-   }
+}
+assert_equal %Q{ENSURE\n}, %q{
+  def test
+    while true
+      return
+    end
+  ensure
+    puts("ENSURE")
+  end
+  test
+}, '[ruby-dev:37967]'
+