Update String module debug_info code.

bryanjos · bryanjos · commit 4da3f46d3a60 · 2017-07-29T18:38:09.000-05:00
Get debug_info from String module, but then replace functions
found in ElixirScript.String. This is so we don't have to
reimplement the entire String module.
diff --git a/.tool-versions b/.tool-versions
@@ -1,3 +1,3 @@
 erlang 20.0
-elixir ref-v1.5.0-rc.2
+elixir 1.5.0-otp-20
 nodejs 8.2.0
diff --git a/lib/elixir_script/beam.ex b/lib/elixir_script/beam.ex
@@ -10,9 +10,24 @@ defmodule ElixirScript.Beam do
   @spec debug_info(atom) :: {:ok | :error, map | binary}
   def debug_info(module)
 
-  #Replace some modules with ElixirScript versions
-  def debug_info(module) when module in [String, Agent] do
-    case debug_info(Module.concat(ElixirScript, module)) do
+  # We get debug info from String and then replace
+  # functions in it with equivalents in ElixirScript.String.
+  # This is so that we don't include the unicode database
+  # in our output
+  def debug_info(String) do
+    {:ok, info} = do_debug_info(String)
+    {:ok, ex_string_info} = do_debug_info(ElixirScript.String)
+
+    definitions = replace_definitions(info.definitions, ex_string_info.definitions)
+
+    info = %{info | definitions: definitions}
+
+    {:ok, info}
+  end
+
+  # Replace some modules with ElixirScript versions
+  def debug_info(module) when module in [Agent] do
+    case do_debug_info(Module.concat(ElixirScript, module)) do
       {:ok, info} ->
         {:ok, Map.put(info, :module, module)}
       e ->
@@ -21,6 +36,10 @@ defmodule ElixirScript.Beam do
   end
 
   def debug_info(module) when is_atom(module) do
+    do_debug_info(module)
+  end
+
+  defp do_debug_info(module) when is_atom(module) do
     #TODO: Get modified date from _beam_path to check for cached version?
     with  {_, beam, _beam_path} <- :code.get_object_code(module),
           {:ok, {^module, [debug_info: {:debug_info_v1, backend, data}]}} <- :beam_lib.chunks(beam, [:debug_info]),
@@ -59,4 +78,21 @@ defmodule ElixirScript.Beam do
     {:ok, module, implementations}
   end
 
-end
+  defp replace_definitions(original_definitions, replacement_definitions) do
+    Enum.map(original_definitions, fn
+      {{function, arity}, type, _, _} = ast ->
+        ex_ast = Enum.find(replacement_definitions, fn
+          {{ex_function, ex_arity}, ex_type, _, _}  ->
+            ex_function == function and ex_arity == arity and ex_type == type
+        end)
+
+        case ex_ast do
+          nil ->
+            ast
+          _ ->
+            ex_ast
+        end
+    end)
+  end
+
+end
diff --git a/lib/elixir_script/passes/translate/forms/remote.ex b/lib/elixir_script/passes/translate/forms/remote.ex
@@ -17,7 +17,8 @@ defmodule ElixirScript.Translate.Forms.Remote do
     :elixir_utils,
     :file,
     :io,
-    :binary
+    :binary,
+    :unicode
   ]
 
   @doc """
diff --git a/src/javascript/lib/core.js b/src/javascript/lib/core.js
@@ -8,6 +8,7 @@ import lists from './core/erlang_compat/lists';
 import elixir_errors from './core/erlang_compat/elixir_errors';
 import io from './core/erlang_compat/io';
 import binary from './core/erlang_compat/binary';
+import unicode from './core/erlang_compat/unicode';
 import Store from './core/store';
 
 class Integer {}
@@ -47,5 +48,6 @@ export default {
   lists,
   elixir_errors,
   io,
-  binary
+  binary,
+  unicode
 };
diff --git a/src/javascript/lib/core/erlang_compat/unicode.js b/src/javascript/lib/core/erlang_compat/unicode.js
@@ -0,0 +1,18 @@
+import erlang from './erlang';
+
+function characters_to_list(characters) {
+  return characters.split('').map(c => c.codePointAt(0));
+}
+
+function characters_to_binary(characters) {
+  if (erlang.is_binary(characters)) {
+    return characters;
+  }
+
+  return String.fromCodePoint(...characters);
+}
+
+export default {
+  characters_to_list,
+  characters_to_binary
+};
diff --git a/test/support/main.ex b/test/support/main.ex
@@ -1,5 +1,7 @@
 defmodule Main do
   def start(:normal, [callback]) do
     callback.("started")
+
+    String.upcase("d")
   end
 end

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ defmodule ElixirScript.Translate.Forms.Remote do`
`17`	`17`	`:elixir_utils,`
`18`	`18`	`:file,`
`19`	`19`	`:io,`
`20`		`- :binary`
	`20`	`+ :binary,`
	`21`	`+ :unicode`
`21`	`22`	`]`
`22`	`23`
`23`	`24`	`@doc """`