yugui	2010-12-02 17:05:28 +0900 (Thu, 02 Dec 2010)

  New Revision: 30024

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30024

  Log:
    merges r29136 from trunk into ruby_1_9_2.
    --
    * vm.c (rb_thread_method_id_and_class): curried proc has no
      method.  [ruby-core:31871]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/test/ruby/test_proc.rb
    branches/ruby_1_9_2/version.h
    branches/ruby_1_9_2/vm.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30023)
+++ ruby_1_9_2/ChangeLog	(revision 30024)
@@ -1,3 +1,8 @@
+Sun Aug 29 13:22:43 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* vm.c (rb_thread_method_id_and_class): curried proc has no
+	  method.  [ruby-core:31871]
+
 Fri Sep 24 23:44:59 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (sym_call), vm.c (invoke_block_from_c),
Index: ruby_1_9_2/vm.c
===================================================================
--- ruby_1_9_2/vm.c	(revision 30023)
+++ ruby_1_9_2/vm.c	(revision 30024)
@@ -1396,7 +1396,7 @@
 {
     rb_control_frame_t *cfp = th->cfp;
     rb_iseq_t *iseq = cfp->iseq;
-    if (!iseq) {
+    if (!iseq && cfp->me) {
 	if (idp) *idp = cfp->me->def->original_id;
 	if (klassp) *klassp = cfp->me->klass;
 	return 1;
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30023)
+++ ruby_1_9_2/version.h	(revision 30024)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 54
+#define RUBY_PATCHLEVEL 55
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/test/ruby/test_proc.rb
===================================================================
--- ruby_1_9_2/test/ruby/test_proc.rb	(revision 30023)
+++ ruby_1_9_2/test/ruby/test_proc.rb	(revision 30024)
@@ -793,6 +793,14 @@
     end
   end
 
+  def test_curry_with_trace
+    bug3751 = '[ruby-core:31871]'
+    set_trace_func(proc {})
+    test_curry
+  ensure
+    set_trace_func(nil)
+  end
+
   def test_block_propagation
     bug3792 = '[ruby-core:32075]'
     c = Class.new do

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/