From 0a5fcc51d8d028c62cbf3fe199b4d277a60b19dd Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Tue, 29 Oct 2019 11:43:09 -0400
Subject: [PATCH] Pypy 3.6 fixes and tests

---
 test/Makefile                             |   2 +-
 test/bytecode_3.2/11_classbug.pyc         | Bin 658 -> 658 bytes
 test/bytecode_3.7/04_class_kwargs.pyc     | Bin 1747 -> 1747 bytes
 test/bytecode_pypy3.6/04_class_kwargs.pyc | Bin 0 -> 2388 bytes
 uncompyle6/semantics/fragments.py         |  87 ++++++++++++++++++----
 uncompyle6/semantics/pysource.py          |   4 +-
 6 files changed, 73 insertions(+), 20 deletions(-)
 create mode 100644 test/bytecode_pypy3.6/04_class_kwargs.pyc

diff --git a/test/Makefile b/test/Makefile
index c8024f7f..155a28bb 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -100,7 +100,7 @@ check-bytecode-3:
 	--bytecode-3.1 --bytecode-3.2 --bytecode-3.3 \
 	--bytecode-3.4 --bytecode-3.5 --bytecode-3.6 \
         --bytecode-3.7 --bytecode-3.8 \
-	--bytecode-pypy3.2
+	--bytecode-pypy3.2 --bytecode-pypy3.6
 
 #: Check deparsing on selected bytecode 3.x
 check-bytecode-3-short:
diff --git a/test/bytecode_3.2/11_classbug.pyc b/test/bytecode_3.2/11_classbug.pyc
index 239bf2fc8d45a3aecabf1b85aab85e00ae647f47..342ee09b3d56c8bbd379bac16d7e803753883c16 100644
GIT binary patch
delta 16
XcmbQlI*FA%hliJ|Yk|>5_HHHsBwhq&

delta 16
XcmbQlI*FA%hliKzshZ(N_HHHsBl-kJ

diff --git a/test/bytecode_3.7/04_class_kwargs.pyc b/test/bytecode_3.7/04_class_kwargs.pyc
index 1c095ac61c3515858027ba261cd124bd9c551a77..3cbcb72ead0f0c34f8ac57dc48fc900bef34365d 100644
GIT binary patch
delta 20
acmcc2dzqKpiI<m)0SIP%-oBCh1RDT3hXwus

