Remove references to experimental backend

bryanjos · bryanjos · commit 73f313583a6e · 2017-05-28T08:46:53.000-05:00
diff --git a/.tool-versions b/.tool-versions
@@ -1,3 +1,3 @@
 erlang ref-OTP-20.0-rc1
-elixir ref-9825280
+elixir ref-9873e42
 nodejs 7.10.0
diff --git a/README.md b/README.md
@@ -4,7 +4,8 @@ The goal is to convert a subset (or full set) of Elixir code to JavaScript, prov
 
 Requirements
 ===========
-* Elixir
+* Erlang 20 or greater
+* Elixir 1.5 or greater
 * Node (only for development)
 
 Usage
diff --git a/lib/elixir_script/next/beam.ex b/lib/elixir_script/next/beam.ex
@@ -23,6 +23,8 @@ defmodule ElixirScript.Beam do
         {:error, "Unknown module"}
       {:error,:beam_lib,{:unknown_chunk,"non_existing.beam",:debug_info}} ->
         {:error, "Unsupported version of Erlang"}
+      {:error,:beam_lib,{:missing_chunk, _ , _}} ->
+        {:error, "Debug info not available"}
       {:error,:beam_lib,{:file_error,"non_existing.beam",:enoent}} ->
         {:error, "Debug info not available"}
     end
diff --git a/lib/elixir_script/next/passes/find_used.ex b/lib/elixir_script/next/passes/find_used.ex
@@ -2,6 +2,19 @@ defmodule ElixirScript.FindUsed do
   @moduledoc false
   alias ElixirScript.State, as: ModuleState
 
+  @erlang_modules [
+    :erlang,
+    :maps,
+    :lists,
+    :gen,
+    :elixir_errors,
+    :supervisor,
+    :application,
+    :code,
+    :elixir_utils,
+    :file
+  ]  
+
   @doc """
   Takes a list of entry modules and finds modules they use along with
   documenting the functions used. The data collected about used functions
@@ -127,7 +140,8 @@ defmodule ElixirScript.FindUsed do
         do_execute(module, state.pid)
       end
     end
-    Enum.each(params, &walk(&1, state))
+
+    walk(params, state)
   end
 
   defp walk({:for, _, generators}, state) do
@@ -181,11 +195,11 @@ defmodule ElixirScript.FindUsed do
 
     if rescue_block do
       Enum.each(rescue_block, fn
-            {:->, _, [ [{:in, _, [param, names]}], body]} ->
-              walk({[], [param], [{{:., [], [Enum, :member?]}, [], [param, names]}], body}, state)
-            {:->, _, [ [param], body]} ->
-              walk({[], [param], [], body}, state)
-            end)
+        {:->, _, [ [{:in, _, [param, names]}], body]} ->
+          walk({[], [param], [{{:., [], [Enum, :member?]}, [], [param, names]}], body}, state)
+        {:->, _, [ [param], body]} ->
+          walk({[], [param], [], body}, state)
+      end)
     end
 
     if catch_block do
@@ -205,15 +219,8 @@ defmodule ElixirScript.FindUsed do
     Enum.each(clauses, &walk(&1, state))
   end
 
-  defp walk({{:., _, [:erlang, _]}, _, _}, _state) do
-    nil
-  end
-
-  defp walk({{:., _, [:lists, _]}, _, _}, _state) do
-    nil
-  end
-
-  defp walk({{:., _, [:maps, _]}, _, _}, _state) do
+  defp walk({{:., _, [module, function]}, _, params}, _state) when module in @erlang_modules do
+    IO.inspect {module, function, length(params)}
     nil
   end
 
diff --git a/lib/elixir_script/next/passes/translate.ex b/lib/elixir_script/next/passes/translate.ex
@@ -40,7 +40,7 @@ defmodule ElixirScript.Translate do
     |> Generator.generate
 
     concat(js_code)
-    |> IO.puts 
+    #|> IO.puts 
   end
 
   defp concat(code) do
diff --git a/lib/elixir_script/next/passes/translate/examples/example.ex b/lib/elixir_script/next/passes/translate/examples/example.ex
@@ -1,10 +1,6 @@
 defmodule Example do
   def new() do
-    newnew()
-  end
-
-  def newnew() do
-    Atom.to_string("hello")
+   Base.encode16("hello")
   end
 
 end
diff --git a/lib/elixir_script/next/passes/translate/examples/size.ex b/lib/elixir_script/next/passes/translate/examples/size.ex
@@ -1,22 +1,16 @@
 defprotocol Example.Size do
-  @compile {:undocumented_elixir_backend_option, ElixirScript.Translate.Backend}
   def size(data)
 end
 
 defimpl Example.Size, for: BitString do
-  @compile {:undocumented_elixir_backend_option, ElixirScript.Translate.Backend}
 
   def size(string), do: byte_size(string)
 end
 
 defimpl Example.Size, for: Map do
-  @compile {:undocumented_elixir_backend_option, ElixirScript.Translate.Backend}
-
   def size(map), do: map_size(map)
 end
 
 defimpl Example.Size, for: Tuple do
-  @compile {:undocumented_elixir_backend_option, ElixirScript.Translate.Backend}
-
   def size(tuple), do: tuple_size(tuple)
 end
diff --git a/lib/elixir_script/next/passes/translate/module.ex b/lib/elixir_script/next/passes/translate/module.ex
@@ -17,7 +17,7 @@ defmodule ElixirScript.Translate.Module do
       file: _file,
       line: _line, 
       module: ^module, 
-      unreachable: _unreachable,
+      unreachable: unreachable,
       used: used
     } = info
 
@@ -27,7 +27,13 @@ defmodule ElixirScript.Translate.Module do
  
     # Filter so that we only have the
     # Used functions to compile
-    used_defs = Enum.filter(defs, fn
+    used_defs = defs
+    |> Enum.filter(fn
+      { _, type, _, _} when type in [:defmacro, :defmacrop] -> false
+      { name, _, _, _} -> not(name in unreachable)
+      _ -> true
+    end)
+    |> Enum.filter(fn
       { name, _, _, _} -> name in used
       _ -> false
     end)
diff --git a/src/javascript/lib/core/erlang_compat/erlang.js b/src/javascript/lib/core/erlang_compat/erlang.js
@@ -1 +1,3 @@
+// http://erlang.org/doc/man/erlang.html
+
 export default {};
diff --git a/src/javascript/lib/core/erlang_compat/lists.js b/src/javascript/lib/core/erlang_compat/lists.js
@@ -1 +1,3 @@
+// http://erlang.org/doc/man/lists.html
+
 export default {};
diff --git a/src/javascript/lib/core/erlang_compat/maps.js b/src/javascript/lib/core/erlang_compat/maps.js
@@ -1 +1,3 @@
+// http://erlang.org/doc/man/maps.html
+
 export default {};

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+// http://erlang.org/doc/man/erlang.html`
	`2`	`+`
`1`	`3`	`export default {};`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+// http://erlang.org/doc/man/lists.html`
	`2`	`+`
`1`	`3`	`export default {};`