From b5cd160ebbc19ca7de5d0626323a27ec046d77bf Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Tue, 28 Nov 2017 09:17:27 -0500
Subject: [PATCH] Python 2.4 grammar reduction...

while increasing 2.4 increase test coverage
---
 test/bytecode_2.4/01_augmented_assign.pyc | Bin 0 -> 1311 bytes
 test/bytecode_2.4/03_if1.pyc              | Bin 0 -> 366 bytes
 test/bytecode_2.6/10_del.pyc              | Bin 501 -> 497 bytes
 uncompyle6/parsers/parse24.py             |  13 +++++++------
 4 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 test/bytecode_2.4/01_augmented_assign.pyc
 create mode 100644 test/bytecode_2.4/03_if1.pyc

diff --git a/test/bytecode_2.4/01_augmented_assign.pyc b/test/bytecode_2.4/01_augmented_assign.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a4a300519592217a38d456dbd3822935851d00df
GIT binary patch
literal 1311
zcmZuwO>fgc5S_K1G;zL4ix80zY)^z%P2g0DidqDmKoxS4Dk34v^==%u@dxV-Z8%c?
z6n}%C!i^g<Yd0wpiS~Ks&D+_T@jCh4aew}LFb<*m)$w_RtN6nJ1i%<TG7t=|8GJ{>
zg0Tg{hOrIO0%^k@`la=JY3)~*1r;Y85H+|<TFijk(TgyN0}>+^gckIX+P4o-SyFve
z5qI#fyHX<WJQQ_^80=XCQrVP;SCqY7Zba(Q4fUj?#2SP)Y*lP+hu8*)CPWstV+z8K
z{2KM;#5F2#&q5cU$iz1I^~!MKdKJYwa99pp%|WhFdpNH*pCbqwCeVbdceevCVeFbf
z3$C_q2R32c2HAqR1Hz>w?2BTjvPlHehWLbpV~A!+9I;cZ&B3!AOp6Ib3w~fZT~o3H
zx&eLZ;%dVI3Q>pqWf!ht$(y-ipZEsaa5Cu773kp=aGyT&gL#z5R7>FpMG;5oFkkQ_
z6Y(ULf=^VIxb9N&YN^=W<wZ7Eq2yW?n&*MmQl)&7DZW(mGGXDmAE$9~qem+bl;+ul
z>#5{IhFOv?W>unM9&0&t-4%`cfPYx%X_oS{g_gTvCT_OHGpXDYDfv|E{KaT=d3iYu
zRq$<rq9mtiF+^*$%r>G5U8-_2S9rYQaf)6N=r~K=qK|_ywdN{|RFLp6NFQr{Cb^oY
zF%Ar3i(rkwCTJ2k1lt5V1h`=N$&vmwuA+;e@vFlN9T@9mK(S+!c0jqcIbeVmtUy!V
zB2My|^vj8l3Z3X;^#509a!d|s4}I)_SIlL{gC3fis`h=6g}$%bXnXTi$BBHaRHn?n
zz~Gs|nXaMaYcQKjO`W1;7!{<E^pF5e<<HKI`n+^5jB}ys=pfH!Dm)Sm8VDZc^C)6C
z&s5MNm+JE9PI@$>RqNhzD2Jpg-XqklwpC|!Y^wZstsYxv8|=Q*bvA38&OK}0YO)?{
VvklaBfV3;T!|-o)S+ll*{9mJ#`D_3H

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.4/03_if1.pyc b/test/bytecode_2.4/03_if1.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..efdacb740ec4f0d36ef3a92c5412aff100d26886
GIT binary patch
literal 366
zcmZutJqyA>49&GFDu{!dAUJliT7Q6w;2`4Ay6950A9B*G#kQckzt~@3URxc+gO^M0
zB`?XTSEs%14fh^ZNANvoq<uENpeNCR9j$N##e#&dlVjAFmPqzAHUNSpBL&5kj)B*$
ztg|&3RKywBG>F2i$<8HL$xf=E<dKvOz)O`xftz0Qn-`d;{A^j~c<Rb<GD;p<w<_Em
zV}B7#wUT!oMQBID!yF&{o2S8i*$-JZqYB~K5c!UV4oI)0x5WlFn%P+6H{_>Ms#Jme
L40^?nkZ9>|t2r*`

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.6/10_del.pyc b/test/bytecode_2.6/10_del.pyc
index 1be079465276ce02c8b98c8506e7d49f4944169b..dbdfbb1ce9fe9e2c946425510f03c2e21b032e7b 100644
GIT binary patch
delta 38
ocmey${E?ac;wN6NotI=bvI{V>$TBc6OqONrgfZkMpJLPo0O@`T5&!@I

delta 42
qcmey!{FRyg;wN4%!SCD~*##Kc<QW(k^z<i7Gj<}Fa+8lSY6AfM*a|oR

diff --git a/uncompyle6/parsers/parse24.py b/uncompyle6/parsers/parse24.py
index 0eb121a8..4d9e836a 100644
--- a/uncompyle6/parsers/parse24.py
+++ b/uncompyle6/parsers/parse24.py
@@ -49,16 +49,17 @@ class Python24Parser(Python25Parser):
         # Python 2.6, 2.7 and 3.3+ use kv3
         # Python 2.3- use kv
         kvlist ::= kvlist kv2
-        kv2 ::= DUP_TOP expr expr ROT_THREE STORE_SUBSCR
+        kv2    ::= DUP_TOP expr expr ROT_THREE STORE_SUBSCR
         '''
 
     def add_custom_rules(self, tokens, customize):
         self.remove_rules("""
-        kvlist ::= kvlist kv3
-        while1stmt ::= SETUP_LOOP l_stmts JUMP_BACK COME_FROM
-        while1stmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK COME_FROM
-        while1stmt ::= SETUP_LOOP return_stmts COME_FROM
-        whilestmt  ::= SETUP_LOOP testexpr return_stmts POP_BLOCK COME_FROM
+        gen_comp_body ::= expr YIELD_VALUE POP_TOP
+        kvlist        ::= kvlist kv3
+        while1stmt    ::= SETUP_LOOP l_stmts JUMP_BACK COME_FROM
+        while1stmt    ::= SETUP_LOOP l_stmts_opt JUMP_BACK COME_FROM
+        while1stmt    ::= SETUP_LOOP return_stmts COME_FROM
+        whilestmt     ::= SETUP_LOOP testexpr return_stmts POP_BLOCK COME_FROM
         """)
         super(Python24Parser, self).add_custom_rules(tokens, customize)
         if self.version == 2.4: