From acb4ffb7582e4726cae2d3bf185fb56bf6dcb34f Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Wed, 29 Nov 2017 16:39:32 -0500
Subject: [PATCH] Better grammar coverage; reduce 3.x mklambda rules

---
 test/bytecode_2.1/00_import.pyc       | Bin 355 -> 463 bytes
 test/bytecode_2.2/00_import.pyc       | Bin 355 -> 463 bytes
 test/bytecode_2.3/00_import.pyc       | Bin 347 -> 449 bytes
 test/bytecode_2.4/00_import.pyc       | Bin 322 -> 423 bytes
 test/bytecode_2.5/00_import.pyc       | Bin 323 -> 422 bytes
 test/bytecode_2.6/00_import.pyc       | Bin 323 -> 422 bytes
 test/bytecode_2.7/00_import.pyc       | Bin 323 -> 420 bytes
 test/bytecode_3.3/00_import.pyc       | Bin 335 -> 427 bytes
 test/bytecode_3.4/00_import.pyc       | Bin 280 -> 354 bytes
 test/bytecode_3.5/00_import.pyc       | Bin 280 -> 351 bytes
 test/bytecode_3.5/01_ops.pyc          | Bin 0 -> 337 bytes
 test/bytecode_3.6/00_import.pyc       | Bin 257 -> 316 bytes
 test/simple_source/bug30/01_ops.py    |   3 +++
 test/simple_source/stmts/00_import.py |   5 +++-
 uncompyle6/parsers/parse3.py          |  37 ++++++++++++++++----------
 15 files changed, 30 insertions(+), 15 deletions(-)
 create mode 100644 test/bytecode_3.5/01_ops.pyc

diff --git a/test/bytecode_2.1/00_import.pyc b/test/bytecode_2.1/00_import.pyc
index fed3667a7bdd6f497927ecbaa362ef60eec1ef0c..f3f3da8218fce95c07d8189c19fda777928d43bc 100644
GIT binary patch
delta 241
zcmXAhy$%6U5QWd|`dvRO5jvr>Q3#$yqSGvPuehuwncFC23ypT;!8G1L=_QP7k~#Cu
zoSAt$Pq#h#G`!cazl<Q^Nb)sr&u3W~stV=dMu=VP9h|zLtcn;o)S&Co4J?~T2_&OM
zP{?(!tbb1eKfkXsb_Elaaz$zwZgrx<kc-l+$D47)B($;m=Qt?Iggud+G3O}JDm8ZB
s=%bo)L5%a-?CjqYPwi=JJHBurF0AlCi1lMa!&Y6;rxtnCA)mU=7n$fRdjJ3c

delta 133
zcmX@l{Fq5t>oqTz@^rbVWCkE$0^;JpiNXP@DGUt38q7ehp9UjHkOfE-B$i}AcpxDy
z4bF)>6ZAD$LDC?V`Nf9CAWlhUZmMB17m$@vQc{qdlbM=V0@pvep3#Aa11QJOD8R_Y
HD9Q)`xHK71

diff --git a/test/bytecode_2.2/00_import.pyc b/test/bytecode_2.2/00_import.pyc
index 3d9fbd01c00f0372ae716e87f23368167bd411ae..96dce7df976bb002aeb6365faa39049ef34c446a 100644
GIT binary patch
delta 199
zcmaFNbe>sQ_bo5i6?OTjWCkE$0^;J@iNXO!_3R9(oD8X449$!TDa;I6Obq#A42<=h
z3@Ho@+1w17JPet<3{iXxd5jE<K%rm_mWi3N?3o}#H25cWB!m_-1DQFgdBq$+IzB!v
zGbc4ZzL*urNz_ZyOD<*vvXa0ggq@<n1{4A7Dy}RBOQe8#`Nf9CEI_G(#FC83Y>a^d
TJU|XVqW~ipqbMUkqZkta7<nUu

delta 116
zcmX@l{Fq5t_bo4%@^rbVWCkE$0^;JpiNXP@DGUt38q7ehp9UjHkOfE-B$i}AcpxDy
q4bF)>6XY~lLDC?V#g)ZyWnh8)V#CRKjDb8HKuLZ^0Y)xHQAPmxmlOp6

