Now using the code generator in elixir-estree

bryanjos · bryanjos · commit 0569d5cef958 · 2015-07-10T19:02:08.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ deploy.sh
 priv/javascript/scratchpad.js
 sample/dest
 fprof.trace
+index.js
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # v0.7.0-dev
 * Enhancements
-  * Now using Exos and node_erlastic for communicating between Elixir and Node
+  * Now using the JS code generator from elixir-estree for code generation, improving speed of transpilation
 
 # v0.6.0
   * Enhancements
diff --git a/lib/elixir_script.ex b/lib/elixir_script.ex
@@ -1,5 +1,7 @@
 defmodule ElixirScript do
   alias ElixirScript.Translator.JSModule
+  alias ESTree.Tools.Builder
+  alias ESTree.Tools.Generator
 
   @doc """
   Parses Elixir code string into JavaScript AST
@@ -38,7 +40,7 @@ defmodule ElixirScript do
     file_path = create_file_name(module)
 
     program = ElixirScript.Translator.Module.create_standard_lib_imports(module.stdlibs, root) ++ module.body
-    |> ESTree.Builder.program
+    |> ESTree.Tools.Builder.program
     
    { file_path, program }
   end
@@ -53,9 +55,7 @@ defmodule ElixirScript do
   @spec javascript_ast_to_code(ESTree.Node.t) :: {:ok, binary} | {:error, binary}
   def javascript_ast_to_code(js_ast) do
     js_ast = prepare_js_ast(js_ast) 
-    |> Poison.encode!
-
-    {:ok, ElixirScript.CodeGenerator.translate(js_ast) }
+    {:ok, Generator.generate(js_ast) }
   end
 
   @doc """
@@ -75,9 +75,9 @@ defmodule ElixirScript do
     case js_ast do
       modules when is_list(modules) ->
         Enum.reduce(modules, [], fn(x, list) -> list ++ x.body end)
-        |> ESTree.Builder.program
+        |> Builder.program
       %ElixirScript.Translator.Group{body: body} ->
-        ESTree.Builder.program(body)      
+        Builder.program(body)      
       _ ->
         js_ast
     end
diff --git a/lib/elixir_script/app.ex b/lib/elixir_script/app.ex
diff --git a/lib/elixir_script/code_generator.ex b/lib/elixir_script/code_generator.ex
diff --git a/lib/elixir_script/translator.ex b/lib/elixir_script/translator.ex
@@ -139,16 +139,12 @@ defmodule ElixirScript.Translator do
   end
 
 
-#  defp do_translate({:try, _, [ [do: do_block, rescue: clauses, after: after_block] ]}) do
-#    Control.make_try(do_block, clauses, after_block)
-#  end
-#
-#  defp do_translate({:try, _, [ [do: do_block, rescue: clauses] ]}) do
-#    Control.make_try(do_block, clauses)
-#  end
-
-  defp do_translate({:try, _, _expressions}) do
-    raise ElixirScript.UnsupportedError, ":try"
+  defp do_translate({:try, _, [ [do: do_block, rescue: clauses, after: after_block] ]}) do
+    Try.make_try(do_block, clauses, after_block)
+  end
+
+  defp do_translate({:try, _, [ [do: do_block, rescue: clauses] ]}) do
+    Try.make_try(do_block, clauses)
   end
 
   defp do_translate({:receive, _, _expressions }) do
diff --git a/lib/elixir_script/translator/bitstring.ex b/lib/elixir_script/translator/bitstring.ex
@@ -1,5 +1,5 @@
 defmodule ElixirScript.Translator.Bitstring do
-  alias ESTree.Builder
+  alias ESTree.Tools.Builder
   alias ElixirScript.Translator
 
   
diff --git a/lib/elixir_script/translator/block.ex b/lib/elixir_script/translator/block.ex
@@ -1,5 +1,5 @@
 defmodule ElixirScript.Translator.Block do
-  alias ESTree.Builder
+  alias ESTree.Tools.Builder
   alias ElixirScript.Translator
 
   def make_block(expressions) do
