Fix some compiler errors

bryanjos · bryanjos · commit a5b3f42ba113 · 2017-12-09T16:43:32.000-06:00
diff --git a/lib/elixir_script/passes/translate/form.ex b/lib/elixir_script/passes/translate/form.ex
@@ -392,13 +392,26 @@ defmodule ElixirScript.Translate.Form do
 
   defp compile_params(params, state) do
     {params, var_decs} = Enum.map_reduce(params, [], fn
+      ({:=, _, [{left_var, _, atom} = left, right]} = ast, acc) when is_atom(atom) ->
+        case Atom.to_string(left_var) do
+          "_" <> _ ->
+            {compile!(right, state), acc}
+          _ ->
+            {ast, state} = compile(ast, state)
+            left = compile!(left, state)
+
+            {left, acc ++ List.wrap(ast)}
+        end
+
       ({:=, _, [left, _]} = ast, acc) ->
         {ast, state} = compile(ast, state)
         left = compile!(left, state)
 
         {left, acc ++ List.wrap(ast)}
       (x, acc) ->
-        {compile!(x, state), acc}
+        compiled = compile!(x, state)
+
+        {compiled, acc}
     end)
 
     {var_decs, params}
diff --git a/lib/elixir_script/passes/translate/forms/for.ex b/lib/elixir_script/passes/translate/forms/for.ex
@@ -96,12 +96,9 @@ defmodule ElixirScript.Translate.Forms.For do
 
 
   defp create_function_expression(ast, state, module_state) do
-    { ast, _ } = Enum.map_reduce(List.wrap(ast), module_state, fn x, acc_state ->
-       Form.compile(x, acc_state)
-    end)
-
     ast = ast
-    |> List.flatten
+    |> ElixirScript.Translate.Function.compile_block(module_state)
+    |> elem(0)
     |> Clause.return_last_statement
 
     Helpers.arrow_function(
diff --git a/lib/elixir_script/passes/translate/forms/match.ex b/lib/elixir_script/passes/translate/forms/match.ex
@@ -56,11 +56,15 @@ defmodule ElixirScript.Translate.Forms.Match do
   defp compile_match(%{patterns: [left], expression: right}, state) do
     { right_ast, state } = Form.compile(right, state)
 
-    {var_dec, right_ast} = case right_ast do
-      [variable_declaration, x] ->
-        {variable_declaration, x}
+    {var_decs, right_ast} = case right_ast do
+      x when is_list(x) ->
+        l = Enum.reverse(x)
+        [head | tail] = l
+        l = Enum.reverse(tail)
+
+        {l, head}
       x ->
-        {nil, x}
+        {[], x}
     end
 
     { patterns, params, state } = Pattern.compile([left], state)
@@ -84,14 +88,7 @@ defmodule ElixirScript.Translate.Forms.Match do
         List.wrap(array_pattern)
     end
 
-    js_ast = case var_dec do
-      nil ->
-        js_ast
-      x ->
-        [x] ++ js_ast
-    end
-
-    { js_ast, state }
+    { var_decs ++ js_ast, state }
   end
 
   defp compile_match(%{patterns: lefts, expression: right}, state) do
diff --git a/lib/elixir_script/passes/translate/function.ex b/lib/elixir_script/passes/translate/function.ex
@@ -173,7 +173,7 @@ defmodule ElixirScript.Translate.Function do
     {ast, state}
   end
 
-  @spec update_last_call([ESTree.Node.t], map) :: ESTree.Node.t
+  @spec update_last_call([ESTree.Node.t], map) :: list
   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)
