[Truffle] Implement Enumerable#{mix,max} optional parameter

jruby · Sep 4, 2016 · 294d80f · eregon · Sep 6, 2016 · bjfish
1 parent d675b78
commit 294d80f
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/spec/truffle/tags/core/enumerable/max_tags.txt b/spec/truffle/tags/core/enumerable/max_tags.txt
diff --git a/spec/truffle/tags/core/enumerable/min_tags.txt b/spec/truffle/tags/core/enumerable/min_tags.txt
diff --git a/truffle/src/main/ruby/core/enumerable.rb b/truffle/src/main/ruby/core/enumerable.rb
@@ -647,7 +647,8 @@ def first(n=undefined)
     nil
   end
 
-  def min
+  def min(n = undefined, &block)
+    return min_n(n, &block) if !undefined.equal?(n) && !n.nil?
     min = undefined
     each do
       o = Truffle.single_block_arg
@@ -667,10 +668,23 @@ def min
 
     undefined.equal?(min) ? nil : min
   end
+
+  def min_n(n, &block)
+    raise ArgumentError, "negative size #{n}" if n < 0
+    return [] if n == 0
+
+    if block_given?
+      self.sort(&block).first(n)
+    else
+      self.sort.first(n)
+    end
+  end
+  private :min_n
 
   alias_method :min_internal, :min
 
-  def max
+  def max(n = undefined, &block)
+    return max_n(n, &block) if !undefined.equal?(n) && !n.nil?
     max = undefined
     each do
       o = Truffle.single_block_arg
@@ -690,6 +704,18 @@ def max
 
     undefined.equal?(max) ? nil : max
   end
+
+  def max_n(n, &block)
+    raise ArgumentError, "negative size #{n}" if n < 0
+    return [] if n == 0
+
+    if block_given?
+      self.sort(&block).reverse.first(n)
+    else
+      self.sort.reverse.first(n)
+    end
+  end
+  private :max_n
 
   alias_method :max_internal, :max