* class.c (rb_define_method): do not set NOEX_CFUNC if klass is

  really a module, whose methods must be safe for reciever's type.

* eval.c (rb_eval): nosuper should not be inherited unless the
  overwritten method is an undef placeholder.

* parse.y (primary): allow 'when'-less case statement; persuaded
  by Sean Chittenden.


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

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/tracer.rb b/lib/tracer.rb
index 70be58da5a..f522a9178d 100644
--- a/lib/tracer.rb
+++ b/lib/tracer.rb
@@ -39,9 +39,9 @@ class Tracer
   def initialize
     @threads = Hash.new
     if defined? Thread.main
-      @threads[Thread.main.id] = 0
+      @threads[Thread.main.object_id] = 0
     else
-      @threads[Thread.current.id] = 0
+      @threads[Thread.current.object_id] = 0
     end
 
     @get_line_procs = {}
@@ -105,10 +105,10 @@ class Tracer
   end
   
   def get_thread_no
-    if no = @threads[Thread.current.id]
+    if no = @threads[Thread.current.object_id]
       no
     else
-      @threads[Thread.current.id] = @threads.size
+      @threads[Thread.current.object_id] = @threads.size
     end
   end