Make sure to filter vars before trying to find name in vars field in state

bryanjos · bryanjos · commit 680612a20ab1 · 2017-09-13T19:58:10.000-05:00
diff --git a/lib/elixir_script/passes/translate/form.ex b/lib/elixir_script/passes/translate/form.ex
@@ -9,39 +9,6 @@ defmodule ElixirScript.Translate.Form do
   alias ElixirScript.Translate.Clause
   require Logger
 
-  @js_reserved_words [
-    :break,
-    :case,
-    :class,
-    :const,
-    :continue,
-    :debugger,
-    :default,
-    :delete,
-    :do,
-    :else,
-    :export,
-    :extends,
-    :finally,
-    :function,
-    :if,
-    :import,
-    :in,
-    :instanceof,
-    :new,
-    :return,
-    :super,
-    :switch,
-    :throw,
-    :try,
-    :typeof,
-    :var,
-    :void,
-    :while,
-    :with,
-    :yield
-  ]
-
   def compile!(ast, state) do
     {js_ast, _} = compile(ast, state)
 
@@ -406,18 +373,11 @@ defmodule ElixirScript.Translate.Form do
     end
   end
 
-  def compile({var, meta, _}, state) when var in @js_reserved_words do
-    counter = Pattern.get_counter(meta)
-
-    var = String.to_atom("__#{var}__")
-    var = Pattern.get_variable_name(to_string(var) <> counter, state)
-    { ElixirScript.Translate.Identifier.make_identifier(var), state }
-  end
-
   def compile({var, meta, _}, state) do
     counter = Pattern.get_counter(meta)
 
-    var = Pattern.get_variable_name(to_string(var) <> counter, state)
+    var = ElixirScript.Translate.Identifier.filter_name(var)
+    var = Pattern.get_variable_name(var <> counter, state)
     { ElixirScript.Translate.Identifier.make_identifier(var), state }
   end
 
diff --git a/lib/elixir_script/passes/translate/identifier.ex b/lib/elixir_script/passes/translate/identifier.ex
@@ -41,11 +41,11 @@ defmodule ElixirScript.Translate.Identifier do
     |> J.identifier
   end
 
-  defp filter_name(reserved_word) when reserved_word in @js_reserved_words do
+  def filter_name(reserved_word) when reserved_word in @js_reserved_words do
     "__#{Atom.to_string(reserved_word)}__"
   end
 
-  defp filter_name(name) do
+  def filter_name(name) do
     name = to_string(name)
 
     if String.contains?(name, ["?", "!"]) do
diff --git a/test/integration/integration_test.exs b/test/integration/integration_test.exs
@@ -29,4 +29,9 @@ defmodule ElixirScript.Integration.Test do
     val = call_compiled_function Integration, :multi_field_call, []
     assert val == "5,000,000"
   end
+
+  test "filter names in guards" do
+    val = call_compiled_function Integration, :filter_names_in_guards, []
+    assert val == true
+  end
 end
diff --git a/test/passes/translate/form_test.exs b/test/passes/translate/form_test.exs
@@ -168,4 +168,14 @@ defmodule ElixirScript.Translate.Forms.Test do
       ]
     )
   end
+
+  test "make sure counter used in guard", %{state: state} do
+    state = Map.merge(state, %{anonymous_fn: false, function: {:filter_names_in_guards, nil}, in_guard: true,
+    module: Integration, vars: %{"has__qmark__" => 0}})
+
+    ast = {{:., [], [:erlang, :==]}, [line: 29], [{:has?, [line: 29], nil}, 5]}
+
+    {js_ast, _} = Form.compile(ast, state)
+    assert hd(js_ast.arguments).name === "has__qmark__0"
+  end
 end
diff --git a/test/support/integration.ex b/test/support/integration.ex
@@ -21,4 +21,13 @@ defmodule Integration do
     map = %{token_count: 5000000}
     map.token_count.toLocaleString()
   end
+
+  def filter_names_in_guards do
+    has? = 5
+
+    case 5 do
+      _ when has? == 5 ->
+        true
+    end
+  end
 end
