Some fixes for pattern compilation

bryanjos · bryanjos · commit 6d4d62575b54 · 2017-06-13T02:15:08.000-05:00
diff --git a/lib/elixir_script/next/passes/translate/form.ex b/lib/elixir_script/next/passes/translate/form.ex
@@ -65,7 +65,7 @@ defmodule ElixirScript.Translate.Form do
   end
 
   def compile({:{}, _, elements}, state) do
-    ast = J.call_expression(
+    ast = J.new_expression(
       J.member_expression(
         J.member_expression(
           J.identifier("Bootstrap"),
@@ -79,6 +79,15 @@ defmodule ElixirScript.Translate.Form do
     {ast, state}
   end
 
+  def compile({:&, _, [{:/, _, [{{:., _, [_module, _function]} = ast, [], []}, _]}]}, state) do
+    Remote.compile(ast, state)
+  end
+
+  def compile({:&, _, [{:/, _, [{var, _, _}, _]}]}, state) do
+    ast = ElixirScript.Translate.Identifier.make_function_name(var)
+    {ast, state}
+  end
+
   def compile({:%{}, _, _} = map, state) do
     ElixirScript.Translate.Forms.Map.compile(map, state)
   end
@@ -213,6 +222,15 @@ defmodule ElixirScript.Translate.Form do
     {ast, state}
   end
 
+  def compile({function, _, []}, state) do
+    ast = J.call_expression(
+      ElixirScript.Translate.Forms.JS.call_property(),
+      [compile!(function, state)]
+    )
+
+    {ast, state}
+  end
+
   def compile({function, _, params}, state) when is_list(params) do
     ast = J.call_expression(
       compile!(function, state),
diff --git a/lib/elixir_script/next/passes/translate/forms/js.ex b/lib/elixir_script/next/passes/translate/forms/js.ex
@@ -3,13 +3,26 @@ defmodule ElixirScript.Translate.Forms.JS do
   alias ESTree.Tools.Builder, as: J
   alias ElixirScript.Translate.Form
 
+  def call_property() do
+    J.member_expression(
+      J.member_expression(
+        J.identifier("Bootstrap"),
+        J.member_expression(
+          J.identifier("Core"),
+          J.identifier("Functions")
+        )
+      ),
+      J.identifier("call_property")
+    )
+  end
+
   def global() do
-    Builder.member_expression(
-      Builder.member_expression(
-        Builder.identifier("Bootstrap"),
-        Builder.identifier("Core")
+    J.member_expression(
+      J.member_expression(
+        J.identifier("Bootstrap"),
+        J.identifier("Core")
       ),
-      Builder.identifier("global")
+      J.identifier("global")
     )
   end
 
@@ -41,15 +54,15 @@ defmodule ElixirScript.Translate.Forms.JS do
     {ast, state}
   end
 
-  defp do_translate({{:., _, [JS, :throw]}, _, [term]}, state) do
+  def compile({{:., _, [JS, :throw]}, _, [term]}, state) do
     ast = J.throw_statement(
       Form.compile!(term, state)
     )
 
     {ast, state}
   end
 
-  defp do_translate({{:., _, [JS, :import]}, _, [term]}, state) do
+  def compile({{:., _, [JS, :import]}, _, [term]}, state) do
     ast = J.call_expression(
       J.identifier("import"),
       [Form.compile!(term, state)]
@@ -58,7 +71,19 @@ defmodule ElixirScript.Translate.Forms.JS do
     {ast, state}
   end
 
-  defp do_translate({{:., _, [JS, function]}, _, params}, state) do
+  def compile({{:., _, [JS, function]}, _, []}, state) do
+    ast = J.call_expression(
+      call_property(),
+      [
+        global(),
+        Form.compile!(to_string(function), state)
+      ]
+    )
+
+    {ast, state}
+  end
+
+  def compile({{:., _, [JS, function]}, _, params}, state) do
     ast = J.call_expression(
       J.identifier(function),
       Enum.map(params, &Form.compile!(&1, state))
diff --git a/lib/elixir_script/next/passes/translate/forms/pattern.ex b/lib/elixir_script/next/passes/translate/forms/pattern.ex
@@ -109,6 +109,10 @@ defmodule ElixirScript.Translate.Forms.Pattern do
     process_pattern({:|, context, [head, tail]}, state)
   end
 
+  defp process_pattern({:%, _, [module, {:%{}, _, props}]}, state) do
+    process_pattern({:%{}, [], [__struct__: module] ++ props}, state)
+  end
+
   defp process_pattern({:%{}, _, props}, state) do
     properties = Enum.map(props, fn({key, value}) ->
       {pattern, params} = process_pattern(value, state)
@@ -152,11 +156,11 @@ defmodule ElixirScript.Translate.Forms.Pattern do
     { [PM.starts_with(prefix)], [Form.compile!(value, state)] }
   end
 
-  defp process_pattern({:=, _, [{name, _, _}, right]}, state) do
+  defp process_pattern({:=, _, [{name, _, _}, right]}, state) when not name in [:%, :{}, :^, :%{}, :<<>>] do
     unify(name, right, state)
   end
 
-  defp process_pattern({:=, _, [left, {name, _, _}]}, state) do
+  defp process_pattern({:=, _, [left, {name, _, _}]}, state) when not name in [:%, :{}, :^, :%{}, :<<>>] do
     unify(name, left, state)
   end
 
diff --git a/lib/elixir_script/next/passes/translate/forms/try.ex b/lib/elixir_script/next/passes/translate/forms/try.ex
@@ -2,7 +2,7 @@ defmodule ElixirScript.Translate.Forms.Try do
   @moduledoc false
   alias ESTree.Tools.Builder, as: JS
   alias ElixirScript.Translate.Clause
-  alias ElixirScript.Translate.Form
+  alias ElixirScript.Translate.{Form, Function}
 
   def compile(blocks, state) do
     try_block = Keyword.get(blocks, :do)
@@ -92,12 +92,8 @@ defmodule ElixirScript.Translate.Forms.Try do
   end
 
   defp prepare_function_body(body, state) do
-    {ast, state} = body
-    |> List.wrap
-    |> Enum.map_reduce(state, &Form.compile(&1, &2))
+    {ast, state} = Function.compile_block(body, state)
 
-    ast
-    |> List.flatten
-    |> Clause.return_last_statement
+    Clause.return_last_statement(ast)
   end
 end
diff --git a/lib/elixir_script/next/passes/translate/function.ex b/lib/elixir_script/next/passes/translate/function.ex
@@ -128,4 +128,21 @@ defmodule ElixirScript.Translate.Function do
   defp compile_clause({:->, _, [params, body]}, state) do
     compile_clause({[], params, [], body}, state)
   end
+
+  def compile_block(block, state) do
+    ast = case block do
+      nil ->
+        J.identifier("null")
+      {:__block__, _, block_body} ->
+        {list, _} = Enum.map_reduce(block_body, state, &Form.compile(&1, &2))
+        List.flatten(list)
+      b when is_list(b) ->
+        {list, _} = Enum.map_reduce(b, state, &Form.compile(&1, &2))
+        List.flatten(list)
+      _ ->
+        Form.compile!(block, state)
+    end
+
+    {ast, state}
+  end
 end
diff --git a/src/javascript/lib/core/functions.js b/src/javascript/lib/core/functions.js
@@ -23,6 +23,14 @@ function iterator_to_reducer(iterable, acc, fun) {
 }
 
 function call_property(item, property) {
+  if (!property) {
+    if (item instanceof Function) {
+      return item();
+    }
+
+    return item;
+  }
+
   let prop = null;
 
   if (
diff --git a/test/support/main.ex b/test/support/main.ex
@@ -1,5 +1,12 @@
 defmodule Main do
   def start(:normal, [callback]) do
     callback.("started")
+    user = %User{}
+    user.first
+    draw()
+  end
+
+  defp draw() do
+    JS.console.log("Here")
   end
 end
