From 9acb3cf0689352905b478dc77752246d0ba9cc1a Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Thu, 4 Jun 2020 05:24:22 -0400
Subject: [PATCH] Fix bug in 3.8 with .. as

---
 test/bytecode_2.6/04_withas.pyc              | Bin 686 -> 946 bytes
 test/bytecode_2.7/04_withas.pyc              | Bin 584 -> 807 bytes
 test/bytecode_3.0/04_withas.pyc              | Bin 797 -> 1122 bytes
 test/bytecode_3.1/04_withas.pyc              | Bin 797 -> 1120 bytes
 test/bytecode_3.6/04_withas.pyc              | Bin 472 -> 650 bytes
 test/bytecode_3.7/04_withas.pyc              | Bin 476 -> 654 bytes
 test/simple_source/bug35/04_call_function.py |   1 +
 test/simple_source/stmts/04_withas.py        |   8 +++
 uncompyle6/parsers/parse37base.py            |  56 ++++++++++++-------
 uncompyle6/semantics/check_ast.py            |  24 +++++---
 10 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/test/bytecode_2.6/04_withas.pyc b/test/bytecode_2.6/04_withas.pyc
index bfb6e394d8896b96cb8daff3fc82f196b60e4a07..31d0d29c17963064ca692d6af3d4c4c8961cf200 100644
GIT binary patch
delta 303
zcmXYr&q@O^7{upGvu?Lq=s^U*Ki9nrB6v{n<fUkOP&~MlO{{^sm1e!jRuA?K`W}KF
zeG6|shfm;SF)+VOLNfEcC!gub_iw*<@%3|C;(rPEQ!4Be7FYr|G}0P@RjpC59gK4Q
zak!&iOU<WiR6?Cm;fQDe?E&QlZ@@z1c@K@oi^d{BBbfCdjOC#c$Q7$DubDo|JN!KK
ziu5rskIqmqake}bne~W_s8ehM_ik+6Jk)WJ>A0Ghm|-?nRvjE~(iRg}6}5YKEW+$*
kUb;I!bz8g-T>`QzsSIS;Hk;UK`VoUwq0YN8GfT4c59?DdFaQ7m

delta 88
zcmdnQzK+%G;wN6N91Dr4WCkc;1kw&bTr378QWzLo7#N~}3`Q`6ks*bNAy|WXqrD6h
Yub&1JP)QIgh~S-^$n41m;&ZYB0GSI6$p8QV

diff --git a/test/bytecode_2.7/04_withas.pyc b/test/bytecode_2.7/04_withas.pyc
index 61acd311fd610c917bb203871bab95cb5acfb1c8..33c302a28085043c9eedff37b314963077af2e37 100644
GIT binary patch
delta 277
zcmX@XvYgGH`7<w9z^)r{$qZ1y2&5f=xL6)Yq%bhFFfc>`8H`{CBSQ)kn8C!5!psn?
z!Lre88)JPk3s5O56gz|TDglWa28MnyhFTVe8b*d936Kdub{+#mIMC3*2%tH^8q7dt
zewj=_G83d-1Be+kK&&7R5Wxl{O4xx!MrvY8YEf|s$ex_Uy!0SWAOoTr$e7H<q;4$&
zWW=YZ=Eaw!<`%>k=a&{Gr>14*q>2H>i$SI_Fmf`oG4eC|fo%-}SsKIzB6uhNWc1_!
K8O_Pc$qoQ<>nd>o

delta 88
zcmZ3^c7nx>`7<w9j)g>2G6NJa0%->zE*1k4DGUrP3=B~~1|yik$dJOs5Ujzx(S92v
Xub&1JP)QJ&;F^4m$&(Gl<YWZ^Z!rxJ

diff --git a/test/bytecode_3.0/04_withas.pyc b/test/bytecode_3.0/04_withas.pyc
index f0574c2e8233939ab693abbe0073900695dbdd31..09bda8ad78c96b9012747e8f8bc80f4960ab1521 100644
GIT binary patch
delta 319
zcmbQs_J~8?nunJwVAqYfWCkR_2xL0|ak2bFc?q5t28Jjmh7@LoU=5ayRs~F1$t+N{
z>_D0Wh@C-d9e_j)0|QGI14AtfLlz@LGmyc`P$kDu!^%*{%23P3P{YWO&&9x)!U*Ez
zF)}cQrvUY^Fx0Uy1V*GV0WDw#8seA91SB(AfyBfKinbt2N<l8F0F#NOAc2h3#FW&c
z;!==HauV~>!HoE5qgW`zFcz%1a^hVB9TA|K`1I7g_>$Dzg81V6(xT+lw9K4TF`#%c
l$oUM6@{H_^VvK$o%#+tLsYsUM(lPlWlN$%fN={Zzb^xE`JGuY>

delta 76
zcmaFFF_%r=nunJw$3h}1nE?qf0@)5gTr4(GUV=GTgL$KK0TZ*I2Giv0%qpxJAeED=
QnGGg;vIw#<0Xdwk0Li5begFUf

diff --git a/test/bytecode_3.1/04_withas.pyc b/test/bytecode_3.1/04_withas.pyc
index 99ad450342592465bbe1096b95169ad08fe910ce..8259c657c521681b459c2a97d0e83fd8de455f44 100644
GIT binary patch
delta 317
zcmbQs_JBj)pNE$#VAqYfWCkR_2xL0|ak2bFc?q5t28Jjmh7@LoU=5ayRs~EM$t+N{
z>_D0Wh@C-d?SMoL0|QGI14AtfLlz@LGmyc`P$k1q!^%*{%23P3P{YVjq{ooL2x8|k
zFodT7b+9nhu`mQiq%Z-EX9gPKm&pVqGg*Pe#0iSFAS+5i?x_HiiKQTcjMT)G)S}{2
zkUMe`^U}eL_-Lb8D8n!othjRGT>~8vpqlvf)V%nT)ZBvj;{4L0<kYmxoK!KOcrnQF
j42<%OY>c9eej3b^*D|R{mg3Se`681W2gpiJR!(*Rs2Mxx

delta 76
zcmaFBF_%r=pNE$#$3h}1nE?qf0@)5gTr4(GUV=GTgL$KK0TZ*I2GiuL%qpxJAeECV
QnGGhpvk0;=0Xdwk0M0oJiU0rr

diff --git a/test/bytecode_3.6/04_withas.pyc b/test/bytecode_3.6/04_withas.pyc
index 2691fde29766a6b0dc8460a3880a0844f08a1a6d..95117e1579700cb983513224d57378263f16afd7 100644
GIT binary patch
delta 255
zcmcb?+{Nl*%*)Fau<J%#4l@J8V+JI^1Y|n^aj^`LNMT4}Y+;CENMTB02GWcvEGeu&
znkj`Xm_d_$qfHuPYBCE@9SE=jF((i^12I^04MRU)ElUk!5nl>pElW7iut0_&h6tcx
zK+Vj4FF`iF1nDYb1QMF8MLZxj7m$cz&qz&7Ni8alV#!I&OE2P`ypd7ZN+do#H7~v-
zHMbzXIKQ+gIW;XaCshonyqE(>Ffg()vM};776}5`ewxfhV3YZPoFc)=YZ%oyK<?yV
H<zNQ@Y&R{2

delta 91
zcmeBTy}@i_%*)HAzf&n{1``9rV+JGu<TE$`aj^)HNMT4}Y+;CENMTB02GWcvEWr$#
dtQ%d@7`gm3nTl9}N{aX<$1tg}fwXb30syA&4dws<

diff --git a/test/bytecode_3.7/04_withas.pyc b/test/bytecode_3.7/04_withas.pyc
index c7551c4b17a384f5b42f7cbb4121926dd441adee..ee332c8f65182ba9c0e5c115b6bd3cefa940cc4f 100644
GIT binary patch
delta 254
zcmcb^+{eo2#LLUY00aTMZp7s<PvnzOk^%Bk7*ZHp7@`<bm{OR5G-C=&3M-IiN?{9T
z&}84}kj7Y_%mUH|1gt>J3B=AoTny4&!_d!H%TmKw#FxTY%MuPWERZ3HAp&R^P&2dN
zOD3S2mmpn5j6gz@wTK7A2Du`NJtH+SCAFwHiX|s8FTIEtrU<OE2xQ|ek@)n~y!aC1
z)ZBvj;{4L0<kYmxoK!KOR51sTU|?ipWMSlEED{8={WO`2z!vcVIYok#H!!MkfDGYa
H<zNQ@Xx}ZN