diff --git a/test/bytecode_2.3/00_import.pyc b/test/bytecode_2.3/00_import.pyc
index e2755523945a35842a774f9222ed630b195595d1..5701ad7b80dd1498d014d8d6168cda52d4499ea9 100644
GIT binary patch
delta 211
zcmcc3bdXuv`V%kL6?OTjWCkc;0@4mZT%0;l+D<2xlOdIhp_!2(g_$9Xi6LK@fiZ=F
zA)A{alZPRbmm!LeA&(I(6s*BAF<zEE6J&}8|HQh4_+n-tGbc5#m;*@1$ERiHq{hb=
zvjRDZdP#c8#f(5!5}1UrQ#9CsB4B|Ou-^P)L$LCa%-mE%ut;%baWM-}Q9)u!#$+}|
VPXQhvhm(<)k)2V9k%v*32>|k9B)|Xw

delta 134
zcmX@ee49zy`V%jg@^rbVWCkc;0@4mZTx>s4+D<ivfgxCf8OZh1U<3)W0EvRck_-qB
zB&4OmIdNrzh6XE08l<wgvKX!mERbJpSPYUa$;?ePoSebv$-@EUaWe8UvNH-X0st2F
B7GnSa

diff --git a/test/bytecode_2.4/00_import.pyc b/test/bytecode_2.4/00_import.pyc
index b711ca9f9880a6fe86db25f6323e5801973dd4d7..e8693994f02fcd4d4caef5f6e94bbe274b98ca37 100644
GIT binary patch
delta 191
zcmX@aw47Nw_Y*JI6?OTjWCkc;0@4mZT%0;l+D<2xlOdIhp_!2(g_$9Xi6LK@fiZ=F
zA)A{alZPRbmm!LeA&(I(6s*BAF<zEE6J&}8|HQfkpAu#uGbc5#gab&&$ERiHq{hdW
zumU-WdP#c8C5%8;5}1UrQ#9CsB0>Bh0?Yy_4FahOVxIWLNq`5);$-AyWM>p&<Y5$M
F0szCn9-IIG

delta 116
zcmZ3^e27Up_Y*Id@^rbVWCkc;0@4mZTx>s4+D<ivfgxCf8OZh1U<3)W0EvRck_<4f
s1SF)T!8vhdf|v#?kR1dP2m&b&VgnJZlS3JucsPJePDWlvc19sa06uOHv;Y7A

diff --git a/test/bytecode_2.5/00_import.pyc b/test/bytecode_2.5/00_import.pyc
index 64e32f512584e148048d6c8c11a3448f960815f0..fc0377f460343b49044e0b49d2963eb8c57e4ee9 100644
GIT binary patch
delta 167
zcmX@iw2WDL^Cw=eE9&x5$qZ1y0i+#(xVUPfbbx*;CqpV1Lo*{o3JXIP6GOfj17ivU
zLkc59Ha9~i4?`v|LlhrF9wShcks(-vbz-3sdnU*r4gQH!V+>1}fy|uLyb_S1@$qSy
tIjQmSC9FVBqF$0-atR}ll>{as?39Tg-2`}mf;@}@j9iQojQotkOaM?M9k~Di