diff --git a/lib/elixir_script/translator/case.ex b/lib/elixir_script/translator/case.ex
@@ -1,5 +1,5 @@
 defmodule ElixirScript.Translator.Case do
-  alias ESTree.Builder
+  alias ESTree.Tools.Builder
   alias ElixirScript.Translator
   alias ElixirScript.Translator.Function
   alias ElixirScript.Translator.Utils
diff --git a/lib/elixir_script/translator/cond.ex b/lib/elixir_script/translator/cond.ex
@@ -1,5 +1,5 @@
 defmodule ElixirScript.Translator.Cond do
-  alias ESTree.Builder
+  alias ESTree.Tools.Builder
   alias ElixirScript.Translator
   alias ElixirScript.Translator.Function
   alias ElixirScript.Translator.Utils
diff --git a/lib/elixir_script/translator/data.ex b/lib/elixir_script/translator/data.ex
@@ -1,6 +1,6 @@
 defmodule ElixirScript.Translator.Data do
   require Logger
-  alias ESTree.Builder
+  alias ESTree.Tools.Builder
   alias ElixirScript.Translator
   alias ElixirScript.Translator.Utils
 
@@ -15,16 +15,17 @@ defmodule ElixirScript.Translator.Data do
 
   def make_object(properties) do
     properties
