Add string interpolation

bryanjos · bryanjos · commit 128218eb33e8 · 2017-07-04T16:34:25.000-05:00
diff --git a/lib/elixir_script/passes/find_used_functions.ex b/lib/elixir_script/passes/find_used_functions.ex
@@ -98,8 +98,8 @@ defmodule ElixirScript.FindUsedFunctions do
     walk(tail, state)
   end
 
-  defp walk({:::, _, _}, _) do
-    nil
+  defp walk({:::, _, [target, _type]}, state) do
+    walk(target, state)
   end
 
   defp walk(form, state) when is_list(form) do
diff --git a/lib/elixir_script/passes/find_used_modules.ex b/lib/elixir_script/passes/find_used_modules.ex
@@ -95,8 +95,8 @@ defmodule ElixirScript.FindUsedModules do
     walk(tail, state)
   end
 
-  defp walk({:::, _, _}, _) do
-    nil
+  defp walk({:::, _, [target, _type]}, state) do
+    walk(target, state)
   end
 
   defp walk(form, state) when is_list(form) do
diff --git a/lib/elixir_script/passes/translate/form.ex b/lib/elixir_script/passes/translate/form.ex
@@ -90,8 +90,23 @@ defmodule ElixirScript.Translate.Form do
     ElixirScript.Translate.Forms.Map.compile(map, state)
   end
 
-  def compile({:<<>>, _, _} = bitstring, state) do
-    Bitstring.compile(bitstring, state)
+  def compile({:<<>>, _, elements} = bitstring, state) do
+    is_interpolated_string = Enum.all?(elements, fn(x) ->
+      case x do
+        b when is_binary(b) ->
+          true
+        {:::, _, [_target, {:binary, _, _}]} ->
+          true
+        _ ->
+          false
+      end
+    end)
+
+    if is_interpolated_string do
+      Bitstring.make_interpolated_string(elements, state)
+    else
+      Bitstring.compile(bitstring, state)
+    end
   end
 
   def compile({:=, _, [_, _]} = match, state) do
diff --git a/lib/elixir_script/passes/translate/forms/bitstring.ex b/lib/elixir_script/passes/translate/forms/bitstring.ex
@@ -129,10 +129,19 @@ defmodule ElixirScript.Translate.Forms.Bitstring do
       end
     end)
 
-    { do_make_interpolated_string(tl(translated_elements), hd(translated_elements)) }
+    result = case translated_elements do
+      [] ->
+        JS.literal('')
+      [element] ->
+        do_make_interpolated_string([], hd(translated_elements))
+      elements ->
+        do_make_interpolated_string(tl(elements), hd(elements))
+    end
+
+    {result, state}
   end
 
-  defp do_make_interpolated_string([], ast, _) do
+  defp do_make_interpolated_string([], ast) do
     ast
   end
 
diff --git a/test/passes/translate/forms/bitstring_test.exs b/test/passes/translate/forms/bitstring_test.exs
@@ -0,0 +1,30 @@
+defmodule ElixirScript.Translate.Forms.Bitstring.Test do
+  use ExUnit.Case
+  alias ElixirScript.Translate.Form
+  alias ESTree.Tools.Builder, as: J
+
+  setup_all do
+    {:ok, pid} = ElixirScript.State.start_link(%{})
+
+    state = %{
+      pid: pid,
+      vars: %{}
+    }
+
+    [state: state]
+  end
+
+  test "string interpolation", %{state: state} do
+    ast = {:<<>>, [line: 5],
+      [{:::, [], ["Hello, ", {:binary, [], []}]},
+        {:::, [line: 5],
+        [{{:., [line: 5], [String.Chars, :to_string]}, [line: 5],
+          [{:name, [line: 5], nil}]}, {:binary, [], []}]}]}
+
+    {js_ast, _} = Form.compile(ast, state)
+    assert js_ast.type == "BinaryExpression"
+    assert js_ast.left == J.literal("Hello, ")
+    assert js_ast.right.type == "CallExpression"
+  end
+
+end
