Still trying to get processes to work

bryanjos · bryanjos · commit 4be0337b51d0 · 2017-09-27T20:40:23.000-05:00
diff --git a/lib/elixir_script/lib/js.ex b/lib/elixir_script/lib/js.ex
@@ -91,4 +91,9 @@ defmodule ElixirScript.JS do
   ```
   """
   defexternal object_to_map(object, options)
+
+  @doc """
+  Turns an Elixir function into a JavaScript one
+  """
+  defexternal to_js_function(function)
 end
diff --git a/lib/elixir_script/passes/translate/clause.ex b/lib/elixir_script/passes/translate/clause.ex
@@ -19,7 +19,7 @@ defmodule ElixirScript.Translate.Clause do
     |> return_last_statement
     #|> Function.update_last_call(state)
 
-    ast = Helpers.call(
+    ast = Helpers.call_sync(
       J.member_expression(
         Helpers.patterns(),
         J.identifier("clause")
diff --git a/lib/elixir_script/passes/translate/form.ex b/lib/elixir_script/passes/translate/form.ex
@@ -144,7 +144,7 @@ defmodule ElixirScript.Translate.Form do
   end
 
   def compile({:case, _, [condition, [do: clauses]]}, state) do
-    ast = Helpers.call(
+    ast = Helpers.call_gen(
       J.member_expression(
         Helpers.special_forms(),
         J.identifier("_case")
@@ -181,7 +181,7 @@ defmodule ElixirScript.Translate.Form do
       J.identifier("cond")
     )
 
-    ast = Helpers.call(
+    ast = Helpers.call_gen(
       cond_function,
       processed_clauses
     )
diff --git a/lib/elixir_script/passes/translate/forms/for.ex b/lib/elixir_script/passes/translate/forms/for.ex
@@ -15,7 +15,7 @@ defmodule ElixirScript.Translate.Forms.For do
     fun = args.fun
 
 
-    expression = Helpers.call(
+    expression = Helpers.call_sync(
       JS.member_expression(
         Helpers.patterns(),
         JS.identifier("clause")
@@ -30,7 +30,7 @@ defmodule ElixirScript.Translate.Forms.For do
       [JS.identifier("Elixir")]
     )
 
-    ast = Helpers.call(
+    ast = Helpers.call_gen(
       JS.member_expression(
         Helpers.special_forms(),
         JS.identifier("_for")
diff --git a/lib/elixir_script/passes/translate/forms/js.ex b/lib/elixir_script/passes/translate/forms/js.ex
@@ -148,4 +148,18 @@ defmodule ElixirScript.Translate.Forms.JS do
 
     {ast, state}
   end
+
+  def compile({{:., _, [ElixirScript.JS, :to_js_function]}, _, [func]}, state) do
+    ast = Helpers.call_sync(
+      J.member_expression(
+        Helpers.functions(),
+        J.identifier("to_js_function")
+      ),
+      [
+        Form.compile!(func, state)
+      ]
+    )
+
+    {ast, state}
+  end
 end
diff --git a/lib/elixir_script/passes/translate/forms/match.ex b/lib/elixir_script/passes/translate/forms/match.ex
@@ -65,10 +65,10 @@ defmodule ElixirScript.Translate.Forms.Match do
 
     { patterns, params, state } = Pattern.compile([left], state)
 
-    array_pattern = Helpers.declare(params, Helpers.call(
+    array_pattern = Helpers.declare(params, Helpers.call_gen(
       J.member_expression(
         Helpers.patterns(),
-        J.identifier("match")
+        J.identifier("match_gen")
       ),
       [hd(patterns), right_ast]
     ))
@@ -112,10 +112,10 @@ defmodule ElixirScript.Translate.Forms.Match do
     {js_ast, state} = Enum.map_reduce(lefts, state, fn(left, state) ->
       { patterns, params, state } = Pattern.compile([left], state)
 
-      array_pattern = Helpers.declare(params, Helpers.call(
+      array_pattern = Helpers.declare(params, Helpers.call_gen(
         J.member_expression(
           Helpers.patterns(),
-          J.identifier("match")
+          J.identifier("match_gen")
         ),
         [hd(patterns), J.identifier("__intermediate__")]
       ))
diff --git a/lib/elixir_script/passes/translate/forms/try.ex b/lib/elixir_script/passes/translate/forms/try.ex
@@ -39,7 +39,7 @@ defmodule ElixirScript.Translate.Forms.Try do
       JS.identifier(:null)
     end
 
-    js_ast = Helpers.call(
+    js_ast = Helpers.call_gen(
       JS.member_expression(
         Helpers.special_forms(),
         JS.identifier("_try")
@@ -67,7 +67,7 @@ defmodule ElixirScript.Translate.Forms.Try do
       end)
 
 
-      Helpers.call(
+      Helpers.call_gen(
         JS.member_expression(
           Helpers.patterns(),
           JS.identifier("defmatchGen")
diff --git a/lib/elixir_script/passes/translate/forms/with.ex b/lib/elixir_script/passes/translate/forms/with.ex
@@ -33,7 +33,7 @@ defmodule ElixirScript.Translate.Forms.With do
 
     expressions = result.expressions
 
-    js_ast = Helpers.call(
+    js_ast = Helpers.call_gen(
       JS.member_expression(
         Helpers.special_forms(),
         JS.identifier("_with")
diff --git a/lib/elixir_script/passes/translate/function.ex b/lib/elixir_script/passes/translate/function.ex
@@ -98,7 +98,7 @@ defmodule ElixirScript.Translate.Function do
     clauses
     |> Enum.map(&compile_clause(&1, state))
     |> Enum.map(fn {patterns, _params, guards, body} ->
-      match_or_default_call = Helpers.call(
+      match_or_default_call = Helpers.call_gen(
         J.member_expression(
           Helpers.patterns(),
           J.identifier("match_or_default_gen")
diff --git a/lib/elixir_script/passes/translate/helpers.ex b/lib/elixir_script/passes/translate/helpers.ex
@@ -37,6 +37,14 @@ defmodule ElixirScript.Translate.Helpers do
     |> J.yield_expression(true)
   end
 
+  def call_gen(callee, arguments) do
+    J.call_expression(
+      callee,
+      arguments
+    )
+    |> J.yield_expression(true)
+  end
+
   def arrow_function(params, body) do
     J.function_expression(
       params,
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "erlang-types": "^1.0.1",
     "grapheme-splitter": "^1.0.2",
     "rollup-plugin-commonjs": "^8.2.1",
-    "tailored": "^2.7.4"
+    "tailored": "file:/Users/bryanjos/projects/basstype/tailored"
   },
   "devDependencies": {
     "@std/esm": "^0.8.3",
diff --git a/rollup.config.js b/rollup.config.js
@@ -15,10 +15,10 @@ export default {
     babel({
       babelrc: false,
     }),
-    minify({
-      keepFnName: true,
-      keepClassName: true,
-    }),
+    //minify({
+    //  keepFnName: true,
+    //  keepClassName: true,
+    //}),
   ],
   output: [{ file: 'priv/build/iife/ElixirScript.Core.js', format: 'iife' }],
 };
diff --git a/src/javascript/lib/core/functions.js b/src/javascript/lib/core/functions.js
@@ -208,6 +208,17 @@ function concat(head, tail) {
   return [head].concat(tail);
 }
 
+function to_js_function(generator) {
+  const genObj = generator();
+  let value = null;
+
+  while (genObj.done === false) {
+    value = genObj.next(value);
+  }
+
+  return value;
+}
+
 export default {
   call_property,
   defprotocol,
@@ -220,4 +231,5 @@ export default {
   split_at,
   graphemes,
   concat,
+  to_js_function,
 };
diff --git a/src/javascript/lib/core/special_forms.js b/src/javascript/lib/core/special_forms.js
@@ -1,7 +1,7 @@
 import Core from '../core';
 
 function* _case(condition, clauses) {
-  return Core.Patterns.defmatchGen(...clauses)(condition);
+  return yield* Core.Patterns.defmatchGen(...clauses)(condition);
 }
 
 function* cond(...clauses) {
diff --git a/yarn.lock b/yarn.lock
@@ -3846,9 +3846,8 @@ table@^4.0.1:
     slice-ansi "0.0.4"
     string-width "^2.0.0"
 
-tailored@^2.7.4:
+"tailored@file:/Users/bryanjos/projects/basstype/tailored":
   version "2.7.4"
-  resolved "https://registry.yarnpkg.com/tailored/-/tailored-2.7.4.tgz#473c6c91fcaeb2c8e4ddd5c2bddb33190ac21780"
   dependencies:
     erlang-types "^1.0.1"
 
