jruby · Mar 7, 2015 · Mar 7, 2015 · Mar 7, 2015 · Mar 7, 2015 · Mar 7, 2015
diff --git a/spec/truffle/tags/core/hash/assoc_tags.txt b/spec/truffle/tags/core/hash/assoc_tags.txt
diff --git a/spec/truffle/tags/core/hash/rassoc_tags.txt b/spec/truffle/tags/core/hash/rassoc_tags.txt
diff --git a/spec/truffle/tags/core/hash/rehash_tags.txt b/spec/truffle/tags/core/hash/rehash_tags.txt
@@ -1,2 +1 @@
 fails:Hash#rehash reorganizes the hash by recomputing all key hash codes
-fails:Hash#rehash raises a RuntimeError if called on a frozen instance
diff --git a/spec/truffle/tags/core/hash/sort_tags.txt b/spec/truffle/tags/core/hash/sort_tags.txt
diff --git a/spec/truffle/tags/core/hash/values_at_tags.txt b/spec/truffle/tags/core/hash/values_at_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/HashNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/HashNodes.java
@@ -1160,6 +1160,39 @@ public int sizePackedArray(RubyHash hash) {
 
     }
 
+    @CoreMethod(names = "rehash", raiseIfFrozenSelf = true)
+    public abstract static class RehashNode extends HashCoreMethodNode {
+
+        public RehashNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public RehashNode(RehashNode prev) {
+            super(prev);
+        }
+
+        @Specialization(guards = "isNull")
+        public RubyHash rehashNull(RubyHash hash) {
+            return hash;
+        }
+
+        @Specialization(guards = {"!isNull", "!isBuckets"})
+        public RubyHash rehashPackedArray(RubyHash hash) {
+            // Nothing to do as we weren't using the hash code anyway
+            return hash;
+        }
+
+        @Specialization(guards = "isBuckets")
+        public RubyHash rehashBuckets(RubyHash hash) {
+            notDesignedForCompilation();
+
+            HashOperations.verySlowSetKeyValues(hash, HashOperations.verySlowToKeyValues(hash), hash.isCompareByIdentity());
+
+            return hash;
+        }
+
+    }
+
     @CoreMethod(names = "replace", required = 1)
     public abstract static class ReplaceNode extends HashCoreMethodNode {
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RegexpPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/RegexpPrimitiveNodes.java
@@ -11,10 +11,7 @@
 
 import org.joni.Matcher;
 import org.jruby.truffle.runtime.RubyContext;
-import org.jruby.truffle.runtime.core.RubyClass;
-import org.jruby.truffle.runtime.core.RubyMatchData;
-import org.jruby.truffle.runtime.core.RubyRegexp;
-import org.jruby.truffle.runtime.core.RubyString;
+import org.jruby.truffle.runtime.core.*;
 
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.source.SourceSection;
@@ -91,4 +88,24 @@ public Object setLastMatch(RubyClass regexpClass, Object matchData) {
         }
 
     }
+
+    @RubiniusPrimitive(name = "regexp_set_block_last_match")
+    public static abstract class RegexpSetBlockLastMatchPrimitiveNode extends RubiniusPrimitiveNode {
+
+        public RegexpSetBlockLastMatchPrimitiveNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public RegexpSetBlockLastMatchPrimitiveNode(RegexpSetBlockLastMatchPrimitiveNode prev) {
+            super(prev);
+        }
+
+        @Specialization
+        public RubyNilClass setBlockLastMatch(RubyClass regexpClass) {
+            // TODO CS 7-Mar-15 what does this do?
+            return getContext().getCoreLibrary().getNilObject();
+        }
+
+    }
+
 }
diff --git a/truffle/src/main/ruby/core/hash.rb b/truffle/src/main/ruby/core/hash.rb
@@ -31,10 +31,21 @@ def each_item
     each do |key, value|
       yield KeyValue.new(key, value)
     end
+    nil
   end
 
   def merge_fallback(other, &block)
     merge(Rubinius::Type.coerce_to other, Hash, :to_hash, &block)
   end
 
+  def find_item(key)
+    value = self[key]
+    if value.nil?
+      nil
+    else
+      # TODO CS 7-Mar-15 maybe we should return the stored key?
+      KeyValue.new(key, value)
+    end
+  end
+
 end
diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/regexp.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/regexp.rb
@@ -61,4 +61,9 @@ def self.last_match=(match)
     raise PrimitiveFailure, "Regexp#set_last_match primitive failed"
   end
 
+  def self.set_block_last_match
+    Rubinius.primitive :regexp_set_block_last_match
+    raise PrimitiveFailure, "Regexp#set_block_last_match primitive failed"
+  end
+
 end
diff --git a/truffle/src/main/ruby/core/rubinius/common/hash.rb b/truffle/src/main/ruby/core/rubinius/common/hash.rb
@@ -205,4 +205,29 @@ def empty?
     @size == 0
   end
 
+  def assoc(key)
+    each_item { |e| return e.key, e.value if key == e.key }
+  end
+
+  def rassoc(value)
+    each_item { |e| return e.key, e.value if value == e.value }
+  end
+
+  def sort(&block)
+    to_a.sort(&block)
+  end
+
+  def values_at(*args)
+    args.map do |key|
+      if item = find_item(key)
+        item.value
+      else
+        default key
+      end
+    end
+  end
+
+  alias_method :indices, :values_at
+  alias_method :indexes, :values_at
+
 end
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:Hash#rehash reorganizes the hash by recomputing all key hash codes
		fails:Hash#rehash raises a RuntimeError if called on a frozen instance