delta 75
zcmeBUy~E7s$ji&c00h_Nb)#l5P2`i15&`m37*ZHp7@`<bm{OR5G-C=&FoP!RMvpW`
YE<a7CB37W1BEHE9OloXQKqdz(03^E&C;$Ke

diff --git a/test/simple_source/bug35/04_call_function.py b/test/simple_source/bug35/04_call_function.py
index 7fad3438..cbfc63fb 100644
--- a/test/simple_source/bug35/04_call_function.py
+++ b/test/simple_source/bug35/04_call_function.py
@@ -2,6 +2,7 @@
 # Bug was code not knowing which Python versions
 # have kwargs coming before positional args in code.
 
+"""This program is self-checking!"""
 # RUNNABLE!
 
 def tometadata(self, metadata, schema, Table, args, name=None):
diff --git a/test/simple_source/stmts/04_withas.py b/test/simple_source/stmts/04_withas.py
index a35c0191..b21452db 100644
--- a/test/simple_source/stmts/04_withas.py
+++ b/test/simple_source/stmts/04_withas.py
@@ -16,3 +16,11 @@ def withas_bug(self, nested, a, b):
     with self.assertRaises(ZeroDivisionError):
         with nested(a(), b()) as (x, y):
                 1 // 0
+
+# Adapted from 3.8 distutils/command/config.py
+# In 3.8 the problem was in handling "with .. as" code
+def _gen_temp_sourcefile(x, a, headers, lang):
+    with x as y:
+        if a:
+            y = 2
+    return 5
diff --git a/uncompyle6/parsers/parse37base.py b/uncompyle6/parsers/parse37base.py
index 673d2683..9a5bcf36 100644
--- a/uncompyle6/parsers/parse37base.py
+++ b/uncompyle6/parsers/parse37base.py
@@ -127,6 +127,7 @@ class Python37BaseParser(PythonParser):
                 "RAISE",
                 "SETUP",
                 "UNPACK",
+                "WITH",
             )
         )
 
