From 9b806635292712906345c275931a023b83ca706f Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sat, 7 May 2022 06:06:38 -0400
Subject: [PATCH] 3.6 async hacking

---
 test/bytecode_3.6/03_async_from_coroutine.pyc | Bin 1238 -> 1791 bytes
 test/bytecode_3.7/03_async_from_coroutine.pyc | Bin 0 -> 1761 bytes
 test/bytecode_3.8/03_async_from_coroutine.pyc | Bin 0 -> 1626 bytes
 .../bug36/03_async_from_coroutine.py          |   9 +++++++++
 uncompyle6/parsers/parse36.py                 |   8 +++++---
 uncompyle6/semantics/gencomp.py               |   2 +-
 uncompyle6/semantics/n_actions.py             |  11 +++++++----
 7 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 test/bytecode_3.7/03_async_from_coroutine.pyc
 create mode 100644 test/bytecode_3.8/03_async_from_coroutine.pyc

diff --git a/test/bytecode_3.6/03_async_from_coroutine.pyc b/test/bytecode_3.6/03_async_from_coroutine.pyc
index 437a659bd4b53dbb2ba2b7eb5a96859160d80980..da634c61a650bc41f2ecf77b1110f711a0aa4810 100644
GIT binary patch
literal 1791
zcmah}Ur!T35Z~Fm9;N)TA}S#o6QAr$L5jqfhA8nte84{>f+pIO?v)hV-gUP%K*|#)
z`euxuLcazd!MA($iLbzuzuBXAMF?KAv(vko*_q$`W=j(jxficKZT)hD_#=iM3H>pa
zS%gqR(P!~aD5)Imq+FH3E|sT7usbTNMzOmpr^c{n)cCq6Ow<Uj{P2$W;t0!3K`2u4
zv*?QjM1Cd?3D(Y9V$Mg8W359m^HBO?Z@gqp4`@TQbFS!$k2!O96M^0!dPfo@iMLov
zAedY`&cUxh(bRf32%ng}c5Sum>uR?Vv<otl#rcRDKZVY~>ZE8It+44=OwiLce{QR{
zU0Rx(FIB4SR;lZtRjCC!=ye-yzZmYFjFz|kw!a(dWiHBax;e2wt9$JVJ`~H%pjK^~
z<zixHk3lk2w^}SbxJ4tUP8`Dq5~N3=Cs>?;ZWdn#&>be=ty*NxLpTBJ-yF9Hv3&`M
zeflmtZVDkn(OQ8tCsmM|i_|U)Mk`JJBv)=WOt%)a!euVT=07g>Z*fihWeADH(7Gdb
zHVI{eS}?K$M}9RxV+?wN2B*TzutZvcvMmm1_u+s@2}|S<OBOaopLVD(4+%_}Ov~KB
z`?yqTOO3p082W8ha3TkNj2!Koi|UR>8kR~vr)IbiK`z~;8PZpvC&@B=oG>qwhxj7u
zWZRcLAWKtl9<P&!4S!&n8Hm(aWu9V0k}iAcps>T_z^M#{yZnCffWDrR<3d1+07QOw
zI{6fej(eu(j_rBmhSi3)2%Kpc_e%44-NZ6X3{OgD|9;muT?|SqtUO3NKWJ(CCMAt#
zavx7afMu-ft1J?hoj;Wkzky{>6_j)KZ(n+9%r+Ubjh)ZX&ysFzC;%TH^Dd+LnyN9t
z{BV)iu#T|I8;HL6wnAd}QD4SaSOT;&#JqU`?dbeVF$^`c?hyCX2B!9vcrBQn{NEBH
z9XmIo-N@VO)$6{F)4yN>qYNj%aEG(vu@K~ehc4x1p7eG6zqo)8_<{nSqkxr53s|xR
z6g&Ai#ed7#xwMdYs5IwQa5bZ+xz+zErgRTBhDkjrM$)vLBF$}ID|q&H)V7s8Y_?6d
fRBMoOC)VO?rQ8Zsujwz_OO}b7b+R6QliAU~y-G1;

delta 551
zcmZ{hzfQw25XNK2Nz+0~XsZe&BqRz$B*edniBe#Lr3`(5lC~*|)F#n6m0&_V0^}JO
zn333d2?jGV^#NE|z~`!^3z7WEzI^xd-TB9U&(}QLE;L_x=Zk9Er#AP=vvw*M-+ZWT
zv6klMvnT5Bic%|$lQVuBbuZEY{4|UsVfslDL_Jp*`gITq9Re;$_^g5XNW3+X3zaiK
zB)6n!gpm!hLcq!{^|yT@BQlrn><O0mA%KAaB1j)hxr3aP??QbL^0XTdlSVN+W+(M=
zL59Z_v{JCqS42@6C@z78SpX5jf>G2)ik-c%?IUHP6VuYvIn7cD3u(a9Hs0Aj#JV|l
zpc&v~AI56t8CU13bSB7+Fgv4uKY$4i8~Ce4H6RRx9aIssh!|qZ88G5dhd@~Z@9z)>
zc!kSg8TTa=)x^I*Z(Vvgc0L7CQlTXRIGCmcVcp=Mlu<A|SJ`a7!m3w?ac?vT8tR$w
Khh<ttEB_11=V)L6

