From 5fe5a24586ac9a698e0a9c8f0f6d4684e1d2609d Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 22 May 2010 10:41:43 +0000
Subject: merge revision(s) 26534:26536: 	* eval.c (proc_invoke):
 reverted r25975.  [ruby-dev:39931] 	  [ruby-dev:40059] 	* eval.c
 (rb_mod_define_method): return original block but not 	  bound block. 
 [ruby-core:26984]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog               |  8 ++++++++
 eval.c                  |  8 ++++----
 test/ruby/test_super.rb | 21 +++++++++++++++++++++
 version.h               |  8 ++++----
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ff33465b3c..5054516b59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat May 22 19:36:38 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (proc_invoke): reverted r25975.  [ruby-dev:39931]
+	  [ruby-dev:40059]
+
+	* eval.c (rb_mod_define_method): return original block but not
+	  bound block.  [ruby-core:26984]
+
 Thu May 20 16:28:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/webrick/httpservlet/filehandler.rb (make_partial_content):
diff --git a/eval.c b/eval.c
index a4f488f06b..5c28881474 100644
--- a/eval.c
+++ b/eval.c
@@ -8868,8 +8868,7 @@ proc_invoke(proc, args, self, klass)
     _block = *data;
     _block.block_obj = bvar;
     if (self != Qundef) _block.frame.self = self;
-    _block.frame.last_class = klass;
-    if (!klass) _block.frame.last_func = 0;
+    if (klass) _block.frame.last_class = klass;
     _block.frame.argc = RARRAY(tmp)->len;
     _block.frame.flags = ruby_frame->flags;
     if (_block.frame.argc && DMETHOD_P()) {
@@ -9967,7 +9966,7 @@ rb_mod_define_method(argc, argv, mod)
     VALUE mod;
 {
     ID id;
-    VALUE body;
+    VALUE body, orig;
     NODE *node;
     int noex;
 
@@ -9986,6 +9985,7 @@ rb_mod_define_method(argc, argv, mod)
     else {
 	rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
     }
+    orig = body;
     if (RDATA(body)->dmark == (RUBY_DATA_FUNC)bm_mark) {
 	node = NEW_DMETHOD(method_unbind(body));
     }
@@ -10014,7 +10014,7 @@ rb_mod_define_method(argc, argv, mod)
 	}
     }
     rb_add_method(mod, id, node, noex);
-    return body;
+    return orig;
 }
 
 /*
diff --git a/test/ruby/test_super.rb b/test/ruby/test_super.rb
index a9d931c0ef..168bace449 100644
--- a/test/ruby/test_super.rb
+++ b/test/ruby/test_super.rb
@@ -149,4 +149,25 @@ class TestSuper < Test::Unit::TestCase
     c = C.new
     assert_equal([c, "#{C.to_s}::m"], c.m, bug2419)
   end
+
+  module Bug2537
+    class Parent
+      def run(a)
+        a
+      end
+    end
+
+    class Child < Parent
+      def run(*a)
+        proc {super(*a)}.call
+      end
+    end
+  end
+
+  def test_super_in_block_call
+    bug2537 = '[ruby-dev:39931]'
+    assert_nothing_raised(bug2537) do
+      assert_equal(bug2537, Bug2537::Child.new.run(bug2537), bug2537)
+    end
+  end
 end
diff --git a/version.h b/version.h
index 6f8d60c7c4..368efd3558 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2010-05-20"
+#define RUBY_RELEASE_DATE "2010-05-22"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20100520
-#define RUBY_PATCHLEVEL 259
+#define RUBY_RELEASE_CODE 20100522
+#define RUBY_PATCHLEVEL 260
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 22
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
-- 
cgit v1.2.3