@@ -993,55 +994,70 @@ class Python37BaseParser(PythonParser):
                 )
                 custom_ops_processed.add(opname)
 
+            elif opname == "WITH_CLEANUP_START":
+                rules_str = """
+                  stmt        ::= with_null
+                  with_null   ::= with_suffix
+                  with_suffix ::= WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
+                """
+                self.addRule(rules_str, nop_func)
             elif opname == "SETUP_WITH":
                 rules_str = """
                   stmt       ::= with
                   stmt       ::= withasstmt
 
-                  with       ::= expr SETUP_WITH POP_TOP suite_stmts_opt COME_FROM_WITH
-                                 WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
+                  with       ::= expr
+                                 SETUP_WITH POP_TOP
+                                 suite_stmts_opt
+                                 COME_FROM_WITH
+                                 with_suffix
                   withasstmt ::= expr SETUP_WITH store suite_stmts_opt COME_FROM_WITH
-                                 WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
+                                 with_suffix
+
+                  with       ::= expr
+                                 SETUP_WITH POP_TOP
+                                 suite_stmts_opt
+                                 POP_BLOCK LOAD_CONST COME_FROM_WITH
+                                 with_suffix
+
+                  withasstmt ::= expr
+                                 SETUP_WITH store suite_stmts_opt
+                                 POP_BLOCK LOAD_CONST COME_FROM_WITH
+                                 with_suffix
 
                   with       ::= expr
                                  SETUP_WITH POP_TOP suite_stmts_opt
                                  POP_BLOCK LOAD_CONST COME_FROM_WITH
-                                 WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
+                                 with_suffix
                   withasstmt ::= expr
                                  SETUP_WITH store suite_stmts_opt
                                  POP_BLOCK LOAD_CONST COME_FROM_WITH
-                                 WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
-
-                  with       ::= expr
-                                 SETUP_WITH POP_TOP suite_stmts_opt
-                                 POP_BLOCK LOAD_CONST COME_FROM_WITH
-                                 WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
-                  withasstmt ::= expr
-                                 SETUP_WITH store suite_stmts_opt
-                                 POP_BLOCK LOAD_CONST COME_FROM_WITH
-                                 WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
+                                 with_suffix
                 """
                 if self.version < 3.8:
                     rules_str += """
                     with     ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK
                                    LOAD_CONST
-                                   WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
+                                   with_suffix
                     """
                 else:
                     rules_str += """
-                      with    ::= expr
+                      with       ::= expr
                                      SETUP_WITH POP_TOP suite_stmts_opt
                                      POP_BLOCK LOAD_CONST COME_FROM_WITH
-                                     WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
+                                     with_suffix
 
                       withasstmt ::= expr
                                      SETUP_WITH store suite_stmts_opt
                                      POP_BLOCK LOAD_CONST COME_FROM_WITH
 
-                       with    ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK
+                      withasstmt ::= expr
+                                     SETUP_WITH store suite_stmts
+                                     POP_BLOCK BEGIN_FINALLY COME_FROM_WITH with_suffix
+
+                      with       ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK
                                      BEGIN_FINALLY COME_FROM_WITH
-                                     WITH_CLEANUP_START WITH_CLEANUP_FINISH
-                                     END_FINALLY
+                                     with_suffix
                     """
                 self.addRule(rules_str, nop_func)
 
