From 8576117d00085a9172f711189860f7e18e3aa260 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Thu, 5 May 2022 07:36:06 -0400
Subject: [PATCH] Fix More 3.6 async parsing

... all from 3.6 test_coroutines.py.

More bugs remain
---
 test/bytecode_3.6/03_async_from_coroutine.pyc | Bin 0 -> 1238 bytes
 .../bug36/03_async_from_coroutine.py          |  39 ++++++++++++++++++
 uncompyle6/parsers/parse36.py                 |   2 +-
 uncompyle6/semantics/customize36.py           |   2 +-
 4 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 test/bytecode_3.6/03_async_from_coroutine.pyc
 create mode 100644 test/simple_source/bug36/03_async_from_coroutine.py

diff --git a/test/bytecode_3.6/03_async_from_coroutine.pyc b/test/bytecode_3.6/03_async_from_coroutine.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..437a659bd4b53dbb2ba2b7eb5a96859160d80980
GIT binary patch
literal 1238
zcmaJ=&2G~`5T02(uABZ4LWO!kNQg@=?oXgXD2gEBKsiJ}B??ForCuj;No;4=k=iOb
zr4rl_;wg9mUZ8K`E2lmHm!6o}kRMf$wPw~k-u-63Z^q@dwS4`jKKd;He!<+JH9R5H
z_sL0+cn<GD3Te@d(v~@zg>>W+&6aczptS5GZRKH+t&&}k=^D8<4DsaA0CoxKIh?MR
z%{&x`5an%1;Zt7kzJ&oE<3NlMp|_5}&pWb1iW554OCl>Cq;c|8pGN+E8mML(#!==p
zlO%{_$;zyD5M`DMbcW#%P!1)&@^siuIzdCnedPyRNBwqrZ)>~UXfjBnrQ&YGk5$}H
z!zl2Q(`+d;zyZ_OE;&FO@8KpYUQ8MCXJ*N!3*<gS3nfZ%?ha7`-Pfx76rK*=_?=8|
zlACRoxo0rKeIo}Qa_Z9zd|-WYs6sDo7{G@IL;SKxMUPYz->hC?reDt<tA~oqLox|(
zJF}B!s8o&vm|@FkrIu)Um9KO{o%(S%sd9R4lXHZy&UVs3rzBQ4X*~2Qo!D=7bk$S+
zsKEzjk=gmnJe|GVAXgG<jV8s2<6K;v5~`JHfRktL1dex`)PQ;G?9Rf}29PostQ!-+
z3An*snFHWDYOWvT6j#n?rFk&ZTVxkx`VF}Oe61mzJRXQ^eQVA2?KUZHslrQ`*PMHH
zWO`S^D|iju+q^cNL7n`!7IuawnRC={wE{K1K38NWkf}(P<IC^f=3DVk1?W&i+E@?;
zRD9om6ZlA9h`<XXP+Le~&k*o>h4B@y(>Pv8M3|;hEN979H)&EucBU5pB~!jjdo(x0
tgp9xqQAEYPQYRp;ktvQLXu@-<aPN$zaVy<e_B%n<{H`2#9e3Sb{sY(y-@*U@

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug36/03_async_from_coroutine.py b/test/simple_source/bug36/03_async_from_coroutine.py
new file mode 100644
index 00000000..6afdfe4c
--- /dev/null
+++ b/test/simple_source/bug36/03_async_from_coroutine.py
@@ -0,0 +1,39 @@
+# These are from 3.6 test_coroutines.py
+async def iterate(gen):
+    res = []
+    async for i in gen:
+        res.append(i)
+    return res
+
+def test_comp_5(f):
+    # async def f(it):
+    #     for i in it:
+    #         yield i
+
+    async def run_list():
+        return [i
+                for
+                pair in
+                ([10, 20])
+                async for i
+                in f
+                ]
+
+async def test2(x, buffer, f):
+    with x:
+        async for i in f:
+            if i:
+                break
+        else:
+            buffer()
+    buffer()
+
+async def test3(x, buffer, f):
+    with x:
+        async for i in f:
+            if i:
+                continue
+            buffer()
+        else:
+            buffer.append()
+    buffer()
diff --git a/uncompyle6/parsers/parse36.py b/uncompyle6/parsers/parse36.py
index 7581c5ff..a72dbc5e 100644
--- a/uncompyle6/parsers/parse36.py
+++ b/uncompyle6/parsers/parse36.py
@@ -135,7 +135,7 @@ class Python36Parser(Python35Parser):
                                POP_BLOCK JUMP_FORWARD COME_FROM_EXCEPT DUP_TOP
                                LOAD_GLOBAL COMPARE_OP POP_JUMP_IF_TRUE
                                END_FINALLY COME_FROM
-                               for_block
+                               for_block _come_froms
                                POP_TOP POP_TOP POP_TOP POP_EXCEPT POP_TOP
                                POP_BLOCK
                                else_suite COME_FROM_LOOP
diff --git a/uncompyle6/semantics/customize36.py b/uncompyle6/semantics/customize36.py
index 84ddc41c..8eeabe2c 100644
--- a/uncompyle6/semantics/customize36.py
+++ b/uncompyle6/semantics/customize36.py
@@ -67,7 +67,7 @@ def customize_for_version36(self, version):
                 "%|async for %c in %c:\n%+%c%-%|else:\n%+%c%-\n\n",
                 (9, "store"),
                 (1, "expr"),
-                (-9, "for_block"),
+                (-10, "for_block"),
                 (-2, "else_suite"),
             ),
             "call_ex":            ("%c(%p)", (0, "expr"), (1, 100)),