Merge branch 'master' into only-es

bryanjos · bryanjos · commit 83dcd0e651eb · 2017-08-06T16:36:42.000-05:00
diff --git a/lib/elixir_script/lib/js.ex b/lib/elixir_script/lib/js.ex
@@ -5,45 +5,47 @@ defmodule ElixirScript.JS do
   Elixir. For instance, creating a new object
   """
 
+  use ElixirScript.FFI, global: true
+
   @doc """
   Creates new JavaScript objects.
 
   ex:
     ElixirScript.JS.new User, ["first_name", "last_name"]
   """
-  defmacro new(module, params)
+  defexternal new(module, params)
 
   @doc """
   Returns the type of the given value
   """
-  defmacro typeof(value)
+  defexternal typeof(value)
 
   @doc """
   Determines if value is an instance of type.
   """
-  defmacro instanceof(value, type)
+  defexternal instanceof(value, type)
 
   @doc """
   Throws the term given
   """
-  defmacro throw(term)
+  defexternal throw(term)
 
   @doc """
   Creates a breakpoint for JavaScript debuggers to stop at
   """
-  defmacro debugger()
+  defexternal debugger()
 
   @doc """
   The current JavaScript context
   """
-  defmacro this()
+  defexternal this()
 
   @doc """
   Mutates an existing JavaScript object.
   ex:
     ElixirScript.JS.mutate elem, "width", 100
   """
-  defmacro mutate(object, key, value)
+  defexternal mutate(object, key, value)
 
 
   @doc """
