summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-07-07 13:02:35 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-07-07 13:02:35 +0000
commitf2fc478054edd33a8b574475d4f6704e4a6db747 (patch)
treec26b0a374f973c36598d6d8725b8ceed0ed01930
parent5c6028ecb373d3ebd6dc94d51763b0113be288ba (diff)
downloadruby-f2fc478054edd33a8b574475d4f6704e4a6db747.tar.gz
ruby-f2fc478054edd33a8b574475d4f6704e4a6db747.tar.xz
ruby-f2fc478054edd33a8b574475d4f6704e4a6db747.zip
* lib/pp.rb (PP::PPMethods#pp_hash): sort condition changed:
all keys have a same class which is kind of Comparable. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12722 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/pp.rb9
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 94769a130..f6ef4af7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 7 21:59:29 2007 Tanaka Akira <akr@fsij.org>
+
+ * lib/pp.rb (PP::PPMethods#pp_hash): sort condition changed:
+ all keys have a same class which is kind of Comparable.
+
Sat Jul 7 17:12:37 2007 Koichi Sasada <ko1@atdot.net>
* compile.c: use rb_bug() instead of rb_compile_error().
diff --git a/lib/pp.rb b/lib/pp.rb
index e92ab014a..53ecaedd5 100644
--- a/lib/pp.rb
+++ b/lib/pp.rb
@@ -248,10 +248,11 @@ class PP < PrettyPrint
def pp_hash(obj)
group(1, '{', '}') {
keys = obj.keys
- if keys.all? {|k| k.respond_to? :to_str } ||
- keys.all? {|k| k.is_a? Symbol } ||
- keys.all? {|k| k.is_a? Integer }
- keys.sort!
+ if 0 < keys.length
+ key_class = keys[0].class
+ if key_class < Comparable && keys.all? {|k| k.class == key_class }
+ keys.sort!
+ end
end
seplist(keys, nil, :each) {|k|
v = obj[k]