Fix bug when compiling tests

bryanjos · bryanjos · commit 92a9540ad538 · 2017-09-19T18:05:34.000-05:00
diff --git a/lib/elixir_script/passes/find_used_functions.ex b/lib/elixir_script/passes/find_used_functions.ex
@@ -137,7 +137,7 @@ defmodule ElixirScript.FindUsedFunctions do
     walk(params, state)
   end
 
-  defp walk({:for, _, generators}, state) do
+  defp walk({:for, _, generators}, state) when is_list(generators) do
     Enum.each(generators, fn
       {:<<>>, _, body} ->
         walk(body, state)
diff --git a/lib/elixir_script/passes/find_used_modules.ex b/lib/elixir_script/passes/find_used_modules.ex
@@ -78,7 +78,9 @@ defmodule ElixirScript.FindUsedModules do
       module: module
     }
 
-    Enum.each(reachable_defs, &walk(&1, state))
+    Enum.each(reachable_defs, fn(x) ->
+      walk(x, state)
+    end)
   end
 
   defp walk_protocol(module, implementations, pid) do
@@ -170,7 +172,7 @@ defmodule ElixirScript.FindUsedModules do
     walk(params, state)
   end
 
-  defp walk({:for, _, generators}, state) do
+  defp walk({:for, _, generators}, state) when is_list(generators) do
     walk(Collectable, state)
 
     Enum.each(generators, fn
diff --git a/lib/elixir_script/passes/translate/form.ex b/lib/elixir_script/passes/translate/form.ex
@@ -19,6 +19,11 @@ defmodule ElixirScript.Translate.Form do
     { J.identifier("null"), state }
   end
 
+  def compile(map, state) when is_map(map) do
+    quoted = Code.string_to_quoted!("#{inspect map}")
+    compile(quoted, state)
+  end
+
   def compile(form, state) when is_boolean(form) or is_integer(form) or is_float(form) or is_binary(form)  do
     { J.literal(form), state }
   end
@@ -122,7 +127,7 @@ defmodule ElixirScript.Translate.Form do
     { ast, state }
   end
 
-  def compile({:for, _, _} = ast, state) do
+  def compile({:for, _, generators} = ast, state) when is_list(generators) do
     For.compile(ast, state)
   end
 
diff --git a/lib/elixir_script/passes/translate/forms/remote.ex b/lib/elixir_script/passes/translate/forms/remote.ex
@@ -85,6 +85,13 @@ defmodule ElixirScript.Translate.Forms.Remote do
       module === Elixir ->
         members = ["Elixir", "__load"]
 
+        Helpers.call(
+          Identifier.make_namespace_members(members),
+          [J.identifier("Elixir")]
+        )
+      module === :ElixirScript ->
+        members = ["Elixir", "ElixirScript", "__load"]
+
         Helpers.call(
           Identifier.make_namespace_members(members),
           [J.identifier("Elixir")]
diff --git a/lib/elixir_script/passes/translate/function.ex b/lib/elixir_script/passes/translate/function.ex
@@ -51,6 +51,7 @@ defmodule ElixirScript.Translate.Function do
   end
 
   def compile({{name, arity}, _type, _, clauses}, state) do
+
     state = Map.put(state, :function, {name, arity})
     |> Map.put(:anonymous_fn, false)
     |> Map.put(:in_guard, false)
diff --git a/lib/elixir_script/state.ex b/lib/elixir_script/state.ex
@@ -105,7 +105,7 @@ defmodule ElixirScript.State do
   def put_in_memory_module(pid, module, beam) do
     Agent.update(pid, fn(state) ->
       in_memory_modules = Map.get(state, :in_memory_modules, [])
-      in_memory_modules = [{module, beam} | in_memory_modules]
+      in_memory_modules = Keyword.put(in_memory_modules, module, beam)
       %{ state | in_memory_modules: in_memory_modules }
     end)
   end