diff --git a/test/bytecode_3.7/03_async_from_coroutine.pyc b/test/bytecode_3.7/03_async_from_coroutine.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7aad71edeb7d7a15c5343969521bf8d0d0371c07
GIT binary patch
literal 1761
zcmaJ?%Wl&^6uo!sq-mN$Ddi!=Lt;e`3Z;dLMHK-;2sY(Wi2@Re(u`9@B(XD-pted^
zMS>kd`~WQBH~0j0-m>Bsy5ih1u~TR}(cBr^GuP*wd&appJzXTU$4}p`fA@%f$;GHC
zOzxoDn+TdTzoS>AmG&^Q_H_=U(s@0B(bEMziP6_ZJ%ur+ORH3#ZZNh=lTq^hK)1&b
zG;8&ahO|JtjFsL>x>S};qOW3N=P?=5R%sCc9?}l4QMc$*pWYPh<rhfu9GQEH5t&}1
zYeF)$@>^JyIi6kZhtXZT)oncL2d3U{h264>Rb@Wr);BUatlF#CRwrr)H5(30Be=dk
z*jQY;KEGJ2%eGq6gq>O=G~uA%>IRi)Yj1LSBj^U3k*Pv3vI4hA+vm)nTf>9Oayx9)
z+qPOsm$}yf3^&~@33+UbC;o1d94-;D5$dTH`(!(fCnMQ*op6twD*wwT?0-tm3c|(_
z0uK3;>iL;`NX08<HUg-uj1V-w1W_sjzE@msw`{)=cA}~fao9_=eO~y;lQ9+2g>E}?
z7t&NNsS~0w+9<b1N=#v%Dj`rr8fTy?CL3_W=1nnB>JByLj>-!f@)sVeuMCG2Gm2}t
zpU_l}W}L4_QP9<8FZNKs*fW7Wh;uyAaux~%mK74jK40XsY>s1|0u|{5taLkr@Sd9N
z%2wE6XHR$?x6>vIKcm~T2-#xo-N(^LE9_?nL^cQrx9K(}QsLM0JN)4=F|I-k^~vj%
zG8uaQzFK>(*0CSeTgI{9S175G5mTK(w_=FAQr`BBeqj4J9G$3kE35dZl-ZrkEbx?A
z`u7|{=BfYRCG^DZ?p?%1Z~MZL?@GL-5^u@oeP(kOn;J`SLQ+eiC}(C78zQMRp(Z?k
zpxb8%L;6@{+FTl{F`s#3KD!2KJyUu@<Kl|PcJVb@!})wl&q%x|*RK580rO+tjPvV*
zW-~Ae^aIXXoD<*+mjqD>fjAG>`8=a$*qp-k!Qfxv3BW%9`0AnH7aaJjy;1`2UkYFN
z>k%Z9<6{I<**7OK7*|$zz7Hj`cm)gHKfs8H;yE?TM#{ZX&b#lQaV3;v<;vq|x&@hM
cl3DWcSnh;+&<?8ZGb-gPc!fNE#|o2w0KsJ}kpKVy

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.8/03_async_from_coroutine.pyc b/test/bytecode_3.8/03_async_from_coroutine.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..50c0dde1cf78c1f2ed3487b69285c74ca1d4c095
GIT binary patch
literal 1626
zcmaJ>&rcIU6rP#gmTf5w5=0~zFUHVIL6DxB#uyKJ!5~qLiD^n_OPch@cBVDZEGJ0x
zW{Cd)9P7WqpWtn;p7<AxM!z@PcDoHS&AgeNnfK;<-}^dm=jPH3?e*@bgYOn&Kj~w#
z34A<5*H2+2ll+W*U{Xj6BbT;JU=%VbXE0jQktvL}Ov_n}37Oerxw$Hb>!{J3VqT%^
zER5t*oH3tmvQv)J)=um=9i2hn!$hxQ;<Nt37J$5D`|N~E{*H0h5e2NkS?pX>HUl;g
zfyi$JysjvKF~9P<-t-!7S+{$t>aHL34z~*H8(ZayK5kXZHPvpGt8LZpb?YrR?;QuJ
z;-TAek33ZZFHGAo89?u^s9vj#t$eZ3u2vellph~77Y%s8Ytg+b3CCb&=tOWd8O9Ys
zjU^l7W(m6^ZcYt5uT0uEbL8Ok4|Kf(b4V=BM=bgLTy*RL7#i@M5E-R3jWJzp)OEMo
zZh9rcY%<PL#;XLL_9jvu9}T0>{nPQBkz0bI4U?Y3JeD*ep$Z#8JjUb@btO6Um&O?g
zpI<OvTyoUfDKH;GQL{J-s*@GZb6YZJ1r}-&SjyFk?wbZPQ}4Q}(sjvA6I#Y?KF_mU
zEnpr)L`Vr0bv+OBnbn{)$kc)2NM{f!mSc?$e?!;HFp-0_UO?C5%Gq&slT&Ks_y`lK
z+{e`u{)O_7Dkyw$ZgnyR*0G0~oAh#)B2@;qSE;Ko>!=P?LY0BJhi)=X3Snjcir@Vw
zT~~J@_NG_fj!HVJR<si7Atw}x^Lmkj5<j7tx{Yc}vek4q<7rF$=|8yjt}qRuhy+FM
z6LBd>FgxLX2MeK$66!AIRibayhzN>ug|3S*KKr`HAsP_5I2MxSTPh6^t##5Qqf<N{
z`)r%-vN!Dg@S6&3#AToi?0_Ey$%9_4=Bg0pP3lSz%*}^%H&M=b656u4Bj&lfkMI9O
zeU4o~%@3h2$Dpou(jmwY?ghKN6)-)giV6_2XzFBGH1M|8uw$Ow5j?@uVu34qGInxF
n^B#popudEn*nl?&CPGGWono^sdkwclOPby@$8wVRWu4SNv_BGK

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
index 6afdfe4c..30d3fcd1 100644
--- a/test/simple_source/bug36/03_async_from_coroutine.py
+++ b/test/simple_source/bug36/03_async_from_coroutine.py
@@ -1,4 +1,13 @@
 # These are from 3.6 test_coroutines.py