delta 68
zcmZ3+e3(gk^Cw;|<>_)!$qZ1y4x}A`xHxd4bO2ilBSWwT%fwkqOd6aM564UnV07c*
P0Lt<(3NUgpN-zQd?eq+M

diff --git a/test/bytecode_2.6/00_import.pyc b/test/bytecode_2.6/00_import.pyc
index ec02a67b017eed9319f5fa1d2b1bca7e65492195..5425f49f0edcf8d1d545fd938614eba89b8aa68b 100644
GIT binary patch
delta 167
zcmX@iw2WE$;wN6NE9&x5$qZ1y0i+#(xVUPfbbx*;CqpV1Lo*{o3JXIP6GOfj17ivU
zLkc59Ha9~i4?`v|LlhrF9wShcks(-vbz-3sdnU*r4gQH!V+>1}fy|uLyb_S1@$qSy
tIjQmSC9FVBqF$0-atR}ll>{as?39Tg-2`}mf;@}@j9iQojQotkOaNmb9oGN=

delta 68
zcmZ3+e3(i4;wN4%<>_)!$qZ1y4x}A`xHxd4bO2ilBSWwT%fwkqOd6aM564UnV07c*
P0Lt<(3NUgpN-zQd^;Qg;

diff --git a/test/bytecode_2.7/00_import.pyc b/test/bytecode_2.7/00_import.pyc
index 38f74f6b46c66d0bdadb425495241a084fbd899e..62d8bd7701bf8e10da0197419745fe7240309cbc 100644
GIT binary patch
delta 165
zcmX@iw1ioj`7<xq6?OTjWCkc;0@4mZTwF0xIzTs-lOdIhp_!2(g@qxTiJ_>3A%%e<
zg^?kLn<0ybA&ZwGijN@=EE252I<ZiRJriV%2LHsVF@`0~KxR&AUI_<~j*m~v%t?)p
qFJT3867`bwl1mtYtRyfAVW&*|=qA7e6y#wPVB}(yVB}{MVgdl~<{e)E

delta 68
zcmZ3&e3(g^`7<w<@^rbVWCkc;0@4mZTpT!2I)E*Oks(-vW#SAaCJoMs2V*AtF}m?^
O0A+a?1sJ&)B^Uv~{0qPU

diff --git a/test/bytecode_3.3/00_import.pyc b/test/bytecode_3.3/00_import.pyc
index 6ffd17573ec5db82b86729295e4d9c63b83a74ab..0c9e5407c6c3bca178b7a6acc975eaf072771f53 100644
GIT binary patch
delta 160
zcmX@lw3=CY9uF_q6?OTjp9~BP$v_MTOhA?c5EoZWR1Q!}<zz_ZVrXV$NMT^eW@0ER
z0Wne-8FIK8vUnJ>cp0Mj81fh<7HKi^Pn?@zSjr64nUk7V$^oR~<I^&8Qsd)GS%I8H
ky(GQlQbr&v2~0xRDHH#?3Ge^~c^Cy4xfmrF`5A?n0AHRQ&j0`b

delta 68
zcmZ3@e4a^p9uF^<@^rbVDh39IWFUqECLqfJh>HU!DhEuQrOC)S@kqktP)0W%4xlIx
LqW~ipqXZ)WpzI43

