From 7f6afa9e9b554799cf9a39d0f8cc7d35e47a2cb4 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alehander42@gmail.com>
Date: Tue, 19 Dec 2017 13:57:37 +0200
Subject: Make asyncjs Future[void] play nicely with last line discardable
 calls

---
 lib/js/asyncjs.nim | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

(limited to 'lib/js/asyncjs.nim')

diff --git a/lib/js/asyncjs.nim b/lib/js/asyncjs.nim
index bde3d787f..73dbfb1e7 100644
--- a/lib/js/asyncjs.nim
+++ b/lib/js/asyncjs.nim
@@ -83,20 +83,46 @@ proc replaceReturn(node: var NimNode) =
       replaceReturn(son)
     inc z
 
+proc isFutureVoid(node: NimNode): bool =
+  result = node.kind == nnkBracketExpr and
+           node[0].kind == nnkIdent and $node[0] == "Future" and
+           node[1].kind == nnkIdent and $node[1] == "void"
+
 proc generateJsasync(arg: NimNode): NimNode =
   assert arg.kind == nnkProcDef
   result = arg
+  var isVoid = false
   if arg.params[0].kind == nnkEmpty:
     result.params[0] = nnkBracketExpr.newTree(ident("Future"), ident("void"))
+    isVoid = true
+  elif isFutureVoid(arg.params[0]):
+    isVoid = true
   var code = result.body
   replaceReturn(code)
   result.body = nnkStmtList.newTree()
-  var q = quote:
+
+  var awaitFunction = quote:
     proc await[T](f: Future[T]): T {.importcpp: "(await #)".}
-    proc jsResolve[T](a: T): Future[T] {.importcpp: "#".}
-  result.body.add(q)
+  result.body.add(awaitFunction)
+
+  var resolve: NimNode
+  var jsResolveNode = ident("jsResolve")
+  if isVoid:
+    resolve = quote:
+      var `jsResolveNode` {.importcpp: "undefined".}: Future[void]
+  else:
+    resolve = quote:
+      proc jsResolve[T](a: T): Future[T] {.importcpp: "#".}
+  result.body.add(resolve)
+
   for child in code:
     result.body.add(child)
+
+  if isVoid:
+    var voidFix = quote:
+      return `jsResolveNode`
+    result.body.add(voidFix)
+
   result.pragma = quote:
     {.codegenDecl: "async function $2($3)".}
 
-- 
cgit 1.4.1-2-gfad0


From b3dfc93beee2ac47a907ea77c1ed2da84ba4b672 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alehander42@gmail.com>
Date: Tue, 19 Dec 2017 20:50:37 +0200
Subject: Fix forward

---
 lib/js/asyncjs.nim | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'lib/js/asyncjs.nim')

diff --git a/lib/js/asyncjs.nim b/lib/js/asyncjs.nim
index 73dbfb1e7..c99170a49 100644
--- a/lib/js/asyncjs.nim
+++ b/lib/js/asyncjs.nim
@@ -92,33 +92,37 @@ proc generateJsasync(arg: NimNode): NimNode =
   assert arg.kind == nnkProcDef
   result = arg
   var isVoid = false
+  var jsResolveNode = ident("jsResolve")
+
   if arg.params[0].kind == nnkEmpty:
     result.params[0] = nnkBracketExpr.newTree(ident("Future"), ident("void"))
     isVoid = true
   elif isFutureVoid(arg.params[0]):
     isVoid = true
+
   var code = result.body
   replaceReturn(code)
   result.body = nnkStmtList.newTree()
 
-  var awaitFunction = quote:
-    proc await[T](f: Future[T]): T {.importcpp: "(await #)".}
-  result.body.add(awaitFunction)
+  if len(code) > 0:
+    var awaitFunction = quote:
+      proc await[T](f: Future[T]): T {.importcpp: "(await #)".}
+    result.body.add(awaitFunction)
 
-  var resolve: NimNode
-  var jsResolveNode = ident("jsResolve")
-  if isVoid:
-    resolve = quote:
-      var `jsResolveNode` {.importcpp: "undefined".}: Future[void]
+    var resolve: NimNode
+    if isVoid:
+      resolve = quote:
+        var `jsResolveNode` {.importcpp: "undefined".}: Future[void]
+    else:
+      resolve = quote:
+        proc jsResolve[T](a: T): Future[T] {.importcpp: "#".}
+    result.body.add(resolve)
   else:
-    resolve = quote:
-      proc jsResolve[T](a: T): Future[T] {.importcpp: "#".}
-  result.body.add(resolve)
-
+    result.body = newEmptyNode()
   for child in code:
     result.body.add(child)
 
-  if isVoid:
+  if len(code) > 0 and isVoid:
     var voidFix = quote:
       return `jsResolveNode`
     result.body.add(voidFix)
@@ -126,6 +130,7 @@ proc generateJsasync(arg: NimNode): NimNode =
   result.pragma = quote:
     {.codegenDecl: "async function $2($3)".}
 
+
 macro async*(arg: untyped): untyped =
   ## Macro which converts normal procedures into
   ## javascript-compatible async procedures
-- 
cgit 1.4.1-2-gfad0


From eba544996d5629943dbf84c0eeedaf5b958d6363 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alehander42@gmail.com>
Date: Wed, 20 Dec 2017 14:11:22 +0200
Subject: Fix docs!

---
 lib/js/asyncjs.nim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/js/asyncjs.nim')

diff --git a/lib/js/asyncjs.nim b/lib/js/asyncjs.nim
index c99170a49..ec410ee39 100644
--- a/lib/js/asyncjs.nim
+++ b/lib/js/asyncjs.nim
@@ -44,10 +44,10 @@
 ##         resolve(game)
 ##     return promise
 ##
-## Forward definitions work properly, you just don't need to add the ``{.async.}`` pragma:
+## Forward definitions work properly, you just need to always add the ``{.async.}`` pragma:
 ##
 ## .. code-block:: nim
-##   proc loadGame(name: string): Future[Game]
+##   proc loadGame(name: string): Future[Game] {.async.}
 ##
 ## JavaScript compatibility
 ## ~~~~~~~~~~~~~~~~~~~~~~~~~
-- 
cgit 1.4.1-2-gfad0