Removed raise.ex and moved code into kernel.ex

bryanjos · bryanjos · commit e25a938ed86f · 2015-09-22T17:44:02.000-05:00
diff --git a/lib/elixir_script/translator/kernel.ex b/lib/elixir_script/translator/kernel.ex
@@ -2,6 +2,7 @@ defmodule ElixirScript.Translator.Kernel do
   @moduledoc false
   alias ESTree.Tools.Builder, as: JS
   alias ElixirScript.Translator
+  alias ElixirScript.Translator.Map
   alias ElixirScript.Translator.Function
   alias ElixirScript.Translator.Expression
   alias ElixirScript.Translator.Raise
@@ -58,7 +59,7 @@ defmodule ElixirScript.Translator.Kernel do
         Translator.translate(fun, env),
         JS.identifier(:apply)
       ),
-      [JS.identifier(:this)] ++ Enum.map(args, &Translator.translate(&1, env))
+      [JS.identifier(:null)] ++ Enum.map(args, &Translator.translate(&1, env))
     )
   end
 
@@ -71,7 +72,7 @@ defmodule ElixirScript.Translator.Kernel do
         ),
         JS.identifier(:apply)
       ),
-      [JS.identifier(:this)] ++ Enum.map(args, &Translator.translate(&1, env))
+      [JS.identifier(:null)] ++ Enum.map(args, &Translator.translate(&1, env))
     )
   end
 
@@ -190,11 +191,32 @@ defmodule ElixirScript.Translator.Kernel do
   defp do_translate({:raise, _, [alias_info, attributes]}, env) do
     {_, _, name} = alias_info
 
-    Raise.throw_error(name, attributes, env)
+    JS.throw_statement(
+      JS.call_expression(
+        JS.member_expression(
+          JS.identifier(List.last(name)),
+          JS.identifier(:defexception)
+        ),
+        Enum.map(attributes, fn({k, v})->
+          JS.assignment_expression(
+            :=,
+            JS.identifier(k),
+            Translator.translate(v, env)
+          )
+        end)
+      )
+    )
   end
 
   defp do_translate({:raise, _, [message]}, env) do
-    Raise.throw_error(message, env)
+    JS.throw_statement(
+      JS.object_expression(
+        [
+          Map.make_property(Translator.translate(:__struct__, env), Translator.translate(:RuntimeError, env)),
+          Map.make_property(Translator.translate(:message, env), JS.literal(message))
+        ]
+      )
+    )
   end
 
   defp do_translate({:to_string, _, [param]}, env) when is_binary(param) do
diff --git a/lib/elixir_script/translator/raise.ex b/lib/elixir_script/translator/raise.ex
diff --git a/lib/elixir_script/translator/try.ex b/lib/elixir_script/translator/try.ex
@@ -1,10 +1,7 @@
 defmodule ElixirScript.Translator.Try do
   @moduledoc false
   alias ESTree.Tools.Builder, as: JS
-  alias ElixirScript.Translator
   alias ElixirScript.Translator.Function
-  alias ElixirScript.Translator.Case
-  alias ElixirScript.Translator.Utils
 
   @error_identifier JS.identifier(:e)
 
@@ -100,8 +97,8 @@ defmodule ElixirScript.Translator.Try do
 
   defp convert_to_struct(module) do
     case module do
-      {:__aliases__, _, _}  = _alias->
-        {:%, [], [_alias, {:%{}, [], []}]}
+      {:__aliases__, _, _}  = alias_ast->
+        {:%, [], [alias_ast, {:%{}, [], []}]}
       ast ->
         ast
     end
diff --git a/mix.lock b/mix.lock
@@ -1,5 +1,5 @@
 %{"benchfella": {:hex, :benchfella, "0.2.1"},
-  "dogma": {:git, "https://github.com/lpil/dogma.git", "5a8eb42845bcc649659710d5d27942fa9a3c6421", []},
+  "dogma": {:hex, :dogma, "0.0.7"},
   "earmark": {:hex, :earmark, "0.1.17"},
   "estree": {:hex, :estree, "2.0.1"},
   "ex_doc": {:hex, :ex_doc, "0.9.0"},
diff --git a/test/translator/struct_test.exs b/test/translator/struct_test.exs
@@ -161,7 +161,7 @@ defmodule ElixirScript.Translator.Struct.Test do
     end
 
     js_code = """
-      throw new MyAppError(MyAppError.defexception(message='did not get what was expected'));
+      throw MyAppError.defexception(message = 'did not get what was expected');
     """
 
     assert_translation(ex_ast, js_code)
@@ -172,7 +172,9 @@ defmodule ElixirScript.Translator.Struct.Test do
     end
 
     js_code = """
-      throw new RuntimeError({__struct__: Kernel.SpecialForms.atom('RuntimeError'), message: 'did not get what was expected'});
+     throw     {
+                     [Kernel.SpecialForms.atom('__struct__')]: Kernel.SpecialForms.atom('RuntimeError'),         [Kernel.SpecialForms.atom('message')]: 'did not get what was expected'
+           };
     """
 
     assert_translation(ex_ast, js_code)
