From 27f67e6fca3d28d461da610af89590867f077a5f Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Thu, 19 Apr 2018 10:00:40 -0400
Subject: [PATCH] Fix some 3.6/3.7 bugs

---
 test/bytecode_3.5/03_async_await.pyc   | Bin 1249 -> 1249 bytes
 test/bytecode_3.7/02_ifelse_lambda.pyc | Bin 0 -> 607 bytes
 test/bytecode_3.7/02_kwargs.pyc        | Bin 0 -> 508 bytes
 uncompyle6/parsers/parse35.py          |   5 ++++-
 uncompyle6/parsers/parse36.py          |  13 +++++++++++++
 uncompyle6/semantics/customize3.py     |   3 ++-
 6 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 test/bytecode_3.7/02_ifelse_lambda.pyc
 create mode 100644 test/bytecode_3.7/02_kwargs.pyc

diff --git a/test/bytecode_3.5/03_async_await.pyc b/test/bytecode_3.5/03_async_await.pyc
index c36dde672b8c4cf1ec6f51a12ec62c19ba3700e3..e906fbf7a79cb6fbe2bc04b6606dd8ed98d68647 100644
GIT binary patch
delta 16
XcmaFJ`H+)coR^pD3&Wp{?6+6|E-M9{

delta 16
XcmaFJ`H+)cjF*?oJoEQP_FF6fD`o{p

diff --git a/test/bytecode_3.7/02_ifelse_lambda.pyc b/test/bytecode_3.7/02_ifelse_lambda.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ccd6127819359f39975e704e1606671ac73224a2
GIT binary patch
literal 607
zcma)3u}T9$5S`h(<Q7d(w6U}ef)VQ=Q9-QIoFJqLm)pH0WRnYf1T>_P2!4ydw5`?s
zf|WBHqF1DFVBXDRXWzV?yKOcPfa0xt*Z)9(FDAPXRCFne4uJxN@6ZPgN^B581)ihE
z4G;@G6IysyW2Wkvppz(umP|?82Y*@jp0YS5Sd;D)Y(t5dG^sc2mE2HrXBiNDLJJ+f
z*pO-u-xtMXwlI27<V&0C_RuEtbUc}l+E>?uNv2Jq2PT;fRdTs_b+WUqZ}@&e2{s}q
zYXm9NUGP9}OHxs>^JLkNWh;LkDpj2iSh7Ls2ke*SV}({$q#yn(ee^3`T_jubj?cXG
z8bSzQius8WQ;ccP2(-|k=P+@&@|Jm(=|1zPy9ukqM{P`g{+wH*dab}==5XY2T)E|c
Y1;3lNJImG5=<Rm-i4tWbu`VcsA6)@lk^lez

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.7/02_kwargs.pyc b/test/bytecode_3.7/02_kwargs.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..69cd1a40b67e10a381ca34f456893492993df929
GIT binary patch
literal 508
zcmYjNy-ve05cb(=ngT_A1lBN6R3s*ZK<q3qWr@<*DGf<u*@>X28(sS#yZ{g5l_{^l
z#GRoMC*A+u=kI(w9v?6iU3?}bF!n{sUIGkmQ0*xi$s}x9!X%fXf&>(lTn2I=!yT7H
z8Ex4+BtnV@7LRh;Bq2XQy+gG#G#gg34M>oD$6=od!r6(xoNt5-v5&cAh&H_MagoK~
zLZftJ+8%kbo>Pq*a)~IKrWbxF8SBhgmF7)dt5q8ZF0iU99Fz_+2lEeR=-}@YyR3Dk
zQrmPUSJQd7xVW62&(i0Y%q;AgUORy`Lbo9r2FEY~bA*wh=aCb-$C$feoxR%Sn{tD8
zt(DBFOG2L1pHBbakAZvte2ibEv)0GI<`5^`glOv}(!yq|%!;a(NHA_DXyd?BaHFDI
m<!#ec){QFDrFoV=DL?TKlI}DfH@d1D*;VS=-$P`gD1sl}C21T0

literal 0
HcmV?d00001

diff --git a/uncompyle6/parsers/parse35.py b/uncompyle6/parsers/parse35.py
index 3d46230f..b144e2ef 100644
--- a/uncompyle6/parsers/parse35.py
+++ b/uncompyle6/parsers/parse35.py
@@ -16,6 +16,9 @@ class Python35Parser(Python34Parser):
 
     def p_35on(self, args):
         """
+
+        pb_ja ::= POP_BLOCK JUMP_ABSOLUTE
+
         # The number of canned instructions in new statements is mind boggling.
         # I'm sure by the time Python 4 comes around these will be turned
         # into special opcodes
@@ -90,7 +93,7 @@ class Python35Parser(Python34Parser):
                                LOAD_GLOBAL COMPARE_OP POP_JUMP_IF_FALSE
                                POP_TOP POP_TOP POP_TOP POP_EXCEPT POP_BLOCK
                                JUMP_ABSOLUTE END_FINALLY COME_FROM
-                               for_block POP_BLOCK JUMP_ABSOLUTE
+                               for_block pb_ja
                                else_suite COME_FROM_LOOP
 
 
diff --git a/uncompyle6/parsers/parse36.py b/uncompyle6/parsers/parse36.py
index 5788863e..1044c41e 100644
--- a/uncompyle6/parsers/parse36.py
+++ b/uncompyle6/parsers/parse36.py
@@ -56,6 +56,19 @@ class Python36Parser(Python35Parser):
         jf_cf       ::= JUMP_FORWARD COME_FROM
         conditional ::= expr jmp_false expr jf_cf expr COME_FROM
 
+        # FIXME: remove corresponding rule for 3.5
+        async_forelse_stmt ::= SETUP_LOOP expr
+                               GET_AITER
+                               LOAD_CONST YIELD_FROM SETUP_EXCEPT GET_ANEXT LOAD_CONST
+                               YIELD_FROM
+                               store
+                               POP_BLOCK JUMP_FORWARD COME_FROM_EXCEPT DUP_TOP
+                               LOAD_GLOBAL COMPARE_OP POP_JUMP_IF_FALSE
+                               POP_TOP POP_TOP POP_TOP POP_EXCEPT POP_BLOCK
+                               JUMP_ABSOLUTE END_FINALLY COME_FROM
+                               for_block POP_BLOCK
+                               else_suite COME_FROM_LOOP
+
         # Adds a COME_FROM_ASYNC_WITH over 3.5
         # FIXME: remove corresponding rule for 3.5?
 
diff --git a/uncompyle6/semantics/customize3.py b/uncompyle6/semantics/customize3.py
index d77c26d9..104067d1 100644
--- a/uncompyle6/semantics/customize3.py
+++ b/uncompyle6/semantics/customize3.py
@@ -265,7 +265,8 @@ def customize_for_version3(self, version):
                 'async_for_stmt':      (
                     '%|async for %c in %c:\n%+%c%-\n\n', 9, 1, 25 ),
                 'async_forelse_stmt':  (
-                    '%|async for %c in %c:\n%+%c%-%|else:\n%+%c%-\n\n', 9, 1, 25, 28 ),
+                    '%|async for %c in %c:\n%+%c%-%|else:\n%+%c%-\n\n',
+                    9, 1, 25, (27, 'else_suite') ),
                 'async_with_stmt':     (
                     '%|async with %c:\n%+%c%-', 0, 7),
                 'async_with_as_stmt':  (