From 288516d8c2b6b605276844be952845fd14073fc8 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Wed, 22 Nov 2017 11:26:50 -0500
Subject: [PATCH] Increase grammar coverage

---
 test/bytecode_2.2/01_augmented_assign.pyc     | Bin 0 -> 1481 bytes
 test/bytecode_2.5/01_augmented_assign.pyc     | Bin 0 -> 1319 bytes
 test/bytecode_2.6/01_augmented_assign.pyc     | Bin 0 -> 1319 bytes
 test/bytecode_2.7/01_augmented_assign.pyc     | Bin 0 -> 1313 bytes
 test/bytecode_3.6/01_augmented_assign.pyc     | Bin 0 -> 1158 bytes
 .../stmts/01_augmented_assign.py              |  71 ++++++++++++++++++
 uncompyle6/parsers/parse2.py                  |   8 +-
 uncompyle6/parsers/parse27.py                 |   3 +-
 8 files changed, 77 insertions(+), 5 deletions(-)
 create mode 100644 test/bytecode_2.2/01_augmented_assign.pyc
 create mode 100644 test/bytecode_2.5/01_augmented_assign.pyc
 create mode 100644 test/bytecode_2.6/01_augmented_assign.pyc
 create mode 100644 test/bytecode_2.7/01_augmented_assign.pyc
 create mode 100644 test/bytecode_3.6/01_augmented_assign.pyc
 create mode 100644 test/simple_source/stmts/01_augmented_assign.py

