Added more erlang functions. Fixed more translations found from compiling stdlib

bryanjos · bryanjos · commit f5abddd7fab6 · 2016-02-15T18:47:33.000-06:00
diff --git a/lib/elixir_script/translator.ex b/lib/elixir_script/translator.ex
@@ -469,17 +469,17 @@ defmodule ElixirScript.Translator do
     translate(quoted, env)
   end
 
-  defp do_translate({:raise, _, [alias_info, {:<<>>, _, _} = message]}, env) do
+  defp do_translate({:raise, _, [alias_info, attributes]}, env) when is_list(attributes) do
     js_ast = JS.throw_statement(
-      Struct.new_struct(alias_info, {:%{}, [], [message: message] }, env)
+      Struct.new_struct(alias_info, {:%{}, [], attributes }, env)
     )
 
     { js_ast, env }
   end
 
-  defp do_translate({:raise, _, [alias_info, attributes]}, env) do
+  defp do_translate({:raise, _, [alias_info, message]}, env) do
     js_ast = JS.throw_statement(
-      Struct.new_struct(alias_info, {:%{}, [], attributes }, env)
+      Struct.new_struct(alias_info, {:%{}, [], [message: message] }, env)
     )
 
     { js_ast, env }
diff --git a/lib/elixir_script/translator/bitstring.ex b/lib/elixir_script/translator/bitstring.ex
@@ -53,6 +53,11 @@ defmodule ElixirScript.Translator.Bitstring do
     do_make_bitstring_element({:size, Translator.translate!(element, env), [Translator.translate!(size, env)]})
   end
 