diff --git a/test/bytecode_3.4/00_import.pyc b/test/bytecode_3.4/00_import.pyc
index 4a455a04a55375ca4216f310c0c56ee3ff77af15..6174ea0acb495361b997c55bb5d901b7553a3fcc 100644
GIT binary patch
delta 174
zcmbQi^oU9M9S<+p6?OTjp9~BPkAWBtn1Cz?ATF+$s2t#w%E^$*#n8;ikix)_&BRbt
z0%D{vGURYGWbrU$@iIj5G30?of;CxQf(-G~WW2>vkXVudq#3m|`6u={YTRPZNzJ>(
z5g(tHnUfkHAH|xem!y|`i!tdIBalp4$xy@%)LFzm@rH>250J&fD8R_YD8b0jD8vK+
Deeos8

delta 78
zcmaFFG=oX`9S<*;@^rbVDh39I$3P4ROhA?c5ElndR1TOpONx<m;#Nn_l?+8}K*1um
U$#RS)JRCqK52FAh7o!9t08rBn00000

diff --git a/test/bytecode_3.5/00_import.pyc b/test/bytecode_3.5/00_import.pyc
index b96f8054b0c3c2a9b11cb9789f7dffddd2a51c06..9484a59d9a7519f11823a06f0e4f68afaafe7a02 100644
GIT binary patch
delta 171
zcmbQibe~CCjF*?|in@H%PX-2t$3P4ROhA?c5EqwDR1UCD<zz_ZVrXV$NMT^eW@0ER
z1Tj(=8FIK8vUnJ>cp0MjK-^$WmX{zC{4^PFu@oehWB_SKElvK3eU2Kpm~&F|ZgIrN
zr)B1(#>YpoCh8^WCEsF9y2S`2Q&ut*aRYT0aZkKqBESP=@h}Q7axqFU@-qrC0RWj+
BBzFJ+

delta 101
zcmcc5G=oW5jF*>7dAeLw6$1mqV<3hDCLqfJh>HU!DhEiXFfs&dvb+Sz`e`!WVkt;0
n$pF%fTAG{_H#u^yWGG?-N)@q9mS!~J;Q%su7zG%)7$q11i`)?&

diff --git a/test/bytecode_3.5/01_ops.pyc b/test/bytecode_3.5/01_ops.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..9166a5c3c0819882432d636758702156218696d2
GIT binary patch
literal 337
zcmWgR<>mS!Eg$uhk%8ec0}@~ZvK@f9cruVk;b4ejU`Pcr7#U=tEG7nPxR^7P#mwLX
zXL-YAW#BAdILi;n0veXW%#gyukix`}!pe}&$`Az<VPr@Jl58MGD-(kal*0nzuu7(I
zGMF>lq_8stYjVBh0=n!a(A^9#SwI96h+qa0tRMo28T^Vs(wfXgAh{xtsv?k_Cetm(
z%3F*TD;bJFW`K!bvc;LX1v#nl#rdU0$*KBDrRl~7`UZya`31##1(mlrY;yBcN^?@}
UKmk)M1|--RxlkdqD5C%)0EVwOg8%>k

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.6/00_import.pyc b/test/bytecode_3.6/00_import.pyc
index c903cd671fcacbcf2216044025927dba845358be..9326c33bfe8f442ea9e50b02b8b60d3a3543ad5d 100644
GIT binary patch
delta 137
zcmZo<+QX!5%*)GlMO{AXCj$e+V<3hDCLqfJh>L?JDqBjVa;9=MGo~<PGZp!zFr+Z%
zaA)yk@ka4YjFDpGpIGjwaf>-8HSZQje0*AFPHKF76l<bhl3wyH#-v+}Kr&?|LlHO7
aup;h>2TcTcfGiG19!3sE0Y)xH9wq=7EFNkA