delta 20
acmcc2dzqKpk(ZZ?0SF4xwr%7-!3F>|4FyL4

diff --git a/test/bytecode_pypy3.6/04_class_kwargs.pyc b/test/bytecode_pypy3.6/04_class_kwargs.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0a42c9e930ec2639ff6c70f84b5cc4fc51915852
GIT binary patch
literal 2388
zcmcIl%}>-o6rX9kP!{kzek6Xxi>4eF644VO>Y5N^+yjtcnwX~B8J0qK3p1^Nk<*e8
zZyY>$^uO?L(0|A7-S=L%i@2axu}Np9otZbk_j~XC<`bK&e*E^?ePu8fupb@^#*g9E
zHE0AAJYsI%bC)kLVF+`d2~+ZQqiedRuta5_xt8Ed%ozz`4{HP*J9w}M`}F85&`IWU
z!CfP_0=pUPvKrYnm|K=QdGfTr5+-ZUJ7KbvHiO95dSJ|iHRJHs;nlOy02nR|1k*M4
z5E?-dBky>^*0~rJwipvtF)k(!&91d)&|#Cu(V<a%^i60AbO&q|41=GxYaTEQyd#vo
zMObqR%31>Gz3o_SXm1-l@Ir9G(|sRmb5R`lk)E$D%0Py1q^_fDFSdQvI&u)1!WW&?
z=b%Ygmwn-1fkuMP8;+4xa5CMLD!T|H@Ax^M2P@E}Akx_g^c!@7!?Q73OoYNBmfnMJ
z9kw?k>FGFCft+rptp|^$XJ);8QNFXbxvS8gjms&LyeD9M_AJzfU8!Vvtmk$7w)DKL
zN+0c5qyXB>Cg^i3^`m^AaAuSAH%}ZHMc^y%<s0(|pz{t_$V~|jvdggkgwTz`Z=%KK
z|0y{XIy5K&tf!*3G!jr`EaivM=q<p%vx$vzOoj9-%p8Rjp2TD+646|rL^4<~cZQ%9
z7Da{>?S$CUa5u!vrQzEUv$<a+elwtA0nu^H40TV-Xq6ZzJCG@*{JRAfeklW(bsEoM
z{G8c)2>oBh%CUZmjJg4){xv)bagn+pTQ;ZfLFVB<gpc&;8EAH<P-I*D8GC*EJxDQW
zCd#ob;7))!<B+2)Z&g=v^{SjAyw|~4k;WhT*GrcVu7=(e%oD4AQzyy~lD16NVgbUJ
z$d>YxFzy`5YkdH?D3v+_M$QWf#q!59%SIPHUyb7nXs@q?ctid<v>NOl4jm@VaOijs
z>%Q<fSqnR@a=D1^*Uv*!6j?bM)m_+1mj<xylbnJcT*aSwF%`h_P-G~BP(&|bsbdhi
zv>%mr*pD)@dj|~vhG67LV`eg5WfoWWVdPYDs3<ro+{0*s?viB~)O{@}xAUcC^B_f|
RbNMYaPt|~j+uY`t?C*(GfH(jE

literal 0
HcmV?d00001

diff --git a/uncompyle6/semantics/fragments.py b/uncompyle6/semantics/fragments.py
index a297a15c..0a56b850 100644
--- a/uncompyle6/semantics/fragments.py
+++ b/uncompyle6/semantics/fragments.py
@@ -1453,25 +1453,80 @@ class FragmentsWalker(pysource.SourceWalker, object):
         # as a custom rule
         start = len(self.f.getvalue())
         n = len(node) - 1
-        assert node[n].kind.startswith("CALL_FUNCTION")
 
-        for i in range(n - 2, 0, -1):
-            if not node[i].kind in ["expr", "LOAD_CLASSNAME"]:
-                break
-            pass
+        if node.kind != "expr":
+            if node == "kwarg":
+                self.template_engine(("(%[0]{attr}=%c)", 1), node)
+                return
 
-        if i == n - 2:
-            return
-        self.write("(")
-        line_separator = ", "
-        sep = ""
-        i += 1
-        while i < n:
-            value = self.traverse(node[i])
-            self.node_append(sep, value, node[i])
+            kwargs = None
+            assert node[n].kind.startswith("CALL_FUNCTION")
+
+            if node[n].kind.startswith("CALL_FUNCTION_KW"):
+                if self.is_pypy:
+                    # FIXME: this doesn't handle positional and keyword args
+                    # properly. Need to do something more like that below
+                    # in the non-PYPY 3.6 case.
+                    self.template_engine(('(%[0]{attr}=%c)', 1), node[n-1])
+                    return
+                else:
+                    kwargs = node[n - 1].attr
+
+                assert isinstance(kwargs, tuple)
+                i = n - (len(kwargs) + 1)
+                j = 1 + n - node[n].attr
+            else:
+                i = start = n - 2
+                for i in range(start, 0, -1):
+                    if not node[i].kind in ["expr", "call", "LOAD_CLASSNAME"]:
+                        break
+                    pass
+
+                if i == start:
+                    return
+                i += 2
+
+            for i in range(n - 2, 0, -1):
+                if not node[i].kind in ["expr", "LOAD_CLASSNAME"]:
+                    break
+                pass
+
+            line_separator = ", "
+            sep = ""
             i += 1
-            self.write(sep, value)
-            sep = line_separator
+            self.write("(")
+            if kwargs:
+                # 3.6+ does this
+                while j < i:
+                    self.write(sep)
+                    value = self.traverse(node[j])
+                    self.write("%s" % value)
+                    sep = line_separator
+                    j += 1
+
+                j = 0
+                while i < l:
+                    self.write(sep)
+                    value = self.traverse(node[i])
+                    self.write("%s=%s" % (kwargs[j], value))
+                    sep = line_separator
+                    j += 1
+                    i += 1
+            else:
+                while i < l:
+                    value = self.traverse(node[i])
+                    i += 1
+                    self.write(sep, value)
+                    sep = line_separator
+                    pass
+            pass
+        else:
+            if self.version >= 3.6 and node[0] == "LOAD_CONST":
+                return
+            value = self.traverse(node[0])
+            self.write("(")
+            self.write(value)
+            pass
 
         self.write(")")
         self.set_pos_info(node, start, len(self.f.getvalue()))
diff --git a/uncompyle6/semantics/pysource.py b/uncompyle6/semantics/pysource.py
index 19e4f37c..4bc8ba8a 100644
--- a/uncompyle6/semantics/pysource.py
+++ b/uncompyle6/semantics/pysource.py
@@ -1566,8 +1566,6 @@ class SourceWalker(GenericASTTraversal, object):
             assert node[n].kind.startswith("CALL_FUNCTION")
 
             if node[n].kind.startswith("CALL_FUNCTION_KW"):
-                # 3.6+ starts doing this
-                kwargs = node[n - 1].attr
                 if self.is_pypy:
                     # FIXME: this doesn't handle positional and keyword args
                     # properly. Need to do something more like that below
@@ -1575,7 +1573,7 @@ class SourceWalker(GenericASTTraversal, object):
                     self.template_engine(('(%[0]{attr}=%c)', 1), node[n-1])
                     return
                 else:
-                    kwargs = node[n-1].attr
+                    kwargs = node[n - 1].attr
 
                 assert isinstance(kwargs, tuple)
                 i = n - (len(kwargs) + 1)