+  defp make_bitstring_element(element, env) do
+    do_make_bitstring_element({:binary, Translator.translate!(element, env)})
+  end
+
+
   defp handle_type_adjectives({:-, _, types}, ast, env) do
     Enum.reduce(types, ast, fn(type, current_ast) ->
       case type do
diff --git a/lib/elixir_script/translator/module_collector.ex b/lib/elixir_script/translator/module_collector.ex
@@ -193,6 +193,10 @@ defmodule ElixirScript.Translator.ModuleCollector do
 
       add_function_to_map(state, type, name, arity)
 
+    ({type, _, [{name, _, nil}, [do: _body]]}, state)  when type in [:defmacro, :defmacrop]  ->
+      add_function_to_map(state, type, name, 0)
+
+
     ({type, _, [{name, _, params}, [do: _body]]}, state)  when type in [:defmacro, :defmacrop]  ->
       arity = length(params)
 
diff --git a/lib/elixir_script/translator/rewriter.ex b/lib/elixir_script/translator/rewriter.ex
@@ -407,6 +407,18 @@ defmodule ElixirScript.Translator.Rewriter do
     quote do: Elixir.Core.Functions.filtermap(unquote(fun), unquote(list))
   end
 
+  def rewrite({{:., _, [:lists, :concat]}, _, [things]}) do
+    quote do: unquote(things).join("")
+  end
+
+  def rewrite({{:., _, [:erlang, :binary_to_atom]}, _, [binary, _]}) do
+    quote do: Symbol.for(unquote(binary))
+  end
+
+  def rewrite({{:., _, [:erlang, :binary_to_existing_atom]}, _, [binary, _]}) do
+    quote do: Symbol.for(unquote(binary))
+  end
+
   def rewrite({{:., _, [:erlang, :list_to_atom]}, _, [char_list]}) do
     quote do: Symbol.for(unquote(char_list))
   end
@@ -431,6 +443,50 @@ defmodule ElixirScript.Translator.Rewriter do
     quote do: parseInt(unquote(list), unquote(base))
   end
 
+  def rewrite({{:., _, [:erlang, :integer_to_binary]}, _, [integer]}) do
+    quote do: unquote(integer).toString()
+  end
+
+  def rewrite({{:., _, [:erlang, :integer_to_binary]}, _, [integer, base]}) do
+    quote do: unquote(integer).toString(unquote(base))
+  end
+
+  def rewrite({{:., _, [:erlang, :integer_to_list]}, _, [integer]}) do
+    quote do: unquote(integer).toString()
+  end
+
+  def rewrite({{:., _, [:erlang, :integer_to_list]}, _, [integer, base]}) do
+    quote do: unquote(integer).toString(unquote(base))
+  end
+
+  def rewrite({{:., _, [:erlang, :float_to_binary]}, _, [float]}) do
+    quote do: unquote(float).toString()
+  end
+
+  def rewrite({{:., _, [:erlang, :float_to_binary]}, _, [float, base]}) do
+    quote do: unquote(float).toString(unquote(base))
+  end
+
+  def rewrite({{:., _, [:erlang, :float_to_list]}, _, [float]}) do
+    quote do: unquote(float).toString()
+  end
+
+  def rewrite({{:., _, [:erlang, :float_to_list]}, _, [float, base]}) do
+    quote do: unquote(float).toString(unquote(base))
+  end
+
+  def rewrite({{:., _, [:erlang, :binary_to_float]}, _, [binary]}) do
+    quote do: parseFloat(unquote(binary))
+  end
+
+  def rewrite({{:., _, [:erlang, :binary_to_integer]}, _, [binary]}) do
+    quote do: parseInt(unquote(binary))
+  end
+
+  def rewrite({{:., _, [:erlang, :binary_to_integer]}, _, [binary, base]}) do
+    quote do: parseInt(unquote(binary), unquote(base))
+  end
+
   def rewrite({{:., _, [:maps, :is_key]}, _, [key, map]}) do
     quote do: unquote(key) in Elixir.Core.Functions.get_object_keys(unquote(map))
   end
@@ -447,5 +503,16 @@ defmodule ElixirScript.Translator.Rewriter do
     quote do: Elixir.Core.Functions.maps_find(unquote(key), unquote(map))
   end
 
+  def rewrite({{:., _, [:maps, :remove]}, _, [key, map]}) do
+    quote do: Elixir.Core.Functions.delete_property_from_map(unquote(map), unquote(key))
+  end
+
+  def rewrite({{:., _, [:maps, :fold]}, _, [fun, init, map]}) do
+    quote do: Elixir.Core.Functions.maps_fold(unquote(fun), unquote(init), unquote(map))
+  end
+
+  def rewrite({{:., _, [:maps, :from_list]}, _, [list]}) do
+    quote do: Elixir.Core.Functions.maps_fold(unquote(list))
+  end
 
 end
diff --git a/src/javascript/lib/core/functions.js b/src/javascript/lib/core/functions.js
@@ -364,6 +364,26 @@ function filtermap(fun, list){
   return Object.freeze(newlist);
 }
 
+function maps_fold(fun, acc, map){
+  let acc1 = acc;
+
+  for(let k of get_object_keys(map)){
+    acc1 = fun(k, map[k], acc1);
+  }
+
+  return acc1;
+}
+
+function maps_from_list(list){
+  let m = {};
+
+  for(x of list){
+    m[x.get(0)] = x.get(1);
+  }
+
+  return Object.freeze(m);
+}
+
 export default {
   call_property,
   apply,
@@ -401,5 +421,6 @@ export default {
   flatten,
   duplicate,
   mapfoldl,
-  filtermap
+  filtermap,
+  maps_fold
 };
diff --git a/test/translator/assignment_test.exs b/test/translator/assignment_test.exs
@@ -71,8 +71,8 @@ defmodule ElixirScript.Translator.Assignment.Test do
   test "translate head/tail assignment" do
     ex_ast = quote do: [a | b] = [1, 2, 3, 4]
     js_code = """
-         let [a,b] = Elixir.Core.Patterns.match(Elixir.Core.Patterns.headTail(),Object.freeze([1, 2, 3, 4]));
-         let _ref = Object.freeze([a, b]);
+    let [a,b] = Elixir.Core.Patterns.match(Elixir.Core.Patterns.headTail(Elixir.Core.Patterns.variable(),Elixir.Core.Patterns.variable()),Object.freeze([1, 2, 3, 4]));
+    let _ref = Object.freeze([a, b]);
     """
 
     assert_translation(ex_ast, js_code)
diff --git a/test/translator/function_test.exs b/test/translator/function_test.exs
@@ -463,9 +463,9 @@ defmodule ElixirScript.Translator.Function.Test do
 
 
     js_code = """
-     const something = Elixir.Core.Patterns.defmatch(Elixir.Core.Patterns.make_case([Elixir.Core.Patterns.headTail()],function(apple,fruits)    {
-             return     null;
-           }));
+    const something = Elixir.Core.Patterns.defmatch(Elixir.Core.Patterns.make_case([Elixir.Core.Patterns.headTail(Elixir.Core.Patterns.variable(),Elixir.Core.Patterns.variable())],function(apple,fruits)    {
+    return     null;
+    }));
     """
 
     assert_translation(ex_ast, js_code)
diff --git a/test/translator/kernel_test.exs b/test/translator/kernel_test.exs
@@ -2,7 +2,7 @@ defmodule ElixirScript.Translator.Kernel.Test do
   use ExUnit.Case
   import ElixirScript.TestHelper
 
-  test "raise" do
+  test "raise with bitstring" do
     ex_ast = quote do
       raise ArgumentError, "cannot convert list to string. The list must contain only integers, strings or nested such lists; got: #{inspect list}"
     end
@@ -16,6 +16,20 @@ defmodule ElixirScript.Translator.Kernel.Test do
     assert_translation(ex_ast, js_code)
   end
 
+  test "raise with string" do
+    ex_ast = quote do
+      raise ArgumentError, "cannot convert list to string. The list must contain only integers, strings or nested such lists; got"
+    end
+
+    js_code = """
+    throw ArgumentError.create(Object.freeze({
+    [Symbol.for('message')]: 'cannot convert list to string. The list must contain only integers, strings or nested such lists; got'
+    }));
+    """
+
+    assert_translation(ex_ast, js_code)
+  end
+
   test "max" do
     ex_ast = quote do
       max(1, 2)
