From 66741d16ba1f1545d9ad9f38e7bb615cca96d4cf Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sat, 7 Jan 2017 21:36:37 -0500
Subject: [PATCH] Start to add 3.5+ await and async

---
 test/bytecode_3.5/03_async_await.pyc       | Bin 0 -> 227 bytes
 test/bytecode_3.6/03_async_await.pyc       | Bin 0 -> 223 bytes
 test/simple_source/bug35/03_async_await.py |   3 +++
 uncompyle6/parsers/parse35.py              |   4 ++++
 uncompyle6/semantics/pysource.py           |  18 ++++++++++++++++--
 5 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 test/bytecode_3.5/03_async_await.pyc
 create mode 100644 test/bytecode_3.6/03_async_await.pyc
 create mode 100644 test/simple_source/bug35/03_async_await.py

diff --git a/test/bytecode_3.5/03_async_await.pyc b/test/bytecode_3.5/03_async_await.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..bc621ee7051e3191aea2411c3ff0f11f364caae5
GIT binary patch
literal 227
zcmWgR<>flCxG=(=fq~&M5W@izkmUfx#R5Pg1&A0KS{N9jfD9&vU`^&^peP)G)PgjF
z)s`?YG&3-G0=0NB0*PQvMn6r)DCVTZqLmCqj6hXj;+JZ1W^O@FYJ72iX;E^jeo|?=
zv8ld+aeQKNWnOZ8VtHa_iC#hFE#|cRe30?QAcBFhh#5!%%>&a2(;zI6l3N@$x%nxj
LIjMGFT_8;WO{OR`

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.6/03_async_await.pyc b/test/bytecode_3.6/03_async_await.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f32408c3ec0dddd82f29cbb99222d9b7fe376dac
GIT binary patch
literal 223
zcmXr!<>flCxG=(=fq~&M5W@izkmUfx#XLYFg&~Epg&~R|g(;XplQ|hE0tX;<hk>|Q
z07#TDG&6VtReLZn0!g4+Mn6r)DCVTZqLmCqj6elo;+JZ1W^O@FYJ72iX;E^jeo|?=
zv8ld+aeQKNWnOZ8VtHa_iC#hFE#|cRe30?QAcBFhh#5!%%>&a2(;zI6l3N@$x%nxj
LIjMGFT_8;WJ`5-=

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug35/03_async_await.py b/test/simple_source/bug35/03_async_await.py
new file mode 100644
index 00000000..d438b66e
--- /dev/null
+++ b/test/simple_source/bug35/03_async_await.py
@@ -0,0 +1,3 @@
+# Python 3.5+ async and await
+async def foo():
+    await bar()
diff --git a/uncompyle6/parsers/parse35.py b/uncompyle6/parsers/parse35.py
index 221d63a4..828f80cd 100644
--- a/uncompyle6/parsers/parse35.py
+++ b/uncompyle6/parsers/parse35.py
@@ -16,6 +16,10 @@ class Python35Parser(Python34Parser):
 
     def p_35on(self, args):
         """
+        # Python 3.5+ Await statement
+        sstmt      ::= await_stmt
+        await_stmt ::= call_function GET_AWAITABLE LOAD_CONST YIELD_FROM POP_TOP
+
         # Python 3.5+ has WITH_CLEANUP_START/FINISH
 
         withstmt ::= expr SETUP_WITH exprlist suite_stmts_opt
diff --git a/uncompyle6/semantics/pysource.py b/uncompyle6/semantics/pysource.py
index 44482879..be96a081 100644
--- a/uncompyle6/semantics/pysource.py
+++ b/uncompyle6/semantics/pysource.py
@@ -60,7 +60,7 @@ methods implement most of the below.
     %{...} evaluate ... in context of N
     %% literal '%'
     %p evaluate N setting precedence
-
+n
 
   * indicates an argument (A) required.
 
@@ -73,6 +73,8 @@ import sys, re
 
 from uncompyle6 import PYTHON3
 from xdis.code import iscode
+from xdis.util import COMPILER_FLAG_BIT
+
 from uncompyle6.parser import get_python_parser
 from uncompyle6.parsers.astnode import AST
 from spark_parser import GenericASTTraversal, DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
@@ -648,6 +650,19 @@ class SourceWalker(GenericASTTraversal, object):
                     'LOAD_CLASSDEREF':	( '%{pattr}', ),
                     })
                 if version >= 3.5:
+                    TABLE_DIRECT.update({
+                        'await_stmt':	( '%|await %c', 0),
+                    })
+                    def n_funcdef(node):
+                        code_node = node[0][1]
+                        if (code_node == 'LOAD_CONST' and iscode(code_node.attr)
+                            and code_node.attr.co_flags & COMPILER_FLAG_BIT['COROUTINE']):
+                            self.engine(('\n\n%|async def %c\n', -2), node)
+                        else:
+                            self.engine(('\n\n%|def %c\n', -2), node)
+                        self.prune()
+                    self.n_funcdef = n_funcdef
+
                     def n_unmapexpr(node):
                         last_n = node[0][-1]
                         for n in node[0]:
@@ -1895,7 +1910,6 @@ class SourceWalker(GenericASTTraversal, object):
         beginning of this module for the how we interpret format specifications such as
         %c, %C, and so on.
         """
-
         # self.println("----> ", startnode.type)
         fmt = entry[0]
         arg = 1