-    |> Enum.map(fn({x, y}) -> 
-      Builder.property(Builder.literal(x), Translator.translate(y)) 
+    |> Enum.map(fn
+      ({x, {:__aliases__, _, [value]}}) -> Builder.property( Builder.literal(x), Builder.identifier(value)) 
+      ({x, y}) -> Builder.property( Builder.literal(x), Translator.translate(y)) 
     end)
     |> Builder.object_expression
   end
 
   def make_struct(module_name, data) do
     Builder.call_expression(
       Builder.member_expression(
-        Builder.identifier(module_name),
+        Builder.identifier(List.last(module_name)),
         Builder.identifier(:defstruct)
       ),
       Enum.map(data, fn({k, v})->
@@ -91,11 +92,11 @@ defmodule ElixirScript.Translator.Data do
   def throw_error(module_name, data) do
     Builder.throw_statement(
       Builder.new_expression(
-        Builder.identifier(module_name),
+        Builder.identifier(List.last(module_name)),
         [
           Builder.call_expression(
             Builder.member_expression(
-              Builder.identifier(module_name),
+              Builder.identifier(List.last(module_name)),
               Builder.identifier(:defexception)
             ),
             Enum.map(data, fn({k, v})->
@@ -129,7 +130,7 @@ defmodule ElixirScript.Translator.Data do
   end
 
   defp do_make_defstruct(name, params, defaults) do
-    Builder.export_declaration(
+    Builder.export_named_declaration(
       Builder.function_declaration(
         Builder.identifier(name),
         Enum.map(params, &Builder.identifier(&1)),
diff --git a/lib/elixir_script/translator/expression.ex b/lib/elixir_script/translator/expression.ex
@@ -1,6 +1,6 @@
 defmodule ElixirScript.Translator.Expression do
   require Logger
-  alias ESTree.Builder
+  alias ESTree.Tools.Builder
   alias ElixirScript.Translator
 
   def make_unary_expression(operator, expr) do
diff --git a/lib/elixir_script/translator/for.ex b/lib/elixir_script/translator/for.ex
@@ -1,5 +1,5 @@
 defmodule ElixirScript.Translator.For do
-  alias ESTree.Builder
+  alias ESTree.Tools.Builder
   alias ElixirScript.Translator
   alias ElixirScript.Translator.Utils
 
diff --git a/lib/elixir_script/translator/function.ex b/lib/elixir_script/translator/function.ex
@@ -1,6 +1,6 @@
 defmodule ElixirScript.Translator.Function do
   require Logger
-  alias ESTree.Builder
+  alias ESTree.Tools.Builder
   alias ElixirScript.Translator
   alias ElixirScript.Translator.Utils
   alias ElixirScript.Translator.PatternMatching
@@ -44,7 +44,7 @@ defmodule ElixirScript.Translator.Function do
   def make_function_call(module_name, function_name, params) do
     the_name = case module_name do
       {:__aliases__, _, name} ->
-        name
+        List.last(name)
       {name, _, _} when is_atom(name) ->
         name
       {{:., _, [_module_name, _function_name]}, _, _params } = ast ->
@@ -66,8 +66,8 @@ defmodule ElixirScript.Translator.Function do
   end
 
   def make_export_function(name, params, body, guards \\ nil) do
-    do_make_function(Utils.filter_name(name), params, body, guards)
-    |> Builder.export_declaration
+    function = do_make_function(Utils.filter_name(name), params, body, guards)
+    Builder.export_named_declaration(function)
   end
 
   def pattern_match_identifier(index) do
diff --git a/lib/elixir_script/translator/if.ex b/lib/elixir_script/translator/if.ex
@@ -1,5 +1,5 @@
 defmodule ElixirScript.Translator.If do
-  alias ESTree.Builder
+  alias ESTree.Tools.Builder
   alias ElixirScript.Translator
   alias ElixirScript.Translator.Function
   alias ElixirScript.Translator.Utils
diff --git a/lib/elixir_script/translator/import.ex b/lib/elixir_script/translator/import.ex
@@ -1,6 +1,6 @@
 defmodule ElixirScript.Translator.Import do
   require Logger
-  alias ESTree.Builder
+  alias ESTree.Tools.Builder
 
   def make_alias_import(alias_info, options) do
     {_, _, name} = alias_info
@@ -10,10 +10,11 @@ defmodule ElixirScript.Translator.Import do
       
       Builder.import_specifier(
         Builder.identifier("default"),
-        Builder.identifier(alt)
+        Builder.identifier(List.last(alt))
       )
     else      
       Builder.import_default_specifier(
+        Builder.identifier(List.last(name)),
         Builder.identifier(List.last(name))
       )  
     end
@@ -36,6 +37,7 @@ defmodule ElixirScript.Translator.Import do
     specifiers = if options[:only] do
       Enum.map(options[:only], fn({name, _arity}) -> 
         Builder.import_specifier(
+          Builder.identifier(name),
           Builder.identifier(name)
         )
       end)
diff --git a/lib/elixir_script/translator/kernel.ex b/lib/elixir_script/translator/kernel.ex
@@ -1,6 +1,6 @@
 defmodule ElixirScript.Translator.Kernel do
   require Logger
-  alias ESTree.Builder
+  alias ESTree.Tools.Builder
   alias ElixirScript.Translator
   alias ElixirScript.Utils
 
diff --git a/lib/elixir_script/translator/module.ex b/lib/elixir_script/translator/module.ex
@@ -1,6 +1,6 @@
 defmodule ElixirScript.Translator.Module do
   require Logger
-  alias ESTree.Builder
+  alias ESTree.Tools.Builder
   alias ElixirScript.Translator
   alias ElixirScript.Translator.Utils
   alias ElixirScript.Translator.JSModule
@@ -86,13 +86,13 @@ defmodule ElixirScript.Translator.Module do
     |> HashSet.to_list
     |> Enum.reduce(%{ identifiers: HashSet.new, imports: [] }, fn(x, state) ->
       case x do
-        %ESTree.ImportDeclaration{ specifiers: [%ESTree.ImportSpecifier{ id: id }] } ->
+        %ESTree.ImportDeclaration{ specifiers: [%ESTree.ImportSpecifier{ local: id }] } ->
           if HashSet.member?(state.identifiers, id.name) do
             state
           else
             %{ state | identifiers: HashSet.put(state.identifiers, id.name), imports: state.imports ++ [x] }
           end
-        %ESTree.ImportDeclaration{ specifiers: [%ESTree.ImportDefaultSpecifier{ id: id }] } ->
+        %ESTree.ImportDeclaration{ specifiers: [%ESTree.ImportDefaultSpecifier{ local: id }] } ->
           if HashSet.member?(state.identifiers, id.name) do
             state
           else
@@ -110,7 +110,7 @@ defmodule ElixirScript.Translator.Module do
       case x do
         %ESTree.FunctionDeclaration{} ->
           add_function_to_dict(acc, x, :private)
-        %ESTree.ExportDeclaration{ declaration: %ESTree.FunctionDeclaration{} = function } ->
+        %ESTree.ExportNamedDeclaration{ declaration: %ESTree.FunctionDeclaration{} = function } ->
           add_function_to_dict(acc, function, :export)
         %ESTree.CallExpression{} ->
           {Builder.expression_statement(x), acc}
@@ -131,14 +131,14 @@ defmodule ElixirScript.Translator.Module do
         end)
       )
 
-    default = Builder.export_declaration(exported_object, [], true)
+    default = Builder.export_default_declaration(exported_object)
 
     #Filter out original functions from the body
     body = Enum.filter(body, fn(x) -> 
       case x do 
         %ESTree.FunctionDeclaration{} ->
           false
-        %ESTree.ExportDeclaration{ declaration: %ESTree.FunctionDeclaration{} } ->
+        %ESTree.ExportNamedDeclaration{ declaration: %ESTree.FunctionDeclaration{} } ->
           false
         _ ->
           true
@@ -243,10 +243,9 @@ defmodule ElixirScript.Translator.Module do
 
     master_function = Builder.function_declaration(
       Builder.identifier(name),
+      [Builder.rest_element(Builder.identifier(:args))],
       [],
-      [],
-      Builder.block_statement([switch_statement]),
-      Builder.identifier(:args)
+      Builder.block_statement([switch_statement])
     )
 
     Enum.map(processed_functions, fn({function, _, _}) -> function end) ++ [master_function]
diff --git a/lib/elixir_script/translator/pattern_matching.ex b/lib/elixir_script/translator/pattern_matching.ex
@@ -1,6 +1,6 @@
 defmodule ElixirScript.Translator.PatternMatching do
   require Logger
-  alias ESTree.Builder
+  alias ESTree.Tools.Builder
   alias ElixirScript.Translator
   alias ElixirScript.Translator.Utils
   alias ElixirScript.Translator.Primitive
diff --git a/lib/elixir_script/translator/primitive.ex b/lib/elixir_script/translator/primitive.ex
@@ -1,8 +1,12 @@
 defmodule ElixirScript.Translator.Primitive do
   require Logger
-  alias ESTree.Builder
+  alias ESTree.Tools.Builder
   alias ElixirScript.Translator
 
+  def make_identifier([ast]) do
+    Builder.identifier(ast)
+  end
+
   def make_identifier(ast) do
     Builder.identifier(ast)
   end
diff --git a/lib/elixir_script/translator/try.ex b/lib/elixir_script/translator/try.ex
@@ -1,11 +1,10 @@
 defmodule ElixirScript.Translator.Try do
-  alias ESTree.Builder
+  alias ESTree.Tools.Builder
   alias ElixirScript.Translator
   alias ElixirScript.Translator.PatternMatching
 
   
   def make_try(try_block, _rescue_clauses, after_block) do
-    IO.inspect(try_block)
     Builder.try_statement(
       Builder.block_statement(List.wrap(
         Translator.translate(try_block)
@@ -44,7 +43,7 @@ defmodule ElixirScript.Translator.Try do
             nil
           )
 
-          IO.inspect(body)
+
           hd(body)    
       end
     end)
diff --git a/lib/elixir_script/translator/utils.ex b/lib/elixir_script/translator/utils.ex
@@ -1,5 +1,5 @@
 defmodule ElixirScript.Translator.Utils do
-  alias ESTree.Builder
+  alias ESTree.Tools.Builder
   alias ElixirScript.Translator
 
   def inflate_groups(body) do
diff --git a/lib/mix/tasks/ex2js.dist.ex b/lib/mix/tasks/ex2js.dist.ex
diff --git a/mix.exs b/mix.exs
diff --git a/mix.lock b/mix.lock
diff --git a/priv/javascript/code_generator.js b/priv/javascript/code_generator.js
diff --git a/priv/javascript/release.package.json b/priv/javascript/release.package.json
