From 73485edfb7d7a5d45237499553825418c9039533 Mon Sep 17 00:00:00 2001
From: Victor <annimon119@gmail.com>
Date: Mon, 28 Nov 2016 15:50:39 +0200
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8F=20sor?=
 =?UTF-8?q?ted=20=D0=BA=20StreamValue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/functional/functional_stream.java | 29 +++++++++++++++++--
 .../resources/modules/functional/stream.own   |  7 +++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/annimon/ownlang/modules/functional/functional_stream.java b/src/main/java/com/annimon/ownlang/modules/functional/functional_stream.java
index 544fe49..f600bb9 100644
--- a/src/main/java/com/annimon/ownlang/modules/functional/functional_stream.java
+++ b/src/main/java/com/annimon/ownlang/modules/functional/functional_stream.java
@@ -1,7 +1,9 @@
 package com.annimon.ownlang.modules.functional;
 
+import com.annimon.ownlang.exceptions.ArgumentsMismatchException;
 import com.annimon.ownlang.exceptions.TypeException;
 import com.annimon.ownlang.lib.*;
+import java.util.Arrays;
 
 public final class functional_stream implements Function {
 
@@ -12,7 +14,7 @@ public final class functional_stream implements Function {
         if (args.length > 1) {
             return new StreamValue(new ArrayValue(args));
         }
-        
+
         final Value value = args[0];
         switch (value.type()) {
             case Types.MAP:
@@ -29,7 +31,7 @@ public final class functional_stream implements Function {
         private final ArrayValue container;
 
         public StreamValue(ArrayValue container) {
-            super(15);
+            super(16);
             this.container = container;
             init();
         }
@@ -38,6 +40,7 @@ public final class functional_stream implements Function {
             set("filter", wrapIntermediate(new functional_filter(false)));
             set("map", wrapIntermediate(new functional_map()));
             set("flatMap", wrapIntermediate(new functional_flatmap()));
+            set("sorted", this::sorted);
             set("sortBy", wrapIntermediate(new functional_sortby()));
             set("takeWhile", wrapIntermediate(new functional_filter(true)));
             set("dropWhile", wrapIntermediate(new functional_dropwhile()));
@@ -84,6 +87,28 @@ public final class functional_stream implements Function {
             return new StreamValue(new ArrayValue(result));
         }
 
+        private Value sorted(Value... args) {
+            Arguments.checkOrOr(0, 1, args.length);
+            final Value[] elements = container.getCopyElements();
+
+            switch (args.length) {
+                case 0:
+                    Arrays.sort(elements);
+                    break;
+                case 1:
+                    if (args[0].type() != Types.FUNCTION) {
+                        throw new TypeException("Function expected in second argument");
+                    }
+                    final Function comparator = ((FunctionValue) args[0]).getValue();
+                    Arrays.sort(elements, (o1, o2) -> comparator.execute(o1, o2).asInt());
+                    break;
+                default:
+                    throw new ArgumentsMismatchException("Wrong number of arguments");
+            }
+
+            return new StreamValue(new ArrayValue(elements));
+        }
+
         private Value custom(Value... args) {
             Arguments.check(1, args.length);
             if (args[0].type() != Types.FUNCTION) {
diff --git a/src/test/resources/modules/functional/stream.own b/src/test/resources/modules/functional/stream.own
index 5d60078..c3c5ae3 100644
--- a/src/test/resources/modules/functional/stream.own
+++ b/src/test/resources/modules/functional/stream.own
@@ -1,5 +1,6 @@
 use "std"
 use "functional"
+use "math"
 
 def testStream() {
   data = [1,2,3,4,5,6,7]
@@ -57,6 +58,12 @@ def testPeek() {
   assertEquals(length(expected), index)
 }
 
+def testSorted() {
+  data = [-2,4,6,-5,6,3,-8]
+  assertEquals([-8,-5,-2,3,4,6,6], stream(data).sorted().toArray())
+  assertEquals([-2,3,4,-5,6,6,-8], stream(data).sorted(def(a,b) = abs(a) - abs(b)).toArray())
+}
+
 def reverse(container) {
   size = length(container)
   result = newarray(size)