+async def run_gen(f):
+    return (10 async for i in f)
+
+async def run_list(f):
+    return [i async for i in f()]
+
+# async def run_dict():
+#  return {i + 1 async for i in [10, 20]}
+
 async def iterate(gen):
     res = []
     async for i in gen:
diff --git a/uncompyle6/parsers/parse36.py b/uncompyle6/parsers/parse36.py
index c1d414d2..a6a9bbf9 100644
--- a/uncompyle6/parsers/parse36.py
+++ b/uncompyle6/parsers/parse36.py
@@ -192,6 +192,8 @@ class Python36Parser(Python35Parser):
 
         compare_chained2 ::= expr COMPARE_OP come_froms JUMP_FORWARD
 
+        stmt ::= genexpr_func
+        genexpr_func ::= LOAD_ARG _come_froms FOR_ITER store comp_iter JUMP_BACK
         """
 
     # Some of this is duplicated from parse37. Eventually we'll probably rebase from
@@ -336,9 +338,9 @@ class Python36Parser(Python35Parser):
                 self.addRule(
                     """
                     expr                ::= generator_exp_async
-                    generator_exp_async ::= load_genexpr LOAD_STR MAKE_FUNCTION_0 expr
-                                            GET_AITER CALL_FUNCTION_1
 
+                    generator_exp_async ::= load_genexpr LOAD_STR MAKE_FUNCTION_0 expr
+                                            GET_AITER LOAD_CONST YIELD_FROM CALL_FUNCTION_1
                     stmt                ::= genexpr_func_async
 
                     func_async_prefix   ::= _come_froms
