Some more bug fixes. Have to figure out module resolution issues still

bryanjos · bryanjos · commit eaf5b2a60bbf · 2018-01-17T20:05:44.000-06:00
diff --git a/lib/elixir_script/passes/find_used_modules.ex b/lib/elixir_script/passes/find_used_modules.ex
@@ -15,16 +15,7 @@ defmodule ElixirScript.FindUsedModules do
     end)
   end
 
-  defp do_execute(module, pid) do
-    result =
-      case ModuleState.get_in_memory_module(pid, module) do
-        nil ->
-          ElixirScript.Beam.debug_info(module)
-
-        beam ->
-          ElixirScript.Beam.debug_info(beam)
-      end
-
+  defp do_execute(module, result, pid) do
     case result do
       {:ok, info} ->
         walk_module(module, info, pid)
@@ -49,6 +40,21 @@ defmodule ElixirScript.FindUsedModules do
     end
   end
 
+  defp do_execute(module, pid) do
+    result = get_debug_info(module, pid)
+    do_execute(module, result, pid)
+  end
+
+  defp get_debug_info(module, pid) do
+    case ModuleState.get_in_memory_module(pid, module) do
+      nil ->
+        ElixirScript.Beam.debug_info(module)
+
+      beam ->
+        ElixirScript.Beam.debug_info(beam)
+    end
+  end
+
   defp walk_module(
          module,
          %{attributes: [__foreign_info__: %{path: path, name: name, global: global}]} = info,
@@ -159,10 +165,17 @@ defmodule ElixirScript.FindUsedModules do
        when is_atom(form) and form not in [BitString, Function, PID, Port, Reference, Any, Elixir] do
     if ElixirScript.Translate.Module.is_elixir_module(form) and
          !ElixirScript.Translate.Module.is_js_module(form, state) do
-      ModuleState.put_used_module(state.pid, state.module, form)
-
       if ModuleState.get_module(state.pid, form) == nil do
-        do_execute(form, state.pid)
+        case get_debug_info(form, state.pid) do
+          {:ok, _} = result ->
+            ModuleState.put_used_module(state.pid, state.module, form)
+            do_execute(form, result, state.pid)
+
+          result ->
+            do_execute(form, result, state.pid)
+        end
+      else
+        ModuleState.put_used_module(state.pid, state.module, form)
       end
     end
   end
@@ -191,10 +204,17 @@ defmodule ElixirScript.FindUsedModules do
   defp walk({:%, _, [module, params]}, state) do
     if ElixirScript.Translate.Module.is_elixir_module(module) and
          !ElixirScript.Translate.Module.is_js_module(module, state) do
-      ModuleState.put_used_module(state.pid, state.module, module)
-
       if ModuleState.get_module(state.pid, module) == nil do
-        do_execute(module, state.pid)
+        case get_debug_info(module, state.pid) do
+          {:ok, _} = result ->
+            ModuleState.put_used_module(state.pid, state.module, module)
+            do_execute(module, result, state.pid)
+
+          result ->
+            do_execute(module, result, state.pid)
+        end
+      else
+        ModuleState.put_used_module(state.pid, state.module, module)
       end
     end
 
@@ -331,10 +351,17 @@ defmodule ElixirScript.FindUsedModules do
 
   defp walk({:., _, [module, function]}, state) do
     if ElixirScript.Translate.Module.is_elixir_module(module) do
-      ModuleState.put_used_module(state.pid, state.module, module)
-
       if ModuleState.get_module(state.pid, module) == nil do
-        do_execute(module, state.pid)
+        case get_debug_info(module, state.pid) do
+          {:ok, _} = result ->
+            ModuleState.put_used_module(state.pid, state.module, module)
+            do_execute(module, result, state.pid)
+
+          result ->
+            do_execute(module, result, state.pid)
+        end
+      else
+        ModuleState.put_used_module(state.pid, state.module, module)
       end
     else
       walk(module, state)
