From 5c2d0484e53e5e93bc6100c98dfa0b540e526ead Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Mon, 26 Feb 2018 09:06:02 -0500
Subject: [PATCH] 3.6 MAKE_FUNCTION workarounds

Still wrong, but points to diretions for improvements
---
 test/bytecode_3.6/05_call_star_kw.pyc       | Bin 0 -> 286 bytes
 test/simple_source/bug36/05_call_star_kw.py |   3 ++
 uncompyle6/main.py                          |   1 +
 uncompyle6/semantics/make_function.py       |  52 ++++++++++++++------
 4 files changed, 41 insertions(+), 15 deletions(-)
 create mode 100644 test/bytecode_3.6/05_call_star_kw.pyc
 create mode 100644 test/simple_source/bug36/05_call_star_kw.py

diff --git a/test/bytecode_3.6/05_call_star_kw.pyc b/test/bytecode_3.6/05_call_star_kw.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..fcc233f48075a797cd69ca4cc7cebec37ddeb983
GIT binary patch
literal 286
zcmXr!<>lHTG9_vX0|UcjAcg}LAj<)Wi^YIM3J5Z$FwJ33VNPLbVTxi%VGU-`WOFNK
z1<ERLa`AF&GT-7#%g;$EE=WvHExyH?n3A8AdW$<VJukl~H8~@(s5qGssFoRsK}Lhv
z&OlrY;-oMD4P*3M$)L${i!rGPBv-@)B0#E(Kq|n*FSX*#+=86c_~QK1qU2Qlq|$U_
zGkpWo_~gW#ocQ9B#G?4@a=n7eTbzj&rYWh(`6;O&Q;I<Z17i_8ko41p&<H~zEH<Fr
SEe@O9{FKt1R6DRPkR|}eb~*b1

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug36/05_call_star_kw.py b/test/simple_source/bug36/05_call_star_kw.py
new file mode 100644
index 00000000..51b2027b
--- /dev/null
+++ b/test/simple_source/bug36/05_call_star_kw.py
@@ -0,0 +1,3 @@
+# From 3.6 base64.py. Bug was handling *, and keyword args
+def a85decode(b, *, foldspaces=False, adobe=False, ignorechars=b' \t\n\r\v'):
+    return
diff --git a/uncompyle6/main.py b/uncompyle6/main.py
index 8b4b8f34..3e25a14f 100644
--- a/uncompyle6/main.py
+++ b/uncompyle6/main.py
@@ -217,6 +217,7 @@ def main(in_base, out_base, files, codes, outfile=None,
             sys.stdout.write("\n")
             sys.stderr.write("\n# file %s\n# %s\n" % (infile, e))
             failed_files += 1
+            tot_files += 1
         except KeyboardInterrupt:
             if outfile:
                 outstream.close()
diff --git a/uncompyle6/semantics/make_function.py b/uncompyle6/semantics/make_function.py
index 76e2cc18..c97b885e 100644
--- a/uncompyle6/semantics/make_function.py
+++ b/uncompyle6/semantics/make_function.py
@@ -619,22 +619,44 @@ def make_function3(self, node, is_lambda, nested=1, codeNode=None):
                     ends_in_comma = False
                 break
         elif self.version >= 3.6:
-            d = node[1]
-            if d == 'expr':
-                d = d[0]
-            assert d == 'dict'
-            defaults = [self.traverse(n, indent='') for n in d[:-2]]
-            names = eval(self.traverse(d[-2]))
-            assert len(defaults) == len(names)
-            sep = ''
-            # FIXME: possibly handle line breaks
-            for i, n in enumerate(names):
-                self.write(sep)
-                self.write("%s=%s" % (n, defaults[i]))
-                sep = ', '
-                ends_in_comma = True
+            # argc = node[-1].attr
+            # co = node[-3].attr
+            # argcount = co.co_argcount
+            # kwonlyargcount = co.co_kwonlyargcount
+
+            free_tup = annotate_dict = kw_dict = default_tup = None
+            index = 0
+            # FIXME: this is woefully wrong
+            if argc & 8:
+                free_tup = node[index]
+                index += 1
+            if argc & 4:
+                kw_dict = node[1]
+                index += 1
+            if argc & 2:
+                kw_dict = node[index]
+                index += 1
+            if argc & 1:
+                kw_dict = node[index]
+
+            if kw_dict == 'expr':
+                kw_dict = kw_dict[0]
+
+            # FIXME: handle free_tup, annotatate_dict, and default_tup
+            if kw_dict:
+                assert kw_dict == 'dict'
+                defaults = [self.traverse(n, indent='') for n in kw_dict[:-2]]
+                names = eval(self.traverse(kw_dict[-2]))
+                assert len(defaults) == len(names)
+                sep = ''
+                # FIXME: possibly handle line breaks
+                for i, n in enumerate(names):
+                    self.write(sep)
+                    self.write("%s=%s" % (n, defaults[i]))
+                    sep = ', '
+                    ends_in_comma = True
+                    pass
                 pass
-            pass
         pass
 
     if code_has_star_star_arg(code):