summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--lib/pp.rb10
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0eb00b3ba7..c4eef1f6ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 3 08:04:57 2004 Tanaka Akira <akr@m17n.org>
+
+ * lib/pp.rb (Struct#pretty_print_cycle): follow 1.8 style.
+
Mon Feb 2 19:33:49 2004 WATANABE Hirofumi <eban@ruby-lang.org>
* configure.in: backport from 1.9 for Interix.
diff --git a/lib/pp.rb b/lib/pp.rb
index a9491f62d2..8d8e640275 100644
--- a/lib/pp.rb
+++ b/lib/pp.rb
@@ -324,7 +324,7 @@ class Struct
end
def pretty_print_cycle(q)
- q.text sprintf("#<%s:...>", self.class.name)
+ q.text sprintf("#<struct %s:...>", self.class.name)
end
end
@@ -542,7 +542,7 @@ if __FILE__ == $0
result = PP.pp(a, '')
assert_equal("#{a.inspect}\n", result)
assert_match(/\A#<Object.*>\n\z/m, result)
- a = 1
+ a = 1.0
a.instance_eval { @a = nil }
result = PP.pp(a, '')
assert_equal("#{a.inspect}\n", result)
@@ -562,19 +562,22 @@ if __FILE__ == $0
a = []
a << a
assert_equal("[[...]]\n", PP.pp(a, ''))
+ assert_equal("#{a.inspect}\n", PP.pp(a, ''))
end
def test_hash
a = {}
a[0] = a
assert_equal("{0=>{...}}\n", PP.pp(a, ''))
+ assert_equal("#{a.inspect}\n", PP.pp(a, ''))
end
S = Struct.new("S", :a, :b)
def test_struct
a = S.new(1,2)
a.b = a
- assert_equal("#<struct Struct::S a=1, b=#<Struct::S:...>>\n", PP.pp(a, ''))
+ assert_equal("#<struct Struct::S a=1, b=#<struct Struct::S:...>>\n", PP.pp(a, ''))
+ assert_equal("#{a.inspect}\n", PP.pp(a, ''))
end
def test_object
@@ -592,6 +595,7 @@ if __FILE__ == $0
a = []
a << HasInspect.new(a)
assert_equal("[<inspect:[...]>]\n", PP.pp(a, ''))
+ assert_equal("#{a.inspect}\n", PP.pp(a, ''))
end
def test_share_nil