Skip to content

Commit 703cef3

Browse files
bryanjosbryanjos
committed
More async fixes
1 parent f33e34a commit 703cef3

File tree

13 files changed

+204
-550
lines changed

13 files changed

+204
-550
lines changed

‎.tool-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
erlang 20.0
22
elixir 1.5.0-otp-20
3-
nodejs 8.2.1
3+
nodejs 8.3.0

‎lib/elixir_script/passes/find_used_modules.ex‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ defmodule ElixirScript.FindUsedModules do
165165
end
166166

167167
defp walk({:for, _, generators}, state) do
168+
walk(Collectable, state)
169+
168170
Enum.each(generators, fn
169171
{:<<>>, _, body} ->
170172
walk(body, state)

‎lib/elixir_script/passes/translate/forms/for.ex‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ defmodule ElixirScript.Translate.Forms.For do
22
@moduledoc false
33

44
alias ESTree.Tools.Builder, as: JS
5-
alias ElixirScript.Translate.Helpers
6-
alias ElixirScript.Translate.{Form, Clause}
5+
alias ElixirScript.Translate.{Form, Clause, Identifier, Helpers}
76
alias ElixirScript.Translate.Forms.Pattern
87

98
def compile({:for, _, generators}, state) do
@@ -24,9 +23,10 @@ defmodule ElixirScript.Translate.Forms.For do
2423
[JS.array_expression(args.patterns), fun, filter]
2524
)
2625

27-
collectable = JS.member_expression(
28-
JS.identifier("Elixir"),
29-
JS.identifier("Collectable")
26+
members = ["Elixir", "Collectable", "__load"]
27+
collectable = Helpers.call(
28+
Identifier.make_namespace_members(members),
29+
[JS.identifier("Elixir")]
3030
)
3131

3232
ast = Helpers.call(

‎lib/elixir_script/passes/translate/forms/pattern/patterns.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ defmodule ElixirScript.Translate.Forms.Pattern.Patterns do
4040
)
4141

4242
def parameter() do
43-
Helpers.call(
43+
Helpers.call_sync(
4444
@parameter,
4545
[]
4646
)

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"clean": "rm -rf priv/build",
1414
"test": "nyc ava src/javascript/tests",
1515
"build:test-app": "MIX_ENV=test mix elixirscript Main -o test/app/build/",
16-
"test-app": "yarn build:test-app && NODE_ENV=test ava 'test/app/spec/**/*.spec.js'"
16+
"test:test-app": "NODE_ENV=test ava 'test/app/spec/**/*.spec.js'",
17+
"test-app": "yarn build && yarn build:test-app && yarn test:test-app"
1718
},
1819
"repository": {
1920
"type": "git",
@@ -23,7 +24,7 @@
2324
"license": "MIT",
2425
"dependencies": {
2526
"erlang-types": "^1.0.1",
26-
"tailored": "file:/Users/bryanjos/projects/basstype/tailored"
27+
"tailored": "^2.7.1"
2728
},
2829
"devDependencies": {
2930
"ava": "^0.21.0",

0 commit comments

Comments
 (0)