Move concatenation to functions in order to eventually handle overflow cases

bryanjos · bryanjos · commit 283c6509dc5f · 2017-09-09T10:13:16.000-05:00
diff --git a/lib/elixir_script/passes/translate/clause.ex b/lib/elixir_script/passes/translate/clause.ex
@@ -17,6 +17,7 @@ defmodule ElixirScript.Translate.Clause do
 
     body = body
     |> return_last_statement
+    |> Function.update_last_call(state)
 
     ast = Helpers.call(
       J.member_expression(
diff --git a/lib/elixir_script/passes/translate/form.ex b/lib/elixir_script/passes/translate/form.ex
@@ -56,25 +56,17 @@ defmodule ElixirScript.Translate.Form do
     { J.literal(form), state }
   end
 
-  def compile([{:|, _, [head, tail]}], state) do
-    ast = Helpers.call(
-      J.member_expression(
-        J.array_expression([compile!(head, state)]),
-        J.identifier("concat")
-      ),
-      [compile!(tail, state)]
-    )
-
-    { ast, state }
+  def compile([{:|, _, [_head, _tail]} = ast], state) do
+    compile(ast, state)
   end
 
   def compile({:|, _, [head, tail]}, state) do
     ast = Helpers.call(
       J.member_expression(
-        J.array_expression([compile!(head, state)]),
+        Helpers.functions(),
         J.identifier("concat")
       ),
-      [compile!(tail, state)]
+      [compile!(head, state), compile!(tail, state)]
     )
 
     { ast, state }
diff --git a/lib/elixir_script/passes/translate/function.ex b/lib/elixir_script/passes/translate/function.ex
@@ -168,7 +168,7 @@ defmodule ElixirScript.Translate.Function do
     {ast, state}
   end
 
-  defp update_last_call(clause_body, %{function: {name, _}, anonymous_fn: anonymous?}) do
+  def update_last_call(clause_body, %{function: {name, _}, anonymous_fn: anonymous?}) do
     last_item = List.last(clause_body)
     function_name = ElixirScript.Translate.Identifier.make_function_name(name)
 
diff --git a/src/javascript/lib/core/functions.js b/src/javascript/lib/core/functions.js
@@ -198,6 +198,10 @@ function graphemes(str) {
   return splitter.splitGraphemes(str);
 }
 
+function concat(head, tail) {
+  return [head].concat(tail);
+}
+
 export default {
   call_property,
   defprotocol,
@@ -209,4 +213,5 @@ export default {
   Recurse,
   split_at,
   graphemes,
+  concat,
 };