delta 100
zcmdnP)X1c4%*)HAJY6oTih+UQF%ZK66OiQq#Kl$<l`W-H7=sx!Szdx<{WKYGu@oeh
mWB_SKEltje{f?X~8H(6|QblYNf0*!a09hQ2Jd7NS0*nA{)Dd_9

diff --git a/test/simple_source/bug30/01_ops.py b/test/simple_source/bug30/01_ops.py
index 3e03ca0b..9dfb189b 100644
--- a/test/simple_source/bug30/01_ops.py
+++ b/test/simple_source/bug30/01_ops.py
@@ -1,5 +1,8 @@
 # Statements to beef up grammar coverage rules
 # Force "inplace" ops
+# Note this is like simple_source/bug22/01_ops.py
+# But we don't ahve the UNARY_CONVERT which dropped
+# out around 2.7
 y = +10  # UNARY_POSITIVE
 y /= 1   # INPLACE_DIVIDE
 y %= 4   # INPLACE_MODULO
diff --git a/test/simple_source/stmts/00_import.py b/test/simple_source/stmts/00_import.py
index eaee8271..33cbb1a3 100644
--- a/test/simple_source/stmts/00_import.py
+++ b/test/simple_source/stmts/00_import.py
@@ -1,6 +1,9 @@
-# Tests:
+# Tests all the different kinds of imports
 import sys
 from os import path
 from os import *
 import time as time1, os as os1
 import http.client as httpclient
+if len(__file__) == 0:
+    # a.b.c should force consecutive LOAD_ATTRs
+    import a.b.c as d
diff --git a/uncompyle6/parsers/parse3.py b/uncompyle6/parsers/parse3.py
index d5632cf5..5c693654 100644
--- a/uncompyle6/parsers/parse3.py
+++ b/uncompyle6/parsers/parse3.py
@@ -620,17 +620,18 @@ class Python3Parser(PythonParser):
             load_attr ::= expr LOOKUP_METHOD
             call ::= expr CALL_METHOD
         """
+        is_pypy               = False
         seen_LOAD_BUILD_CLASS = False
         seen_LOAD_DICTCOMP    = False
         seen_LOAD_LISTCOMP    = False
         seen_LOAD_SETCOMP     = False
-        seen_classdeco_end    = False
         seen_GET_AWAITABLE_YIELD_FROM = False
 
         # Loop over instructions adding custom grammar rules based on
         # a specific instruction seen.
 
         if 'PyPy' in customize:
+            is_pypy = True
             self.addRule("""
               stmt ::= assign3_pypy
               stmt ::= assign2_pypy
@@ -825,9 +826,12 @@ class Python3Parser(PythonParser):
                 # Note: this probably doesn't handle kwargs proprerly
                 args_pos, args_kw, annotate_args  = token.attr
 
-                rule_pat = ('mklambda ::= %sload_closure LOAD_LAMBDA %%s%s' %
-                            ('pos_arg '* args_pos, opname))
-                self.add_make_function_rule(rule_pat, opname, token.attr, customize)
+                # FIXME: Fold test  into add_make_function_rule
+                j = 1 if self.version < 3.3 else 2
+                if is_pypy or (i > j and tokens[i-j] == 'LOAD_LAMBDA'):
+                    rule_pat = ('mklambda ::= %sload_closure LOAD_LAMBDA %%s%s' %
+                                ('pos_arg '* args_pos, opname))
+                    self.add_make_function_rule(rule_pat, opname, token.attr, customize)
 
                 if has_get_iter_call_function1:
                     rule_pat = ("generator_exp ::= %sload_closure load_genexpr %%s%s expr "
@@ -889,11 +893,12 @@ class Python3Parser(PythonParser):
                                    "GET_ITER CALL_FUNCTION_1" % ('pos_arg '* args_pos, opname))
                         self.add_make_function_rule(rule_pat, opname, token.attr, customize)
 
-                    rule_pat = ('mklambda ::= %s%sLOAD_LAMBDA %%s%s' %
-                                (('pos_arg '* args_pos),
-                                 ('kwarg '* args_kw),
-                                 opname))
-                    self.add_make_function_rule(rule_pat, opname, token.attr, customize)
+                    if is_pypy or (i > 2 and tokens[i-2] == 'LOAD_LAMBDA'):
+                        rule_pat = ('mklambda ::= %s%sLOAD_LAMBDA %%s%s' %
+                                    (('pos_arg '* args_pos),
+                                     ('kwarg '* args_kw),
+                                     opname))
+                        self.add_make_function_rule(rule_pat, opname, token.attr, customize)
                     if seen_LOAD_LISTCOMP and has_get_iter_call_function1:
                         rule_pat  = ("listcomp ::= %sLOAD_LISTCOMP %%s%s expr "
                                          "GET_ITER CALL_FUNCTION_1" % ('expr ' * args_pos, opname))
@@ -908,11 +913,15 @@ class Python3Parser(PythonParser):
                     rule_pat = ("generator_exp ::= %sload_genexpr %%s%s expr "
                                 "GET_ITER CALL_FUNCTION_1" % ('pos_arg '* args_pos, opname))
                     self.add_make_function_rule(rule_pat, opname, token.attr, customize)
-                rule_pat = ('mklambda ::= %s%sLOAD_LAMBDA %%s%s' %
-                            (('pos_arg '* args_pos),
-                            ('kwarg '* args_kw),
-                            opname))
-                self.add_make_function_rule(rule_pat, opname, token.attr, customize)
+
+                # FIXME: Fold test  into add_make_function_rule
+                j = 1 if self.version < 3.3 else 2
+                if is_pypy or (i > j and tokens[i-j] == 'LOAD_LAMBDA'):
+                    rule_pat = ('mklambda ::= %s%sLOAD_LAMBDA %%s%s' %
+                                (('pos_arg '* args_pos),
+                                ('kwarg '* args_kw),
+                                opname))
+                    self.add_make_function_rule(rule_pat, opname, token.attr, customize)
 
                 if seen_LOAD_LISTCOMP and has_get_iter_call_function1:
                     rule_pat  = ("listcomp ::= %sLOAD_LISTCOMP %%s%s expr "