From a775f423c7c219f29f56a5e5ceaed49f6b765db6 Mon Sep 17 00:00:00 2001
From: dk00 <dk00@users.noreply.github.com>
Date: Thu, 16 Mar 2017 21:43:46 +0800
Subject: [PATCH] Add explicit async function

---
 src/convert.ls   | 7 ++++---
 test/function.ls | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/convert.ls b/src/convert.ls
index 6053ca5..a3f5998 100644
--- a/src/convert.ls
+++ b/src/convert.ls
@@ -430,6 +430,7 @@ transform.Chain = ->
     bind-prop node <<< base: tree, children: [\base] ++ node.children
 transform.Call = ->
   | it.new => set-type it, \New
+  | it.base.value == \async => it.args.0 <<< async: true
   | it.base.value == \await => transform-await it
   | it.method => helper it.base, \call it.args
   | _ => it
@@ -517,16 +518,16 @@ function transform-await
   (set-type it, \Await) <<< children: [it.children.1.0]
 
 function extract-result
-  if it.body.0.type == \ReturnStatement && it.body.length == 1
+  if it.body.length == 1 && it.body.0.type == \ReturnStatement
     (t.expression it.body.0.argument) <<< it{loc}
   else it
 
-t.function = ({bound} name, params, block) ->
+t.function = ({bound, async} name, params, block) ->
   nested = block.scope
   if params.length == 0 && nested.it .&. REF
     params := [(t.identifier \it) <<< scope: it: DECL]
   body = declare-vars block, Object.assign {} ...params.map (.scope)
-  async = !!nested\.await
+  async ||= !!nested\.await
   scope = map-values (nested <<< \.await : DECL, it: DECL), omit-declared
 
   result = if bound
diff --git a/test/function.ls b/test/function.ls
index 56d5bf5..3f48969 100644
--- a/test/function.ls
+++ b/test/function.ls
@@ -53,6 +53,10 @@ function main t
   actual = fn!
   t.equal actual, expected, 'wrap only statement of bound functions'
 
+  fn = async ->
+  actual = fn!
+  t.ok actual.then 'explicit async functions'
+
   expected = -> await expected
   actual = expected!
   t.ok actual.then, 'the async function returns a Promise'