jruby · Mar 31, 2016 · Mar 31, 2016 · Mar 31, 2016 · Mar 31, 2016 · Mar 31, 2016
diff --git a/core/src/main/java/org/jruby/RubyHash.java b/core/src/main/java/org/jruby/RubyHash.java
@@ -265,6 +265,13 @@ public RubyHash(Ruby runtime, IRubyObject defaultValue, int buckets) {
         allocFirst(buckets);
     }
 
+    protected RubyHash(Ruby runtime, RubyClass metaClass, IRubyObject defaultValue, RubyHashEntry[] initialTable, int threshold) {
+        super(runtime, metaClass);
+        this.ifNone = defaultValue;
+        this.threshold = threshold;
+        this.table = initialTable;
+    }
+
     /*
      *  Constructor for internal usage (mainly for Array#|, Array#&, Array#- and Array#uniq)
      *  it doesn't initialize ifNone field
@@ -789,26 +796,6 @@ public void modify() {
      *
      */
     private IRubyObject inspectHash(final ThreadContext context) {
-        final RubyString str = RubyString.newStringLight(context.runtime, DEFAULT_INSPECT_STR_SIZE);
-        str.cat((byte)'{');
-        final boolean[] firstEntry = new boolean[1];
-
-        firstEntry[0] = true;
-        visitAll(new Visitor() {
-            @Override
-            public void visit(IRubyObject key, IRubyObject value) {
-                if (!firstEntry[0]) str.cat((byte)',').cat((byte)' ');
-
-                str.cat(inspect(context, key)).cat((byte)'=').cat((byte)'>').cat(inspect(context, value));
-
-                firstEntry[0] = false;
-            }
-        });
-        str.cat((byte)'}');
-        return str;
-    }
-
-    private IRubyObject inspectHash19(final ThreadContext context) {
         final RubyString str = RubyString.newStringLight(context.runtime, DEFAULT_INSPECT_STR_SIZE, USASCIIEncoding.INSTANCE);
         str.cat((byte)'{');
         final boolean[] firstEntry = new boolean[1];
@@ -831,23 +818,23 @@ public void visit(IRubyObject key, IRubyObject value) {
     /** rb_hash_inspect
      *
      */
-    public IRubyObject inspect(ThreadContext context) {
-        return inspect19(context);
-    }
-
     @JRubyMethod(name = "inspect")
-    public IRubyObject inspect19(ThreadContext context) {
+    public IRubyObject inspect(ThreadContext context) {
         if (size == 0) return RubyString.newUSASCIIString(context.runtime, "{}");
         if (getRuntime().isInspecting(this)) return RubyString.newUSASCIIString(context.runtime, "{...}");
 
         try {
             getRuntime().registerInspecting(this);
-            return inspectHash19(context);
+            return inspectHash(context);
         } finally {
             getRuntime().unregisterInspecting(this);
         }
     }
 
+    public IRubyObject inspect19(ThreadContext context) {
+        return inspect(context);
+    }
+
     /** rb_hash_size
      *
      */
@@ -1005,13 +992,13 @@ public IRubyObject yieldArray(ThreadContext context, IRubyObject value, IRubyObj
     /** rb_hash_to_s & to_s_hash
      *
      */
+    @JRubyMethod(name = "to_s")
     public IRubyObject to_s(ThreadContext context) {
-        return to_s19(context);
+        return inspect(context);
     }
 
-    @JRubyMethod(name = "to_s")
-    public IRubyObject to_s19(ThreadContext context) {
-        return inspect19(context);
+    public final IRubyObject to_s19(ThreadContext context) {
+        return to_s(context);
     }
 
     /** rb_hash_rehash
@@ -1146,9 +1133,8 @@ public RubyBoolean compare(final ThreadContext context, final MethodNames method
         if (!(other instanceof RubyHash)) {
             if (!other.respondsTo("to_hash")) {
                 return runtime.getFalse();
-            } else {
-                return Helpers.rbEqual(context, other, this);
             }
+            return Helpers.rbEqual(context, other, this);
         }
 
         final RubyHash otherHash = (RubyHash) other;
@@ -1185,8 +1171,8 @@ public void visit(IRubyObject key, IRubyObject value) {
     /** rb_hash_equal
      *
      */
-    @JRubyMethod(name = "==")
     @Override
+    @JRubyMethod(name = "==")
     public IRubyObject op_equal(final ThreadContext context, IRubyObject other) {
         return RecursiveComparator.compare(context, MethodNames.OP_EQUAL, this, other);
     }
@@ -1195,10 +1181,15 @@ public IRubyObject op_equal(final ThreadContext context, IRubyObject other) {
      *
      */
     @JRubyMethod(name = "eql?")
-    public IRubyObject op_eql19(final ThreadContext context, IRubyObject other) {
+    public IRubyObject op_eql(final ThreadContext context, IRubyObject other) {
         return RecursiveComparator.compare(context, MethodNames.EQL, this, other);
     }
 
+    @Deprecated
+    public IRubyObject op_eql19(final ThreadContext context, IRubyObject other) {
+        return op_eql(context, other);
+    }
+
     /** rb_hash_aref
      *
      */
@@ -1250,54 +1241,33 @@ public IRubyObject op_ge(ThreadContext context, IRubyObject other) {
     /** rb_hash_hash
      *
      */
-    // FIXME:
     @Override
+    @JRubyMethod(name = "hash")
     public RubyFixnum hash() {
         final Ruby runtime = getRuntime();
+        if (size == 0) return RubyFixnum.zero(runtime);
         final ThreadContext context = runtime.getCurrentContext();
-        if (size == 0 || runtime.isInspecting(this)) return RubyFixnum.zero(runtime);
-        final long hash[] = new long[]{size};
-        try {
-            runtime.registerInspecting(this);
-            visitAll(new Visitor() {
-                public void visit(IRubyObject key, IRubyObject value) {
-                    hash[0] ^= invokedynamic(context, key, HASH).convertToInteger().getLongValue();
-                    hash[0] ^= invokedynamic(context, value, HASH).convertToInteger().getLongValue();
+        return (RubyFixnum) runtime.execRecursiveOuter(new Ruby.RecursiveFunction() {
+            @Override
+            public IRubyObject call(IRubyObject obj, boolean recur) {
+                if (recur) {
+                    return invokedynamic(context, runtime.getHash(), HASH).convertToInteger();
                 }
-            });
-        } finally {
-            runtime.unregisterInspecting(this);
-        }
-        return RubyFixnum.newFixnum(runtime, hash[0]);
+                final long[] h = new long[]{1};
+                visitAll(new Visitor() {
+                    @Override
+                    public void visit(IRubyObject key, IRubyObject value) {
+                        h[0] += invokedynamic(context, key, HASH).convertToInteger().getLongValue() ^ invokedynamic(context, value, HASH).convertToInteger().getLongValue();
+                    }
+                });
+                return runtime.newFixnum(h[0]);
+            }
+        }, this);
     }
 
-    /** rb_hash_hash
-     *
-     */
-    @JRubyMethod(name = "hash")
+    @Deprecated
     public RubyFixnum hash19() {
-        final Ruby runtime = getRuntime();
-        final ThreadContext context = runtime.getCurrentContext();
-        return (RubyFixnum)getRuntime().execRecursiveOuter(new Ruby.RecursiveFunction() {
-                @Override
-                public IRubyObject call(IRubyObject obj, boolean recur) {
-                    if(size == 0) {
-                        return RubyFixnum.zero(runtime);
-                    }
-                    final long[] h = new long[]{1};
-                    if(recur) {
-                        h[0] ^= RubyNumeric.num2long(invokedynamic(context, runtime.getHash(), HASH));
-                    } else {
-                        visitAll(new Visitor() {
-                                @Override
-                                public void visit(IRubyObject key, IRubyObject value) {
-                                    h[0] += invokedynamic(context, key, HASH).convertToInteger().getLongValue() ^ invokedynamic(context, value, HASH).convertToInteger().getLongValue();
-                                }
-                            });
-                    }
-                    return runtime.newFixnum(h[0]);
-                }
-            }, this);
+        return hash();
     }
 
     /** rb_hash_fetch
@@ -1477,13 +1447,13 @@ public void visit(IRubyObject key, IRubyObject value) {
         return this;
     }
 
+    @JRubyMethod(name = {"each", "each_pair"})
     public IRubyObject each(final ThreadContext context, final Block block) {
-        return each19(context, block);
+        return block.isGiven() ? each_pairCommon(context, block, true) : enumeratorizeWithSize(context, this, "each", enumSizeFn());
     }
 
-    @JRubyMethod(name = {"each", "each_pair"})
     public IRubyObject each19(final ThreadContext context, final Block block) {
-        return block.isGiven() ? each_pairCommon(context, block, true) : enumeratorizeWithSize(context, this, "each", enumSizeFn());
+        return each(context, block);
     }
 
     /** rb_hash_each_pair
@@ -1585,14 +1555,14 @@ public IRubyObject sort(ThreadContext context, Block block) {
     /** rb_hash_index
      *
      */
+    @JRubyMethod(name = "index")
     public IRubyObject index(ThreadContext context, IRubyObject expected) {
-        return index19(context, expected);
+        context.runtime.getWarnings().warn(ID.DEPRECATED_METHOD, "Hash#index is deprecated; use Hash#key");
+        return key(context, expected);
     }
 
-    @JRubyMethod(name = "index")
     public IRubyObject index19(ThreadContext context, IRubyObject expected) {
-        context.runtime.getWarnings().warn(ID.DEPRECATED_METHOD, "Hash#index is deprecated; use Hash#key");
-        return key(context, expected);
+        return index(context, expected);
     }
 
     @JRubyMethod
@@ -1712,12 +1682,8 @@ public IRubyObject delete(ThreadContext context, IRubyObject key, Block block) {
     /** rb_hash_select
      *
      */
-    public IRubyObject select(final ThreadContext context, final Block block) {
-        return select19(context, block);
-    }
-
     @JRubyMethod(name = "select")
-    public IRubyObject select19(final ThreadContext context, final Block block) {
+    public IRubyObject select(final ThreadContext context, final Block block) {
         final Ruby runtime = context.runtime;
         if (!block.isGiven()) return enumeratorizeWithSize(context, this, "select", enumSizeFn());
 
@@ -1735,13 +1701,17 @@ public void visit(IRubyObject key, IRubyObject value) {
         return result;
     }
 
+    public IRubyObject select19(final ThreadContext context, final Block block) {
+        return select(context, block);
+    }
+
     /** rb_hash_delete_if
      *
      */
     public RubyHash delete_ifInternal(final ThreadContext context, final Block block) {
         modify();
 
-        final Ruby runtime = getRuntime();
+        final Ruby runtime = context.runtime;
         final RubyHash self = this;
         iteratorVisitAll(new Visitor() {
             @Override
@@ -1819,24 +1789,17 @@ public void visit(IRubyObject key, IRubyObject value) {
         return result;
     }
 
-    /** rb_hash_update
-     *
-     */
-    public RubyHash merge_bang(final ThreadContext context, final IRubyObject other, final Block block) {
-        return merge_bang19(context, other, block);
-    }
-
     /** rb_hash_update
      *
      */
     @JRubyMethod(name = {"merge!", "update"}, required = 1)
-    public RubyHash merge_bang19(final ThreadContext context, final IRubyObject other, final Block block) {
+    public RubyHash merge_bang(final ThreadContext context, final IRubyObject other, final Block block) {
         modify();
         final RubyHash otherHash = other.convertToHash();
 
         if (otherHash.empty_p().isTrue()) return this;
 
-        final Ruby runtime = getRuntime();
+        final Ruby runtime = context.runtime;
         final RubyHash self = this;
         otherHash.visitAll(new Visitor() {
             @Override
@@ -1854,6 +1817,11 @@ public void visit(IRubyObject key, IRubyObject value) {
         return this;
     }
 
+    @Deprecated
+    public RubyHash merge_bang19(final ThreadContext context, final IRubyObject other, final Block block) {
+        return merge_bang(context, other, block);
+    }
+
     /** rb_hash_merge
      *
      */
@@ -1862,40 +1830,35 @@ public RubyHash merge(ThreadContext context, IRubyObject other, Block block) {
         return ((RubyHash)dup()).merge_bang(context, other, block);
     }
 
-    /** rb_hash_replace
-     *
-     */
+    @JRubyMethod(name = "initialize_copy", required = 1, visibility = PRIVATE)
     public RubyHash initialize_copy(ThreadContext context, IRubyObject other) {
-        return initialize_copy19(context, other);
+        return replace(context, other);
     }
 
-    /** rb_hash_replace
-     *
-     */
-    @JRubyMethod(name = "initialize_copy", required = 1, visibility = PRIVATE)
+    @Deprecated
     public RubyHash initialize_copy19(ThreadContext context, IRubyObject other) {
-        return replace19(context, other);
+        return initialize_copy(context, other);
     }
 
     /** rb_hash_replace
      *
      */
-    public RubyHash replace(final ThreadContext context, IRubyObject other) {
-        return replace19(context, other);
-    }
-
     @JRubyMethod(name = "replace", required = 1)
-    public RubyHash replace19(final ThreadContext context, IRubyObject other) {
+    public RubyHash replace(final ThreadContext context, IRubyObject other) {
         final RubyHash self = this;
-        return replaceCommon19(context, other, new Visitor() {
+        return replaceCommon(context, other, new Visitor() {
             @Override
             public void visit(IRubyObject key, IRubyObject value) {
                 self.op_aset(context, key, value);
             }
         });
     }
 
-    private RubyHash replaceCommon19(final ThreadContext context, IRubyObject other, Visitor visitor) {
+    public RubyHash replace19(final ThreadContext context, IRubyObject other) {
+        return replace(context, other);
+    }
+
+    private RubyHash replaceCommon(final ThreadContext context, IRubyObject other, Visitor visitor) {
         modify();
 
         final RubyHash otherHash = other.convertToHash();
@@ -1954,7 +1917,7 @@ public void visit(IRubyObject key, IRubyObject value) {
                     }
                 }
             });
-            return context.runtime.getNil();
+            return context.nil;
         } catch (FoundPair found) {
             return context.runtime.newArray(found.key, found.value);
         }
@@ -1971,7 +1934,7 @@ public void visit(IRubyObject key, IRubyObject value) {
                     }
                 }
             });
-            return context.runtime.getNil();
+            return context.nil;
         } catch (FoundPair found) {
             return context.runtime.newArray(found.key, found.value);
         }
@@ -2144,7 +2107,7 @@ public Class getJavaClass() {
         return Map.class;
     }
 
-    // Satisfy java.util.Set interface (for Java integration)
+    // Satisfy java.util.Map interface (for Java integration)
 
     @Override
     public int size() {