@@ -53,5 +55,5 @@ defmodule ElixirScript.JS do
   ex:
     ElixirScript.JS.map_to_object(%{my: "map"})
   """
-  defmacro map_to_object(object)
+  defexternal map_to_object(object)
 end
diff --git a/lib/elixir_script/passes/translate/clause.ex b/lib/elixir_script/passes/translate/clause.ex
@@ -1,13 +1,13 @@
 defmodule ElixirScript.Translate.Clause do
+  @moduledoc false
+
+  # Handles translation of all of the clause ASTs
+
   alias ESTree.Tools.Builder, as: J
   alias ElixirScript.Translate.Form
   alias ElixirScript.Translate.Forms.Pattern
   alias ElixirScript.Translate.Function
 
-  @moduledoc """
-  Handles translation of all of the clause ASTs
-  """
-
   @patterns J.member_expression(
     J.member_expression(
       J.identifier("ElixirScript"),
diff --git a/lib/elixir_script/passes/translate/form.ex b/lib/elixir_script/passes/translate/form.ex
@@ -1,13 +1,13 @@
 defmodule ElixirScript.Translate.Form do
+  @moduledoc false
+
+  # Handles translation of all forms that are not functions or clauses
+
   alias ESTree.Tools.Builder, as: J
   alias ElixirScript.Translate.Forms.{Bitstring, Match, Try, For, Receive, Remote, Pattern, With}
   alias ElixirScript.Translate.Clause
   require Logger
 
-  @moduledoc """
-  Handles translation of all forms that are not functions or clauses
-  """
-
   def compile!(ast, state) do
     {js_ast, _} = compile(ast, state)
 
@@ -341,6 +341,10 @@ defmodule ElixirScript.Translate.Form do
     end
   end
 
+  def compile({:__block__, _, _} = ast, state) do
+    ElixirScript.Translate.Function.compile_block(ast, state)
+  end
+
   def compile({var, _, params}, state) when is_list(params) and is_atom(var) do
     {var_decs, params} = compile_params(params, state)
 
diff --git a/lib/elixir_script/passes/translate/function.ex b/lib/elixir_script/passes/translate/function.ex
@@ -1,13 +1,13 @@
 defmodule ElixirScript.Translate.Function do
+  @moduledoc false
+
+  # Translates the given Elixir function AST into the
+  # equivalent JavaScript AST.
+
   alias ESTree.Tools.Builder, as: J
   alias ElixirScript.Translate.{Clause, Form}
   alias ElixirScript.Translate.Forms.Pattern
 
-  @moduledoc """
-  Translates the given Elixir function AST into the
-  equivalent JavaScript AST.
-  """
-
   def patterns_ast() do
     J.member_expression(
       J.member_expression(
diff --git a/mix.lock b/mix.lock
@@ -1,16 +1,16 @@
 %{"bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm"},
-  "certifi": {:hex, :certifi, "1.2.1", "c3904f192bd5284e5b13f20db3ceac9626e14eeacfbb492e19583cf0e37b22be", [:rebar3], [], "hexpm"},
-  "credo": {:hex, :credo, "0.8.3", "efe6e9078de64cefdd25d8df7a97292e29e63f42a8988990340eaf1f40d93224", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}], "hexpm"},
-  "earmark": {:hex, :earmark, "1.2.2", "f718159d6b65068e8daeef709ccddae5f7fdc770707d82e7d126f584cd925b74", [:mix], [], "hexpm"},
+  "certifi": {:hex, :certifi, "2.0.0", "a0c0e475107135f76b8c1d5bc7efb33cd3815cb3cf3dea7aefdd174dabead064", [:rebar3], [], "hexpm"},
+  "credo": {:hex, :credo, "0.8.4", "4e50acac058cf6292d6066e5b0d03da5e1483702e1ccde39abba385c9f03ead4", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}], "hexpm"},
+  "earmark": {:hex, :earmark, "1.2.3", "206eb2e2ac1a794aa5256f3982de7a76bf4579ff91cb28d0e17ea2c9491e46a4", [:mix], [], "hexpm"},
   "estree": {:hex, :estree, "2.6.1", "0a17cc0e9e35315dc4fcd79d30a746b1f3e9ed654be6084ce882ab491165ae22", [:mix], [], "hexpm"},
   "ex_doc": {:hex, :ex_doc, "0.16.2", "3b3e210ebcd85a7c76b4e73f85c5640c011d2a0b2f06dcdf5acdb2ae904e5084", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"},
-  "excoveralls": {:hex, :excoveralls, "0.7.1", "3dd659db19c290692b5e2c4a2365ae6d4488091a1ba58f62dcbdaa0c03da5491", [:mix], [{:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:hackney, ">= 0.12.0", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"},
+  "excoveralls": {:hex, :excoveralls, "0.7.2", "f69ede8c122ccd3b60afc775348a53fc8c39fe4278aee2f538f0d81cc5e7ff3a", [:mix], [{:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: false]}, {:hackney, ">= 0.12.0", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"},
   "exjsx": {:hex, :exjsx, "4.0.0", "60548841e0212df401e38e63c0078ec57b33e7ea49b032c796ccad8cde794b5c", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm"},
   "fs": {:hex, :fs, "3.4.0", "6d18575c250b415b3cad559e6f97a4c822516c7bc2c10bfbb2493a8f230f5132", [:rebar3], [], "hexpm"},
-  "hackney": {:hex, :hackney, "1.8.6", "21a725db3569b3fb11a6af17d5c5f654052ce9624219f1317e8639183de4a423", [:rebar3], [{:certifi, "1.2.1", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "5.0.2", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"},
-  "idna": {:hex, :idna, "5.0.2", "ac203208ada855d95dc591a764b6e87259cb0e2a364218f215ad662daa8cd6b4", [:rebar3], [{:unicode_util_compat, "0.2.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm"},
+  "hackney": {:hex, :hackney, "1.9.0", "51c506afc0a365868469dcfc79a9d0b94d896ec741cfd5bd338f49a5ec515bfe", [:rebar3], [{:certifi, "2.0.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "5.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"},
+  "idna": {:hex, :idna, "5.1.0", "d72b4effeb324ad5da3cab1767cb16b17939004e789d8c0ad5b70f3cea20c89a", [:rebar3], [{:unicode_util_compat, "0.3.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm"},
   "jsx": {:hex, :jsx, "2.8.2", "7acc7d785b5abe8a6e9adbde926a24e481f29956dd8b4df49e3e4e7bcc92a018", [:mix, :rebar3], [], "hexpm"},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm"},
   "mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], [], "hexpm"},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.1", "28a4d65b7f59893bc2c7de786dec1e1555bd742d336043fe644ae956c3497fbe", [:make, :rebar], [], "hexpm"},
-  "unicode_util_compat": {:hex, :unicode_util_compat, "0.2.0", "dbbccf6781821b1c0701845eaf966c9b6d83d7c3bfc65ca2b78b88b8678bfa35", [:rebar3], [], "hexpm"}}
+  "unicode_util_compat": {:hex, :unicode_util_compat, "0.3.1", "a1f612a7b512638634a603c8f401892afbf99b8ce93a45041f8aaca99cadb85e", [:rebar3], [], "hexpm"}}
