Fix to_h specs.

Author: aardvark179

spec/tags/core/array/to_h_tags.txt

@@ -1183,8 +1183,22 @@ def to_ary
     self
   end
 
-  def to_h &block
-    super(*self, &block)
+  def to_h
+    h = Hash.new(size)
+    each_with_index do |elem, i|
+      elem = yield(elem) if block_given?
+      unless elem.respond_to?(:to_ary)
+        raise TypeError, "wrong element type #{elem.class} at #{i} (expected array)"
+      end
+
+      ary = elem.to_ary
+      if ary.size != 2
+        raise ArgumentError, "wrong array length at #{i} (expected 2, was #{ary.size})"
+      end
+
+      h[ary[0]] = ary[1]
+    end
+    h
   end
 
   def transpose

spec/tags/core/enumerable/to_h_tags.txt

@@ -283,13 +283,14 @@ def to_a(*arg)
   def to_h(*arg)
     h = {}
     each_with_index(*arg) do |elem, i|
+      elem = yield(elem) if block_given?
       unless elem.respond_to?(:to_ary)
         raise TypeError, "wrong element type #{elem.class} at #{i} (expected array)"
       end
 
       ary = elem.to_ary
       if ary.size != 2
-        raise ArgumentError, "wrong array length at #{i} (expected 2, was #{ary.size})"
+        raise ArgumentError, "element has wrong array length (expected 2, was #{ary.size})"
       end
 
       h[ary[0]] = ary[1]

spec/tags/core/env/to_h_tags.txt

@@ -260,9 +260,23 @@ def to_a
     end
 
     def to_hash
-      hsh = {}
-      each { |k, v| hsh[k] = v }
-      hsh
+      h = {}
+      each_with_index do |elem|
+        if block_given?
+          elem = yield(elem)
+        end
+        unless elem.respond_to?(:to_ary)
+          raise TypeError, "wrong element type #{elem.class} (expected array)"
+        end
+
+        ary = elem.to_ary
+        if ary.size != 2
+          raise ArgumentError, "element has wrong array length (expected 2, was #{ary.size})"
+        end
+
+        h[ary[0]] = ary[1]
+      end
+      h
     end
 
     alias_method :to_h, :to_hash

spec/tags/core/hash/to_h_tags.txt

@@ -298,7 +298,9 @@ def select!
   end
 
   def to_h
-    if instance_of? Hash
+    if block_given?
+      super
+    elsif instance_of? Hash
       self
     else
       Hash.allocate.replace(to_hash)