From a6fbe4c6366a914478c0d1a40f576040d21c236e Mon Sep 17 00:00:00 2001
From: rocky <rocky@gnu.org>
Date: Mon, 20 Jun 2016 20:19:17 -0400
Subject: [PATCH] previous 2.7 class decorator bug fixed in 3.x

---
 test/bytecode_3.4/10_classdec.pyc | Bin 0 -> 854 bytes
 uncompyle6/parsers/parse3.py      |  14 +++++++++-----
 uncompyle6/scanners/scanner3.py   |   4 +++-
 3 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 test/bytecode_3.4/10_classdec.pyc

diff --git a/test/bytecode_3.4/10_classdec.pyc b/test/bytecode_3.4/10_classdec.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f249d0cc925666de7ec8ce183c74effbd04bc34f
GIT binary patch
literal 854
zcmZuv!EV$r5FN+a?Y4DAB}6Y=xaP723BjeRD)mr=)V=h8$i)h_R|F-S5+@R^+SBqg
z{F1M5<^wqK#@V)8Sj#h+%#7cR-}txM+xhkO&4(@_`bleR4EqG)-$Pk!LEnjTA_qGm
zD`}ZTJEf(dGdm(X<_u^jXo)bipd3jFEpbwk-J*+ZVt^MHDiX^X#P36)1dxGoE9gcb
zSI&%ppBH~wE+9UIx`CaE*$>J@kf!o2N2B`l!k6`B<+N}5*0@9K=7+CdYEu>7TW6-1
zS7Ep4yU$Il=l#McM&v$7Tt6TD)1#^}MdgpDYk3hnOLDdHEsEOtmRor!-Aeq1@sP0#
zJGM$fCG7}*d2;S@`L3*U`LXHmi9m!H=LF(kLxJKPT=0PhQb3?fd4qbJGEFOn!TbnZ
zjKkLX)hS={KhjPam@5F1NgJ*rLh4;L|F`>z*5#t?w0_E`R>bVDpr?1iN6j<!8*8j#
z$MHxchCSaEU1@afFavvVUqxO&yQ}gjV}`4tDdt=2u%mU|*dF86L23Q9FRCHZP8eJb
zM+fY78?H?~wEVjH$$2)ER8orQn`LR7R2Vm(zBtoGXAs{ufrQD?(8+O}G?!N+B@V=s
F?Y}opqM!f(

literal 0
HcmV?d00001

diff --git a/uncompyle6/parsers/parse3.py b/uncompyle6/parsers/parse3.py
index e170f3bb..2570a89e 100644
--- a/uncompyle6/parsers/parse3.py
+++ b/uncompyle6/parsers/parse3.py
@@ -184,7 +184,6 @@ class Python3Parser(PythonParser):
         classdefdeco ::= classdefdeco1 designator
         classdefdeco1 ::= expr classdefdeco1 CALL_FUNCTION_1
         classdefdeco1 ::= expr classdefdeco2 CALL_FUNCTION_1
-        classdefdeco2 ::= LOAD_BUILD_CLASS mkfunc LOAD_CONST CALL_FUNCTION_2
 
         assert ::= assert_expr jmp_true LOAD_ASSERT RAISE_VARARGS_1
         assert2 ::= assert_expr jmp_true LOAD_ASSERT expr CALL_FUNCTION_1 RAISE_VARARGS_1
@@ -358,13 +357,13 @@ class Python3Parser(PythonParser):
         '''
         # Should the first rule be somehow folded into the 2nd one?
         build_class ::= LOAD_BUILD_CLASS mkfunc
-                        LOAD_CLASSNAME {expr}^n CALL_FUNCTION_n+2
+                        LOAD_CLASSNAME {expr}^n-1 CALL_FUNCTION_n
                         LOAD_CONST CALL_FUNCTION_n
         build_class ::= LOAD_BUILD_CLASS mkfunc
                         expr
                         call_function
                         CALL_FUNCTION_3
-        '''
+         '''
         # FIXME: I bet this can be simplified
         # look for next MAKE_FUNCTION
         for i in range(i+1, len(tokens)):
@@ -401,7 +400,9 @@ class Python3Parser(PythonParser):
         call_function ::= expr {expr}^n CALL_FUNCTION_VAR_n POP_TOP
         call_function ::= expr {expr}^n CALL_FUNCTION_VAR_KW_n POP_TOP
         call_function ::= expr {expr}^n CALL_FUNCTION_KW_n POP_TOP
-        """
+
+        classdefdeco2 ::= LOAD_BUILD_CLASS mkfunc {expr}^n-1 CALL_FUNCTION_n
+       """
         # Low byte indicates number of positional paramters,
         # high byte number of positional parameters
         args_pos = token.attr & 0xff
@@ -413,6 +414,9 @@ class Python3Parser(PythonParser):
                 + ('kwarg ' * args_kw)
                 + 'expr ' * nak + token.type)
         self.add_unique_rule(rule, token.type, args_pos, customize)
+        rule = ('classdefdeco2 ::= LOAD_BUILD_CLASS mkfunc %s%s_%d'
+                %  (('expr ' * (args_pos-1)), opname, args_pos))
+        self.add_unique_rule(rule, token.type, args_pos, customize)
 
     def add_custom_rules(self, tokens, customize):
         """
@@ -553,7 +557,7 @@ class Python3Parser(PythonParser):
                                      'expr GET_ITER CALL_FUNCTION_1' %
                                      ('pos_arg ' * args_pos, opname),
                                      opname, token.attr, customize)
-                if self.version >= 3.4:
+                if self.version >= 3.3:
                     rule1 = ('listcomp ::= %sload_closure LOAD_LISTCOMP LOAD_CONST %s expr '
                             'GET_ITER CALL_FUNCTION_1' % ('expr ' * args_pos, opname))
                     rule2 = ('setcomp ::= %sload_closure LOAD_SETCOMP LOAD_CONST %s expr '
diff --git a/uncompyle6/scanners/scanner3.py b/uncompyle6/scanners/scanner3.py
index 9fa9c391..fde4b238 100644
--- a/uncompyle6/scanners/scanner3.py
+++ b/uncompyle6/scanners/scanner3.py
@@ -34,6 +34,7 @@ import xdis.opcodes.opcode_33 as op3
 
 globals().update(op3.opmap)
 
+# POP_JUMP_IF is used by verify
 POP_JUMP_TF = (POP_JUMP_IF_TRUE, POP_JUMP_IF_FALSE)
 
 import uncompyle6.scanner as scan
@@ -56,7 +57,8 @@ class Scanner3(scan.Scanner):
         """
 
         show_asm = self.show_asm if not show_asm else show_asm
-        if self.show_asm in ('both', 'before'):
+        # show_asm = 'both'
+        if show_asm in ('both', 'before'):
             bytecode = Bytecode(co, self.opc)
             for instr in bytecode.get_instructions(co):
                 print(instr._disassemble())