Update for translation

bryanjos · bryanjos · commit e972eab28d23 · 2017-02-27T20:24:08.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.26.1] - 2017-02-27
+
+### Fixed
+- Fixed `for` translation
+- Updated documentation
+
 ## [0.26.0] - 2017-02-27
 
 ### Added
diff --git a/lib/elixir_script/translator/kernel/special_forms/for.ex b/lib/elixir_script/translator/kernel/special_forms/for.ex
@@ -6,6 +6,7 @@ defmodule ElixirScript.Translator.For do
   alias ElixirScript.Translator.Primitive
   alias ElixirScript.Translator.Function
   alias ElixirScript.Translator.Utils
+  alias ElixirScript.Translator.Identifier  
 
   def make_for(generators, env) do
     ElixirScript.Translator.State.add_module_reference(env.state, env.module, ElixirScript.Collectable)
@@ -17,6 +18,14 @@ defmodule ElixirScript.Translator.For do
     filter = args.filter || JS.function_expression([], [], JS.block_statement([JS.return_statement(JS.identifier("true"))]))
     fun = args.fun
 
+    members = ["Elixir"] ++ Module.split(ElixirScript.Collectable) ++ ["__load"]
+
+    collectable_module = JS.call_expression(
+          Identifier.make_namespace_members(members),
+          [JS.identifier("Elixir")]
+        )
+
+
     expression = JS.call_expression(
       JS.member_expression(
         JS.member_expression(
@@ -36,7 +45,7 @@ defmodule ElixirScript.Translator.For do
         Primitive.special_forms(),
         JS.identifier("_for")
       ),
-      [expression, generators, JS.identifier(Utils.name_to_js_name(ElixirScript.Collectable)), into]
+      [expression, generators, collectable_module, into]
     )
 
     {js_ast, env}
diff --git a/mix.exs b/mix.exs
@@ -4,7 +4,7 @@ defmodule ElixirScript.Mixfile do
   def project do
     [
       app: :elixir_script,
-      version: "0.26.0",
+      version: "0.26.1",
       elixir: "~> 1.0",
       elixirc_paths: elixirc_paths(),      
       escript: escript_config(),
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "elixirscript",
-  "version": "0.25.0",
+  "version": "0.26.1",
   "description": "Convert Elixir to JavaScript",
   "main": "elixir.js",
   "bin": {
@@ -44,4 +44,4 @@
     "rollup-plugin-node-resolve": "^2.0.0",
     "rollup-plugin-uglify": "^1.0.1"
   }
-}
+}
diff --git a/test/translator/for_test.exs b/test/translator/for_test.exs
@@ -24,7 +24,7 @@ defmodule ElixirScript.Translator.For.Test do
           Object.freeze([1, 2, 3, 4])
         )
       ],
-      Elixir$ElixirScript$Collectable,
+      Elixir.ElixirScript.Collectable.__load(Elixir),
       Object.freeze([])
     )
     """
@@ -54,7 +54,7 @@ defmodule ElixirScript.Translator.For.Test do
           Object.freeze([1, 2, 3, 4])
         )
       ],
-      Elixir$ElixirScript$Collectable,
+      Elixir.ElixirScript.Collectable.__load(Elixir),
       Object.freeze([])
     )
     """
@@ -88,7 +88,7 @@ defmodule ElixirScript.Translator.For.Test do
           Object.freeze([2, 3])
         )
       ],
-      Elixir$ElixirScript$Collectable,
+      Elixir.ElixirScript.Collectable.__load(Elixir),
       Object.freeze([])
     )
     """
@@ -126,7 +126,7 @@ defmodule ElixirScript.Translator.For.Test do
             Object.freeze([2, 3])
           )
         ],
-        Elixir$ElixirScript$Collectable,
+        Elixir.ElixirScript.Collectable.__load(Elixir),
         Object.freeze([])
       )
     );
@@ -157,7 +157,7 @@ defmodule ElixirScript.Translator.For.Test do
           Object.freeze([1, 2, 3, 4, 5, 6])
         )
       ],
-      Elixir$ElixirScript$Collectable,
+      Elixir.ElixirScript.Collectable.__load(Elixir),
       Object.freeze([])
     )
     """
@@ -186,7 +186,7 @@ defmodule ElixirScript.Translator.For.Test do
             values: [Symbol.for('user'), Bootstrap.Core.Patterns.variable()]
         }), Object.freeze([new Bootstrap.Core.Tuple(Symbol.for('user'), 'john'), new Bootstrap.Core.Tuple(Symbol.for('admin'), 'john'), new Bootstrap.Core.Tuple(Symbol.for('user'), 'meg')]))
         ],
-        Elixir$ElixirScript$Collectable,
+        Elixir.ElixirScript.Collectable.__load(Elixir),
         Object.freeze([]))
     """
 
@@ -218,7 +218,7 @@ defmodule ElixirScript.Translator.For.Test do
          'value': Bootstrap.Core.Patterns.variable()
      }, 8), Bootstrap.Core.BitString.size({
          'value': Bootstrap.Core.Patterns.variable()
-     }, 8)), pixels)], Elixir$ElixirScript$Collectable, Object.freeze([]))
+     }, 8)), pixels)], Elixir.ElixirScript.Collectable.__load(Elixir), Object.freeze([]))
     """
 
     assert_translation(ex_ast, js_code)

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ defmodule ElixirScript.Mixfile do`
`4`	`4`	`def project do`
`5`	`5`	`[`
`6`	`6`	`app: :elixir_script,`
`7`		`- version: "0.26.0",`
	`7`	`+ version: "0.26.1",`
`8`	`8`	`elixir: "~> 1.0",`
`9`	`9`	`elixirc_paths: elixirc_paths(),`
`10`	`10`	`escript: escript_config(),`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "elixirscript",`
`3`		`- "version": "0.25.0",`
	`3`	`+ "version": "0.26.1",`
`4`	`4`	`"description": "Convert Elixir to JavaScript",`
`5`	`5`	`"main": "elixir.js",`
`6`	`6`	`"bin": {`
`@@ -44,4 +44,4 @@`
`44`	`44`	`"rollup-plugin-node-resolve": "^2.0.0",`
`45`	`45`	`"rollup-plugin-uglify": "^1.0.1"`
`46`	`46`	`}`
`47`		`-}`
	`47`	`+}`