Fixed bugs in html module and removed catch from list of js keywords

bryanjos · bryanjos · commit f684eed565c3 · 2016-02-19T12:41:55.000-06:00
diff --git a/lib/elixir_script/prelude/html.ex b/lib/elixir_script/prelude/html.ex
@@ -38,7 +38,7 @@ defmodule ElixirScript.Html do
       { inner, attributes } = do_tag(inner, attrs)
 
       quote do
-         Elixir.VirtualDOM.h(unquote(tag), unquote(attributes), unquote_splicing(inner))
+         Elixir.VirtualDOM.h(unquote(tag), unquote(attributes), unquote(inner))
       end
     end
 
@@ -49,7 +49,7 @@ defmodule ElixirScript.Html do
       { inner, attributes } = do_tag(inner, attributes)
 
       quote do
-         Elixir.VirtualDOM.h(unquote(tag), unquote(attributes), unquote_splicing(inner))
+         Elixir.VirtualDOM.h(unquote(tag), unquote(attributes), unquote(inner))
       end
     end
   end
diff --git a/lib/elixir_script/translator.ex b/lib/elixir_script/translator.ex
@@ -23,7 +23,18 @@ defmodule ElixirScript.Translator do
   alias ESTree.Tools.Builder, as: JS
   alias ElixirScript.Translator.Rewriter
 
-
+  @erlang_modules [
+    :erlang,
+    :maps,
+    :lists,
+    :gen,
+    :elixir_errors,
+    :supervisor,
+    :application,
+    :code,
+    :elixir_utils,
+    :file
+  ]
 
   @doc """
   Translates the given Elixir AST to JavaScript AST. The given `env` is a `ElixirScript.Macro.Env`
@@ -186,7 +197,7 @@ defmodule ElixirScript.Translator do
     end
   end
 
-  defp do_translate({{:., _, [erlang_module, _]}, _, _} = erlang_function_call, env) when erlang_module in [:erlang, :maps, :lists] do
+  defp do_translate({{:., _, [erlang_module, _]}, _, _} = erlang_function_call, env) when erlang_module in @erlang_modules do
     Rewriter.rewrite(erlang_function_call)
     |> translate(env)
   end
diff --git a/lib/elixir_script/translator/utils.ex b/lib/elixir_script/translator/utils.ex
@@ -7,7 +7,6 @@ defmodule ElixirScript.Translator.Utils do
     :break,
     :case,
     :class,
-    :catch,
     :const,
     :continue,
     :debugger,
diff --git a/priv/Elixir.js b/priv/Elixir.js
diff --git a/src/javascript/lib/core/protocol.js b/src/javascript/lib/core/protocol.js
@@ -17,9 +17,9 @@ class Protocol{
         let fun = null;
 
         if(Number.isInteger(thing) && this.hasImplementation(Integer)){
-          fun = this.registry.get(Core.Integer)[funName];
+          fun = this.registry.get(Integer)[funName];
         }else if(typeof thing === "number" && !Number.isInteger(thing) && this.hasImplementation(Float)){
-          fun = this.registry.get(Core.Float)[funName];
+          fun = this.registry.get(Float)[funName];
         }else if(this.hasImplementation(thing)){
           fun = this.registry.get(thing.constructor)[funName];
         }else if(this.fallback){
diff --git a/src/javascript/tests/patterns/defmatch.spec.js b/src/javascript/tests/patterns/defmatch.spec.js
@@ -143,7 +143,4 @@ describe('defmatch', () => {
     expect(fn(new Tuple(1, 2, 3))).to.equal(3);
     expect(fn.bind(fn, new Tuple(1, 2, 4))).to.throw("No match for: {1, 2, 4}");
   });
-
-
-
 });