diff --git a/test/bytecode_2.2/01_augmented_assign.pyc b/test/bytecode_2.2/01_augmented_assign.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..bb3827c900f6e644c7e561a20012af9a87eadbe5
GIT binary patch
literal 1481
zcmbtUU2hvj6g{)MPU4MSHy;idq%iPOw~^zv0^F2{P}K5NRfr%VS&FQUXY6e2{pik`
z#Jr5u^2Q@SfoFaTzl8t5z2l7&A>Qz6ukJnf%$a-d?6~)LGpzm59*#l3HG0ik53qm&
zhU9F*HlYQSz<Ysr0=5O^Vd%l$h4L}<VYi??XdeScx2xa@2Rl`8#KEo$Jh)7o0~J8k
zu<O=+z_KJrz?5VI*bkv8?_unrL+FuzY&*PUiFSy~@Ui{qU&t-~KBt0xwT7v{!0X!2
z9M@+}S)u*|d#_R;^pk7!zCEZ=wT`imPpd@j!1i2X1FDXxM_p5`eJ+$b8r5JQvJ=EL
zh6WxZkE(3!W3&eQm<i+u@mj?p@N-OQ;w1G2u6~DJ=RwfKpHqDH4$%hemyS_~9pLKh
zHe-OZml%eyPaK1e><CxX(~ZUv&h{{Dz&?fEMBIc5SzNsROZ;TNg03@08HfEz*fF=r
zSbd58M%dR}Y(SL+v=@t=KyBhzs`?J>bJt>kaswS5(%YbudBGr;{vFHdJ9v*()}0a!
z$UjyMoOYZ1>9qt9K72Ha=F>!{rB<WJn0T5V<_no*DxSnz$w`qVVYs3^TQPb)X|j1S
z*0R*5lzCK^x=7_DE98nTmx3k?f4qpzHJ`jZDoUA6WO<>b(&H@27qd#p%;QoYhT#oN
z{78PkC@->9o-az>8)xczSv=E4c&fF$D9ik5zkhjoc{nbjUlv44a?YAV^7<>aK35oW
zm6Lfv+ZQrUDN3R;&eG6yXfUqUyvU|Sl*n<E-Yey~mc=}cX<&%y!XjR0<Fl!=3D`Vf
zbHIjPxGV0#huNoyPS1V=`wS)Bb-El8LEmz4N;m(s%bKs8e3$nyZlf-FxG{$HO`PO2
zJz7q_Z_1=J{r^5fr!hH!;lCMQ_@XIZbz3aKwU0(B8;?e&LH-Z(w2Tw|qA0S$t%{sI
zcXnoKMEN<I&9&iv$#X~%rBm$~vEk}xuU+tZ8N6}98@G3q=Q>pmm~=OY>fGCVOe!{a
zT?s7JW|i9i8^XyZ%uAAPcrC9k>NJSuv*m4z9nlsa2V22jZ7=9}J6=O<i<W2;?=F~o
PV|N8T-j-<8+JyfD$$l-?

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.5/01_augmented_assign.pyc b/test/bytecode_2.5/01_augmented_assign.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..cb56c8bea74c69f44f4ce61bf0875d1924a5b865
GIT binary patch
literal 1319
zcmb7DO>fgc5S_K1wAp->Rz>sz+Y_Nx8#tAs@Fm~`s!$6;ii9lJyGgf=Kk%+;!;$h&
z_zC<oB<{>?5~l|)*xK>iH*cS3cI{uk+r0L3a~Q+?;`n@l!~9_Y5?~0R7)S=!489}q
zVCaGLVd#VMK>2Wh^BH<vp~E@yV9v?5)8T4dDr+!Cg8)=Oez6BzNFDkExuCXCMciPf
zSWK5n<b%7i4r2xfUXN5h`G`5??^M?J7Sw|oC08K!VSCQjc8OgD*?_T!CAxyJo3KVb
z1-eEB9(Xv#Co<ZHus#QYuFtbr2X0gVS0$(wY7h77_2)4}t1i)itG723PhrSiq6t^q
zHxnB$Y=LTmZiD1x!oH;JlWGuwv?D$u5jdhTBL?gf))wHq0<=W~*@PchPRErTfL(<x
z#c{M?fI`&adewnzsCc)p*e9Mq3r>0+I{q#mKY#crjLLDMQmbSb8KcMPem)gRCiO@w
zDMm$>a9&AXR*JnnVY0G_m9WZKkw@05A{C>o5S3cY3=QWW&a_$R5#>=~MK%)lObMyt
zEXk*nxsfTgRr{PTY1BvJ{nVaisW_clwHIe{u}n`?!B3PDXV&IV`u)qx%l){BzD-e-
z<dil0i29XVpDN^3<)|$1^@Y$W&XUOLEahekH^$YP7umRo5)nt~eJf6tD9TjhhJp4d
ztWfYNG$;fVb|~ypzya0oM*3Gc3~jo_KMp_W$f1)S<&K<fkG!pWK@SlugCSp|lYFAW
z*^c*(O|0qv`{<m<=sB&Ss=(vyNN*zObum~fJPc(PhoNmDJ}y(M6ZNJjvcfHmTs(Dg
zVrwY*8cj-NsaZshDWY_&j*$RM9Zb%h`g}IIaFYvL$4r#xDwW67*0Ldo{<AByiWUR>
zD$9v_)<kUHVW@j8ug>a>FK(~P*4R3`6Lf-&+D35OTk{&M%UWz5b!{N+GTvf%dmYxO
Htt0;z_GJl)

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.6/01_augmented_assign.pyc b/test/bytecode_2.6/01_augmented_assign.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0577215e25ea41c83e025b48c35f0677ae0c61d0
GIT binary patch
literal 1319
zcmb7DO>fgc5S_K1G}(NWRz>6j+Y_Nx6F8Nk@Fm~`s!$6;ii9lJyGgc<Kd{%d;Yj%>
z{38Ae5_e`ciPHlYZ0-2%o43z1yY{c&EnfM#GYVmOaeThOk^f-;5?}<N7)S=!489|9
zVB~;wVdR2xK)G;;^96cbqN62pV9Cjr)!}MfDl0HS0}qr(exU<hq>kL7Tv1(A5jR{Y
zR@1c-dGD^Q!i2%0(<7BjK4M9^d!_Zg74=|2$qfiy*j=)fePU}M>o9S!L|YJc<5#FB
zPgkhGLkFk$L`J*dSC_!k)nyjzz>V_YssOb??crX%{yc%8W)pR|dV4eR6h_=88gR9H
zGqDY$Ca4DJ7D!Ge>`Tl(sX7rzTjC=Uo+auFV#q#WZ63bMLt8YE4fuiOv~9^Am>P5y
z$I*l#3Q>paRU59M<n6v<pLhaIIPJCR_&a#~{NW=%C?=7Ljgo$l=Xw(N)47NesmEGL
zG0u{R^HTD%R2&?LJSnnJ38Qi&(!dy%#bTUfqEw58Vb1x7sm@n=L}`#2k&K0zDj`*v
zMCp9CG|CHYRG;%Tjru^mpPOkCi?g{=2Vo*t%k)fT{8TA1H70#B7+hXn_QNdrHb+sE
zQa0}+8kBAWs*qEa<08Y?XF|s~ivpvQnCD&G7+Y(aC6g?OL>R>PjW|;xD`Jfs2HK&p
zLBXX^r{Gc8qp(i_2b8}X>0jZ<Y10k<ari+87M=DecWiBY<ZbK=dWc{ha`Me}l+KjD
z*zrMbB9jmPeRS4i{G8TMRp4-TtalLfIv5NU?)x$cecv<@pA@mtk$RJ5NoJP@HlEoy
zGZmD44Q7Qh)GQ*)WI;SpCrE&y4rb?8eZH7n*vW;dVkSsa70VN9Yu%7V|Jzj!Er$42
z7Bls%fjEDMq3Sf9DyuTSx}6T&WLxZx*Y>t6+um(w)2Xu#YqBlWwSctic#Glfv{}8f
Gh5TQUXbGqQ

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.7/01_augmented_assign.pyc b/test/bytecode_2.7/01_augmented_assign.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0391ed74caa1e30f6d7ff7d85ce8007d702141dc
GIT binary patch
literal 1313
zcmb7EOK;Oa5T5lTO`J3-jf%(xwkJZXCU7c6;Uyjyqzbj5N|BJ|dN+>K_<_Bq4M)m9
z;U^;Q%&Z-^2QI|g@weZ8`*~*8j`@4jv48DMeW-p7yuZSc|6u?EU<x1^2nN>-ejqSl
zYJf0dYJxOCnsA8o5<RWaQH2bsII*d9xEr?$8v-=2Kw9MI8!$lX$ef5ZH9!?{lTxvs
z-YAi`?u!Nl3=WMUsZ8?W6=m+#)(_UyqmmLE;G3{pvGzW(O%N>z3`|icgw?n<)nqMf
zO7PIYDc+G;nBX=lU@aQeD&~QWvf!!!xk2S&uikzMz-#J-7F>O}z3?2Sj$UZP)$Z+u
zK1@3x+pyRK;gAXY8nZLmA_8emd`803M5`nw><n|W@L3kxqJe0`PfVw)Q?@`gVIUnG
z9hjgHb+})4;TmdQ_Z92J6X?L{uuI3^!{c`zKXJVxh-9p!aJ@VagLss#c$A267D~Zq
zSrR!;EqPrl4i0#p6qzr%lDXokr<BZMK1(uQt9fadJI<$hn6LGSQZG|HnQ=9jTu48O
z($%su%8O9Rk>lLZsQ38Cm6|6pKVK<%;3s0eEnLdXIhB&nl}ewD$CsCvBR})LuTT`F
zw3?3)jcd0tW#~|rvm(RCXFQB?7I`X6VkaM9V|1=*mIRp>ao>v{Dt<0`R>UDT3_^p#
z1_hHsi-JXAkHS6$98iC5q<@1Wr=~0X;_!v`G&&v9+Of7BlDE<i7$Sn3kdtp7M(I+z
zWyi<4ic~)S_t9yO*-P3(S%KlO<8TMTu!liW;;t(a-*r_7@ktS@Fp}@GEXnj%Psei|
zm&!)TH*Z-;Ma3f0Oy<RbJV62!Rj^!W^`e|y=*fkmzZox0Wh_ppteb)~`roRWXfeUJ
zvRKL&ZN&L|3=N}WG+2W<>&xh|Ew;_>SzW7d_pQ6emeFE8)?wSI>!Y$9cNktqm$mF|
G<o*IfW(e2-

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.6/01_augmented_assign.pyc b/test/bytecode_3.6/01_augmented_assign.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3ecec97d7fc22bc0845788419fee04a408860592
GIT binary patch
literal 1158
zcmZuvOK;Oa5Z+zeiQ_nFF0H84!`@IqO?VtiQB{g~94kaCRkDQ4Hal^g#t+sT+Vn`^
z&VS&<U*M<s$|-+=6SK~vJ=E5Gv-8cj<MHf1Z?!z<*Jg0!5b~GYc`zo&XvH5&h$I04
zD(Q@Vqml(oT7d-&tbGzN<6kWO!NRjeEZZh8Q7xUw3T&_?bI3N4&H=H=A(0h>v1PbJ
zV)Co#t`7N{to>N*tw(gf+Fh~MJuJId%cOgcwjsTUVVC%2V4(xdCL>28!$^o8*vJZN
z29d8V`C5ef>(5Y^&Wye#pU#AfOyl}!%{&V{WSZAIYo-(U&>Xd7b4DroNxvMQ6KITD
zu!_4F+ZZ>N`JHnju@~XmB=7=X`m*(%1a0id*6ua|56#C3GU0*^?HNvW!Bum^{;T=c
zPRZ_u*uVqyo;(f3BuXIFAVX0Uag=uRDNiyP4`Psfpt8jC){@t2#oit-vWe;g*HCDl
z3#~z=e2^)=R`W%{!t>6Cak0|lDi=!gY{2ypxP*R|<kRu8P%()$bUp8uM!n!4rh1sA
z{9>wMub;`)ws;K6I|blFt@D??-qqDrx39#_6h%pHvPBnHy>+#o>CiJ>4kijeuXvnd
zln5PXsduwoHJYm|QX=7fkv`P?0=Sx_bDS2LGXr%47Q)HAVV1UmM+P1nKqGwvtH*45
zgI4$mnn=8;0zDoAJ5i?WE-h*No2VwPEBN=Qh?9H_;bO$SLMOWD-G5dk9lSEdO&5f@
zRJG90HxYI>%6b^etRIG@|8bJ)IDvOcWvZm2q!%R}m(Eu)o<M1#D;*`$2*-&#12!I&
zbcF7*q?ct)<T<3Ws(jnzVrBlRbPw^uOvZ3z{-Ah|U^AE5)TZw0WghL|`@r6^w;VL)
Xvl?w<wu8DhDi>xn9p+Ql=^*zX)KLh?

literal 0
HcmV?d00001

diff --git a/test/simple_source/stmts/01_augmented_assign.py b/test/simple_source/stmts/01_augmented_assign.py
new file mode 100644
index 00000000..a91f7279
--- /dev/null
+++ b/test/simple_source/stmts/01_augmented_assign.py
@@ -0,0 +1,71 @@
+"""
+01_augmented_assign.py modified from
+
+augmentedAssign.py -- source test pattern for augmented assigns
+
+This source is part of the decompyle test suite.
+
+decompyle is a Python byte-code decompiler
+See http://www.crazy-compilers.com/decompyle/ for
+for further information
+"""
+
+raise RuntimeError("This program can't be run")
+
+a = 1
+b = 2
+a += b; # print a  # a = a+b = 3
+a -= b; # print a  # a = a-b = 1
+a *= b; # print a  # a = a*b = 2
+a -= a; # print a  # a = a-a = 0
+a += 7*3; # print a  # == 21
+
+l= [1,2,3]
+l[1] *= 3;  #  print l[1]; # 6
+l[1][2][3] = 7
+l[1][2][3] *= 3;
+
+# Python 2.x
+# augassign1 ::= expr expr inplace_op ROT_TWO   STORE_SLICE+0
+l[:] += [9];  # print l
+
+# Python 2.x
+#  augassign1 ::= expr expr inplace_op ROT_THREE STORE_SLICE+2
+l[:2] += [9];  # print l
+
+
+# Python 2.x
+# augassign1 ::= expr expr inplace_op ROT_THREE STORE_SLICE+1
+l[1:] += [9];  # print l
+
+# Python 2.x
+# augassign1 ::= expr expr inplace_op ROT_FOUR STORE_SLICE+3
+l[1:4] += [9]; # print l
+
+l += [42,43];  # print l
+
+a.value = 1
+a.value += 1;
+a.b.val = 1
+a.b.val += 1;
+
+l = []
+for i in range(3):
+    lj = []
+    for j in range(3):
+        lk = []
+        for k in range(3):
+            lk.append(0)
+        lj.append(lk)
+    l.append(lj)
+
+i = j = k = 1
+def f():
+    global i
+    i += 1
+    return i
+
+l[i][j][k] = 1
+i = 1
+l[f()][j][k] += 1
+# print i, l
diff --git a/uncompyle6/parsers/parse2.py b/uncompyle6/parsers/parse2.py
index 3dfa8230..a29787b4 100644
--- a/uncompyle6/parsers/parse2.py
+++ b/uncompyle6/parsers/parse2.py
@@ -117,8 +117,6 @@ class Python2Parser(PythonParser):
         classdefdeco1 ::= expr classdefdeco2 CALL_FUNCTION_1
         classdefdeco2 ::= LOAD_CONST expr mkfunc CALL_FUNCTION_0 BUILD_CLASS
 
-        assert2 ::= assert_expr jmp_true LOAD_ASSERT expr CALL_FUNCTION_1 RAISE_VARARGS_1
-
         assert_expr ::= expr
         assert_expr ::= assert_expr_or
         assert_expr ::= assert_expr_and
@@ -215,10 +213,12 @@ class Python2Parser(PythonParser):
         designator ::= expr expr STORE_SLICE+1
         designator ::= expr expr STORE_SLICE+2
         designator ::= expr expr expr STORE_SLICE+3
-        augassign1 ::= expr expr inplace_op ROT_TWO   STORE_SLICE+0
+
+        augassign1 ::= expr expr inplace_op ROT_FOUR  STORE_SLICE+3
         augassign1 ::= expr expr inplace_op ROT_THREE STORE_SLICE+1
         augassign1 ::= expr expr inplace_op ROT_THREE STORE_SLICE+2
-        augassign1 ::= expr expr inplace_op ROT_FOUR  STORE_SLICE+3
+        augassign1 ::= expr expr inplace_op ROT_TWO   STORE_SLICE+0
+
         slice0 ::= expr SLICE+0
         slice0 ::= expr DUP_TOP SLICE+0
         slice1 ::= expr expr SLICE+1
diff --git a/uncompyle6/parsers/parse27.py b/uncompyle6/parsers/parse27.py
index 83ce8b24..81b62acd 100644
--- a/uncompyle6/parsers/parse27.py
+++ b/uncompyle6/parsers/parse27.py
@@ -91,7 +91,8 @@ class Python27Parser(Python2Parser):
         assert        ::= assert_expr jmp_true LOAD_ASSERT RAISE_VARARGS_1
 
         # assert condition, expr
-        assert2       ::= assert_expr jmp_true LOAD_ASSERT expr RAISE_VARARGS_2
+        assert2 ::= assert_expr jmp_true LOAD_ASSERT expr CALL_FUNCTION_1 RAISE_VARARGS_1
+
 
         withstmt ::= expr SETUP_WITH POP_TOP suite_stmts_opt
                 POP_BLOCK LOAD_CONST COME_FROM_WITH