Merge pull request #4031 from i110/i110/hash_default

let Hash#merge keep ifnone value
This commit is contained in:
Yukihiro "Matz" Matsumoto
2018-06-01 20:29:45 +09:00
committed by GitHub
+1 -2
View File
@@ -179,10 +179,9 @@ class Hash
#
# ISO 15.2.13.4.22
def merge(other, &block)
h = {}
raise TypeError, "can't convert argument into Hash" unless other.respond_to?(:to_hash)
other = other.to_hash
self.each_key{|k| h[k] = self[k]}
h = self.dup
if block
other.each_key{|k|
h[k] = (self.has_key?(k))? block.call(k, self[k], other[k]): other[k]