More changes

bryanjos · bryanjos · commit fb42ce6b92cf · 2017-09-10T09:14:26.000-05:00
diff --git a/lib/elixir_script/passes/output/js_module.ex b/lib/elixir_script/passes/output/js_module.ex
@@ -44,7 +44,7 @@ defmodule ElixirScript.Output.JSModule do
         J.identifier("Elixir"),
         J.identifier("start")
       ),
-      Helpers.arrow_function(
+      Helpers.function(
         [J.identifier(:app), J.identifier(:args)],
         J.block_statement([
           start_process_call
@@ -59,7 +59,7 @@ defmodule ElixirScript.Output.JSModule do
         J.identifier("Elixir"),
         J.identifier("load")
       ),
-      Helpers.arrow_function(
+      Helpers.function(
         [J.identifier(:module)],
         J.block_statement([
           J.return_statement(
diff --git a/lib/elixir_script/passes/translate/clause.ex b/lib/elixir_script/passes/translate/clause.ex
@@ -17,7 +17,7 @@ defmodule ElixirScript.Translate.Clause do
 
     body = body
     |> return_last_statement
-    |> Function.update_last_call(state)
+    #|> Function.update_last_call(state)
 
     ast = Helpers.call(
       J.member_expression(
diff --git a/lib/elixir_script/passes/translate/function.ex b/lib/elixir_script/passes/translate/function.ex
@@ -18,8 +18,7 @@ defmodule ElixirScript.Translate.Function do
 
     arg_matches_declaration = Helpers.declare_let("__arg_matches__", J.identifier("null"))
 
-    function_recur_dec = Helpers.function(
-      "recur",
+    function_dec = Helpers.arrow_function(
       [J.rest_element(J.identifier("__function_args__"))],
       J.block_statement([
         arg_matches_declaration,
@@ -36,15 +35,15 @@ defmodule ElixirScript.Translate.Function do
       ])
     )
 
-    function_dec = Helpers.arrow_function(
-      [J.rest_element(J.identifier("__function_args__"))],
-      J.block_statement([
-        function_recur_dec,
-        J.return_statement(
-          trampoline()
-        )
-      ])
-    )
+    #function_dec = Helpers.arrow_function(
+    #  [J.rest_element(J.identifier("__function_args__"))],
+    #  J.block_statement([
+    #    function_recur_dec,
+    #    J.return_statement(
+    #      trampoline()
+    #    )
+    #  ])
+    #)
 
     state = Map.put(state, :anonymous_fn, anonymous?)
     { function_dec, state }
@@ -59,8 +58,8 @@ defmodule ElixirScript.Translate.Function do
 
     arg_matches_declaration = Helpers.declare_let("__arg_matches__", J.identifier("null"))
 
-    function_recur_dec = Helpers.function(
-      "recur",
+    function_dec = Helpers.function(
+      ElixirScript.Translate.Identifier.make_function_name(name),
       [J.rest_element(J.identifier("__function_args__"))],
       J.block_statement([
         arg_matches_declaration,
@@ -77,16 +76,16 @@ defmodule ElixirScript.Translate.Function do
       ])
     )
 
-    function_dec = Helpers.function(
-      ElixirScript.Translate.Identifier.make_function_name(name),
-      [J.rest_element(J.identifier("__function_args__"))],
-      J.block_statement([
-        function_recur_dec,
-        J.return_statement(
-          trampoline()
-        )
-      ])
-    )
+    #function_dec = Helpers.function(
+    #  ElixirScript.Translate.Identifier.make_function_name(name),
+    #  [J.rest_element(J.identifier("__function_args__"))],
+    #  J.block_statement([
+    #    function_recur_dec,
+    #    J.return_statement(
+    #      trampoline()
+    #    )
+    #  ])
+    #)
 
     { function_dec, state }
   end
@@ -135,7 +134,7 @@ defmodule ElixirScript.Translate.Function do
 
     body = body
     |> Clause.return_last_statement
-    |> update_last_call(state)
+    #|> update_last_call(state)
 
     declaration = Helpers.declare(params, J.identifier("__arg_matches__"))
 
diff --git a/lib/elixir_script/passes/translate/helpers.ex b/lib/elixir_script/passes/translate/helpers.ex
@@ -28,7 +28,7 @@ defmodule ElixirScript.Translate.Helpers do
 
   def call(callee, arguments) do
     J.call_expression(
-      J.member_expression(process_system(), J.identifier("run")),
+      J.member_expression(core_module("ProcessSystem"), J.identifier("run")),
       [
         callee,
         J.array_expression(arguments)
diff --git a/src/javascript/lib/core.js b/src/javascript/lib/core.js
@@ -59,4 +59,5 @@ export default {
   elixir_config,
   math,
   proplists,
+  ProcessSystem
 };
diff --git a/src/javascript/lib/core/functions.js b/src/javascript/lib/core/functions.js
@@ -7,7 +7,7 @@ import erlang from './erlang_compat/erlang';
 function* call_property(item, property) {
   if (!property) {
     if (item instanceof Function || typeof item === 'function') {
-      return item();
+      return yield* item();
     }
 
     return item;

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ defmodule ElixirScript.Translate.Helpers do`
`28`	`28`
`29`	`29`	`def call(callee, arguments) do`
`30`	`30`	`J.call_expression(`
`31`		`- J.member_expression(process_system(), J.identifier("run")),`
	`31`	`+ J.member_expression(core_module("ProcessSystem"), J.identifier("run")),`
`32`	`32`	`[`
`33`	`33`	`callee,`
`34`	`34`	`J.array_expression(arguments)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import erlang from './erlang_compat/erlang';`
`7`	`7`	`function* call_property(item, property) {`
`8`	`8`	`if (!property) {`
`9`	`9`	`if (item instanceof Function \|\| typeof item === 'function') {`
`10`		`- return item();`
	`10`	`+ return yield* item();`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`return item;`