diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-18 03:59:15 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-18 03:59:15 +0000 |
commit | 62c9ecfa122da546af36ed5a31e8696c62ced036 (patch) | |
tree | 40fd17671b67821d024a1d47beb5a22d1faad43b /hash.c | |
parent | cc6ab53f592016daf6f4ef0075e4f33f365d638f (diff) | |
download | ruby-62c9ecfa122da546af36ed5a31e8696c62ced036.tar.gz |
Revert r35339-35343 because of no tests.
* hash.c: Alias ENV.to_h to ENV.to_hash [ref #6276]
* lib/ostruct.rb: Add OpenStruct#to_h [Feature #6276]
* struct.c: Add Struct#to_h [Feature #6276]
* object.c: Add NilClass#to_h [Feature #6276]
* hash.c: Add Hash#to_h [Feature #6276]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35383 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'hash.c')
-rw-r--r-- | hash.c | 29 |
1 files changed, 1 insertions, 28 deletions
@@ -1452,30 +1452,6 @@ rb_hash_to_hash(VALUE hash) return hash; } -/* - * call-seq: - * hsh.to_h -> hsh or new_hash - * - * Returns +self+. If called on a subclass of Hash, converts - * the receiver to a Hash object. - */ - -static VALUE -rb_hash_to_h(VALUE hash) -{ - if (rb_obj_class(hash) != rb_cHash) { - VALUE ret = rb_hash_new(); - if (!RHASH_EMPTY_P(hash)) - RHASH(ret)->ntbl = st_copy(RHASH(hash)->ntbl); - if (FL_TEST(hash, HASH_PROC_DEFAULT)) { - FL_SET(ret, HASH_PROC_DEFAULT); - } - RHASH_IFNONE(ret) = RHASH_IFNONE(hash); - return ret; - } - return hash; -} - static int keys_i(VALUE key, VALUE value, VALUE ary) { @@ -3078,8 +3054,7 @@ env_index(VALUE dmy, VALUE value) /* * call-seq: - * ENV.to_hash -> hash - * ENV.to_h -> hash + * ENV.to_hash -> Hash * * Creates a hash with a copy of the environment variables. * @@ -3358,7 +3333,6 @@ Init_Hash(void) rb_define_method(rb_cHash,"rehash", rb_hash_rehash, 0); rb_define_method(rb_cHash,"to_hash", rb_hash_to_hash, 0); - rb_define_method(rb_cHash,"to_h", rb_hash_to_h, 0); rb_define_method(rb_cHash,"to_a", rb_hash_to_a, 0); rb_define_method(rb_cHash,"inspect", rb_hash_inspect, 0); rb_define_alias(rb_cHash, "to_s", "inspect"); @@ -3469,7 +3443,6 @@ Init_Hash(void) rb_define_singleton_method(envtbl,"key?", env_has_key, 1); rb_define_singleton_method(envtbl,"value?", env_has_value, 1); rb_define_singleton_method(envtbl,"to_hash", env_to_hash, 0); - rb_define_singleton_method(envtbl,"to_h", env_to_hash, 0); rb_define_singleton_method(envtbl,"assoc", env_assoc, 1); rb_define_singleton_method(envtbl,"rassoc", env_rassoc, 1); |