From: Motohiro KOSAKI <redmine@...>
Date: 2010-12-15T02:13:42+09:00
Subject: [ruby-dev:42765] [Ruby 1.9-Bug#4159] test_block_variables(TestRipper::ParserEvents) が失敗する

チケット #4159 が更新されました。 (by Motohiro KOSAKI)


すいません。誰も対策していないは勘違いだったようです。
以下のようなコミットを発見してしまいました。くすん


commit 72ad8595f2032cfcf73084083306eef909eb42a5
Author: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date:   Sat Oct 3 13:14:19 2009 +0000

    * parse.y (bv_decls, bvar): fix for block variables.
      [ruby-dev:39423]


    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25209 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

diff --git a/ChangeLog b/ChangeLog
index 07893ce..efc175d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct  3 22:14:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+       * parse.y (bv_decls, bvar): fix for block variables.
+         [ruby-dev:39423]
+
 Sat Oct  3 21:19:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>

        * vm_method.c (rb_add_method_def): no redefinition warning on
diff --git a/parse.y b/parse.y
index 953eaa7..07ee4bc 100644
--- a/parse.y
+++ b/parse.y
@@ -3403,7 +3403,7 @@ bv_decls  : bvar
                    /*%c%*/
                    /*%c
                    {
-                       $$ = rb_ary_new2($1);
+                       $$ = rb_ary_new3(1, $1);
                    }
                    %*/
                | bv_decls ',' bvar
@@ -3417,10 +3417,10 @@ bv_decls        : bvar

 bvar           : tIDENTIFIER
                    {
-                       new_bv($1);
+                       new_bv(get_id($1));
                    /*%%%*/
                    /*%
-                       $$ = $1;
+                       $$ = get_value($1);
                    %*/
                    }
                | f_bad_arg
diff --git a/test/ripper/test_parser_events.rb b/test/ripper/test_parser_events.rb
index 4a4854b..80199ec 100644
--- a/test/ripper/test_parser_events.rb
+++ b/test/ripper/test_parser_events.rb
@@ -1,6 +1,7 @@
 begin

 require_relative 'dummyparser'
+require_relative '../ruby/envutil'
 require 'test/unit'

 class TestRipper_ParserEvents < Test::Unit::TestCase
@@ -566,6 +567,15 @@ class TestRipper_ParserEvents < Test::Unit::TestCase
     assert_equal("[fcall(p,[],&block([w],[#{div}]))]", parse("p{|w|w /25 # /\n}"), bug1939)
     assert_equal("[def(p,[w],bodystmt([#{div}]))]", parse("def p(w)\nw /25 # /\nend"), bug1939)
   end
+
+  def test_block_variables
+    assert_equal("[fcall(proc,[],&block([],[void()]))]", parse("proc{|;y|}"))
+    if defined?(Process::RLIMIT_AS)
+      assert_in_out_err(["-I#{File.dirname(__FILE__)}", "-rdummyparser"],
+                        'Process.setrlimit(Process::RLIMIT_AS,102400); puts DummyParser.new("proc{|;y|}").parse',
+                        ["[fcall(proc,[],&block([],[void()]))]"], [], '[ruby-dev:39423]')
+    end
+  end
 end

 rescue LoadError


----------------------------------------
http://redmine.ruby-lang.org/issues/show/4159

----------------------------------------
http://redmine.ruby-lang.org