diff --git a/uncompyle6/semantics/check_ast.py b/uncompyle6/semantics/check_ast.py
index c2e20bef..3c5f4b78 100644
--- a/uncompyle6/semantics/check_ast.py
+++ b/uncompyle6/semantics/check_ast.py
@@ -8,22 +8,28 @@ FIXME idea: extend parsing system to do same kinds of checks or nonterminal
 before reduction and don't reduce when there is a problem.
 """
 
+
 def checker(ast, in_loop, errors):
     if ast is None:
         return
-    in_loop = (in_loop or (ast.kind in ('while1stmt', 'whileTruestmt',
-                                      'whilestmt', 'whileelsestmt', 'while1elsestmt',
-                                      'for_block'))
-               or ast.kind.startswith('async_for'))
-    if ast.kind in ('aug_assign1', 'aug_assign2') and ast[0][0] == 'and':
+    in_loop = (
+        in_loop
+        or ast.kind.startswith("while")
+        or ast.kind.startswith("async_for")
+    )
+    if ast.kind in ("aug_assign1", "aug_assign2") and ast[0][0] == "and":
         text = str(ast)
-        error_text = '\n# improper augmented assigment (e.g. +=, *=, ...):\n#\t' + '\n# '.join(text.split("\n")) + '\n'
+        error_text = (
+            "\n# improper augmented assigment (e.g. +=, *=, ...):\n#\t"
+            + "\n# ".join(text.split("\n"))
+            + "\n"
+        )
         errors.append(error_text)
 
     for node in ast:
-        if not in_loop and node.kind in ('continue', 'break'):
+        if not in_loop and node.kind in ("continue", "break"):
             text = str(node)
-            error_text = '\n# not in loop:\n#\t' + '\n# '.join(text.split("\n"))
+            error_text = "\n# not in loop:\n#\t" + "\n# ".join(text.split("\n"))
             errors.append(error_text)
-        if hasattr(node, '__repr1__'):
+        if hasattr(node, "__repr1__"):
             checker(node, in_loop, errors)