From 7935361d36fdfd372002c276baede34bb39f89a2 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 9 Mar 2005 14:56:16 +0000
Subject: * lib/pp.rb (PP::PPMethods#guard_inspect_key): support  
 __recursive_key__.  [ruby-dev:25821]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/pp.rb | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'lib/pp.rb')

diff --git a/lib/pp.rb b/lib/pp.rb
index 3826a12f79..d6cfa8b817 100644
--- a/lib/pp.rb
+++ b/lib/pp.rb
@@ -91,31 +91,35 @@ class PP < PrettyPrint
   end
 
   module PPMethods
-    InspectKey = :__inspect_key__
-
     def guard_inspect_key
-      if Thread.current[InspectKey] == nil
-        Thread.current[InspectKey] = {inspect: []}
+      if Thread.current[:__recursive_key__] == nil
+        Thread.current[:__recursive_key__] = {}
+      end
+
+      if Thread.current[:__recursive_key__][:inspect] == nil
+        Thread.current[:__recursive_key__][:inspect] = []
       end
 
-      save = Thread.current[InspectKey][:inspect]
+      save = Thread.current[:__recursive_key__][:inspect]
 
       begin
-        Thread.current[InspectKey][:inspect] = []
+        Thread.current[:__recursive_key__][:inspect] = []
         yield
       ensure
-        Thread.current[InspectKey][:inspect] = save
+        Thread.current[:__recursive_key__][:inspect] = save
       end
     end
 
     def check_inspect_key(id)
-      Thread.current[InspectKey][:inspect].include?(id)
+      Thread.current[:__recursive_key__] &&
+      Thread.current[:__recursive_key__][:inspect] &&
+      Thread.current[:__recursive_key__][:inspect].include?(id)
     end
     def push_inspect_key(id)
-      Thread.current[InspectKey][:inspect] << id
+      Thread.current[:__recursive_key__][:inspect] << id
     end
     def pop_inspect_key
-      Thread.current[InspectKey][:inspect].pop
+      Thread.current[:__recursive_key__][:inspect].pop
     end
 
     # Adds +obj+ to the pretty printing buffer
-- 
cgit v1.2.3