Add more test. Fix variable scoping bug

bryanjos · bryanjos · commit bab9a91af0f1 · 2017-03-23T22:37:11.000-05:00
diff --git a/lib/elixir_script/translator.ex b/lib/elixir_script/translator.ex
@@ -645,13 +645,20 @@ defmodule ElixirScript.Translator do
         is_from_js_module(name, params, env) ->
           do_translate({{:., [], [{:__aliases__, [], [:JS]}, name]}, [], params }, env)
         ElixirScript.Translator.LexicalScope.has_var?(env, name) ->
+          name = case env.vars[name] do
+            0 ->
+              name
+            num ->
+              String.to_atom("#{name}#{num}")
+          end
+
           { Identifier.make_identifier(name), env }
         has_function?(env.module, {name, 0}, env) ->
           Call.make_function_call(name, [], env)
         ElixirScript.Translator.LexicalScope.find_module(env, {name, 0}) ->
           imported_module_name = ElixirScript.Translator.LexicalScope.find_module(env, {name, 0})
           Call.make_module_function_call(imported_module_name, name, params, env)
-        true ->
+        true ->       
           { Identifier.make_identifier(name), env }
       end
   end
diff --git a/lib/elixir_script/translator/kernel/special_forms/fn.ex b/lib/elixir_script/translator/kernel/special_forms/fn.ex
@@ -173,9 +173,8 @@ defmodule ElixirScript.Translator.Function do
         Enum.map_reduce(list, env, fn(x, env) ->
           Translator.translate(x, env)
         end)
-                      _ ->
-
-                        Enum.map_reduce(List.wrap(body), env, fn(x, env) ->
+       _ ->
+        Enum.map_reduce(List.wrap(body), env, fn(x, env) ->
           Translator.translate(x, env)
         end)
     end
diff --git a/lib/elixir_script/translator/lexical_scope.ex b/lib/elixir_script/translator/lexical_scope.ex
@@ -124,7 +124,7 @@ defmodule ElixirScript.Translator.LexicalScope do
   end
 
   def function_scope(env, { _, _ } = func) do
-    %{ env |  function: func, caller: env, vars: [] }
+    %{ env |  function: func, caller: env}
   end
 
   def function_scope(env, nil) do
diff --git a/priv/std_lib/enum.ex b/priv/std_lib/enum.ex
@@ -9,8 +9,6 @@ defmodule ElixirScript.Enum do
       end
     end)
 
-    IO.inspect acc
-
     acc
   end
 
@@ -131,9 +129,16 @@ defmodule ElixirScript.Enum do
     count == 0
   end
 
-  def fetch(enumerable, index) do
+  def fetch(enumerable, something_unique) do
+    something_unique = if something_unique < 0 do
+      {_, count} = Enumerable.count(enumerable) 
+      count + something_unique
+    else
+      something_unique
+    end
+
     result = Enumerable.reduce(enumerable, {:cont, 0}, fn(item, acc) ->
-      if index == acc do
+      if something_unique == acc do
         {:halt, {:ok, item}}
       else
         {:cont, acc + 1}
diff --git a/test/app/spec/enum.spec.js b/test/app/spec/enum.spec.js
@@ -1,5 +1,6 @@
 const expect = require('chai').expect;
 const Elixir = require('../build/Elixir.App');
+const Tuple = require('../../../src/javascript/lib/core').default.Tuple;
 
 const Enum = Elixir.load(Elixir.ElixirScript.Enum);
 
@@ -109,4 +110,17 @@ describe('Enum', () => {
     expect(Enum.empty__qmark__([])).to.eql(true);
     expect(Enum.empty__qmark__([1, 2, 3])).to.eql(false);
   });
+
+  it('fetch/2', () => {
+    expect(Enum.fetch([66], 0)).to.eql(new Tuple(Symbol.for('ok'), 66));
+    expect(Enum.fetch([66], -1)).to.eql(new Tuple(Symbol.for('ok'), 66));
+    expect(Enum.fetch([66], 1)).to.eql(Symbol.for('error'));
+    expect(Enum.fetch([66], -2)).to.eql(Symbol.for('error'));
+  });
+
+  it('fetch!/2', () => {
+    expect(Enum.fetch__emark__([2, 4, 6], 0)).to.eql(2);
+    expect(Enum.fetch__emark__([2, 4, 6], 2)).to.eql(6);
+    expect(Enum.fetch__emark__([2, 4, 6], -2)).to.eql(4);
+  });
 });
diff --git a/test/translator/bug_test.exs b/test/translator/bug_test.exs
@@ -159,4 +159,18 @@ defmodule ElixirScript.Translator.Bug.Test do
     assert_translation(ex_ast, js_code)
   end
 
+
+  test "variable" do
+    ex_ast = quote do
+      Enum.fetch([2, 4, 6], 0)
+    end
+
+    js_code = """
+      Object.assign(document.getElementById('main'), Object.freeze({
+          innerHTML: html
+      }))
+    """
+
+    assert_translation(ex_ast, js_code)
+  end
 end
