Add more enum functions. Add a way to turn a js iterator to a reducer

bryanjos · bryanjos · commit b452a65c9054 · 2017-03-21T07:38:56.000-05:00
diff --git a/priv/std_lib/enum.ex b/priv/std_lib/enum.ex
@@ -38,9 +38,9 @@ defmodule ElixirScript.Enum do
         end)
 
         case result do
-          {:cont, _} ->
+          {:done, _} ->
             default
-          {:halt, item} ->
+          {:halted, item} ->
             item
         end
     end
@@ -125,9 +125,9 @@ defmodule ElixirScript.Enum do
     end)
 
     case result do
-      {:cont, _} ->
+      {:done, _} ->
         :error
-      {:halt, item} ->
+      {:halted, item} ->
         item
     end
   end
@@ -173,6 +173,20 @@ defmodule ElixirScript.Enum do
     result
   end
 
+  def into(enumerable, collectable) do
+    {init, fun} = Collectable.into(collectable)
+    reduce(enumerable, init, fn x, acc ->
+      fun.(acc, {:cont, x})
+    end)
+  end
+
+  def into(enumerable, collectable, transform) do
+    {init, fun} = Collectable.into(collectable)
+    reduce(enumerable, init, fn x, acc ->
+      fun.(acc, {:cont, transform.(x)})
+    end)
+  end
+
   def member?(enumerable, value) do
     {_, result} = Enumerable.reduce(enumerable, {:cont, false}, fn(item, acc) ->
       if item == value do
diff --git a/priv/std_lib/enumerable.ex b/priv/std_lib/enumerable.ex
@@ -7,36 +7,33 @@ end
 
 defimpl ElixirScript.Enumerable, for: List do
   def count(list),
-    do: {:ok, length(list) }
+    do: {:ok, list.length }
 
   def member?(list, value),
     do: {:ok, value in list }
 
-  def reduce(_,       {:halt, acc}, _fun),   do: {:halted, acc}
-  def reduce(list,    {:suspend, acc}, fun), do: {:suspended, acc, &reduce(list, &1, fun)}
-  def reduce([],      {:cont, acc}, _fun),   do: {:done, acc}
-  def reduce([h | t], {:cont, acc}, fun),    do: reduce(t, fun.(h, acc), fun)
+  def reduce(list, acc, fun), do
+    Bootstrap.Core.Functions.iterator_to_reducer(list, acc, fun)
+  end
 end
 
 defimpl ElixirScript.Enumerable, for: Map do
   def count(map) do
-    {:ok, map_size(map)}
+    {:ok, map.length}
   end
 
   def member?(map, {key, value}) do
-    {:ok, match?(^value, Map.get(map, key))}
+    {:ok, Map.get(map, key) == value }
   end
 
   def member?(_, _) do
     {:ok, false}
   end
 
   def reduce(map, acc, fun) do
+    map
+    |> Map.to_list
+    |> Bootstrap.Core.Functions.iterator_to_reducer(acc, fun)
     do_reduce(Map.to_list(map), acc, fun)
   end
-
-  defp do_reduce(_,       {:halt, acc}, _fun),   do: {:halted, acc}
-  defp do_reduce(list,    {:suspend, acc}, fun), do: {:suspended, acc, &do_reduce(list, &1, fun)}
-  defp do_reduce([],      {:cont, acc}, _fun),   do: {:done, acc}
-  defp do_reduce([h | t], {:cont, acc}, fun),    do: do_reduce(t, fun.(h, acc), fun)
 end
diff --git a/src/javascript/lib/core/functions.js b/src/javascript/lib/core/functions.js
@@ -1,4 +1,26 @@
 import Protocol from './protocol';
+import Core from '../core';
+
+function iterator_to_reducer(iterable, acc, fun) {
+  const iterator = iterable[Symbol.iterator]();
+  let x = iterator.next();
+  let _acc = acc;
+
+  while (x.done === false) {
+    _acc = fun(x.value, _acc.get(1));
+    if (_acc.get(0) === Symbol.for('halt')) {
+      return new Core.Tuple(Symbol.for('halted'), _acc.get(1));
+    } else if (_acc.get(0) === Symbol.for('suspend')) {
+      return new Core.Tuple(Symbol.for('suspended'), _acc.get(1), new_acc => {
+        return iterator_to_reducer(iterator, new_acc, fun);
+      });
+    }
+
+    x = iterator.next();
+  }
+
+  return new Core.Tuple(Symbol.for('done'), _acc.get(1));
+}
 
 function call_property(item, property) {
   let prop = null;
@@ -117,4 +139,5 @@ export default {
   defprotocol,
   defimpl,
   build_namespace,
+  iterator_to_reducer,
 };