@@ -349,7 +351,7 @@ class Python36Parser(Python35Parser):
                                             END_FINALLY COME_FROM
                     genexpr_func_async  ::= LOAD_ARG func_async_prefix
                                             store func_async_middle comp_iter
-                                            JUMP_BACK COME_FROM
+                                            JUMP_BACK
                                             POP_TOP POP_TOP POP_TOP POP_EXCEPT POP_TOP
 
                     expr                ::= list_comp_async
diff --git a/uncompyle6/semantics/gencomp.py b/uncompyle6/semantics/gencomp.py
index 0ce44256..c9a05895 100644
--- a/uncompyle6/semantics/gencomp.py
+++ b/uncompyle6/semantics/gencomp.py
@@ -182,7 +182,7 @@ class ComprehensionMixin:
         self.write(" in ")
         if node[2] == "expr":
             iter_expr = node[2]
-        elif node[3] == "get_aiter":
+        elif node[3] in ("expr", "get_aiter"):
             iter_expr = node[3]
         else:
             iter_expr = node[-3]
diff --git a/uncompyle6/semantics/n_actions.py b/uncompyle6/semantics/n_actions.py
index 32626822..50b4771a 100644
--- a/uncompyle6/semantics/n_actions.py
+++ b/uncompyle6/semantics/n_actions.py
@@ -681,17 +681,20 @@ class NonterminalActions:
         self.write("(")
         iter_index = 3
         if self.version > (3, 2):
-            code_index = -6
-            if self.version > (3, 6):
-                # Python 3.7+ adds optional "come_froms" at node[0]
+            if self.version >= (3, 6):
                 if node[0].kind in ("load_closure", "load_genexpr") and self.version >= (3, 8):
+                    code_index = -6
                     is_lambda = self.is_lambda
                     if node[0].kind == "load_genexpr":
                         self.is_lambda = False
                     self.closure_walk(node, collection_index=4)
                     self.is_lambda = is_lambda
                 else:
-                    code_index = -6
+                    # Python 3.7+ adds optional "come_froms" at node[0] so count from the end
+                    if node == "generator_exp_async" and self.version[:2] == (3, 6):
+                        code_index = 0
+                    else:
+                        code_index = -6
                     iter_index = 4 if self.version < (3, 8) else 3
                     self.comprehension_walk(node, iter_index=iter_index, code_index=code_index)
                     pass