From 41f360e3dc418a077895fb607451a209b03a2c65 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sun, 6 Nov 2016 09:20:46 -0500
Subject: [PATCH] Start bytecode 3.0 decompiling

---
 test/Makefile                         |   5 +++--
 test/bytecode_3.0/00_assign.pyc       | Bin 0 -> 186 bytes
 test/bytecode_3.0/00_import.pyc       | Bin 0 -> 272 bytes
 test/bytecode_3.0/00_pass.pyc         | Bin 0 -> 123 bytes
 test/bytecode_3.0/04_multi_assign.pyc | Bin 0 -> 210 bytes
 test/bytecode_3.0/04_raise.pyc        | Bin 0 -> 360 bytes
 test/bytecode_3.0/04_withas.pyc       | Bin 0 -> 388 bytes
 test/bytecode_3.0/10_for.pyc          | Bin 0 -> 221 bytes
 test/test_pythonlib.py                |   2 +-
 uncompyle6/parsers/parse30.py         |  10 ++++++++--
 10 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 test/bytecode_3.0/00_assign.pyc
 create mode 100644 test/bytecode_3.0/00_import.pyc
 create mode 100644 test/bytecode_3.0/00_pass.pyc
 create mode 100644 test/bytecode_3.0/04_multi_assign.pyc
 create mode 100644 test/bytecode_3.0/04_raise.pyc
 create mode 100644 test/bytecode_3.0/04_withas.pyc
 create mode 100644 test/bytecode_3.0/10_for.pyc

diff --git a/test/Makefile b/test/Makefile
index e36ff3c0..2f8e56ca 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -66,7 +66,8 @@ check-bytecode-2:
 
 #: Check deparsing bytecode 3.x only
 check-bytecode-3:
-	$(PYTHON) test_pythonlib.py --bytecode-3.1 --bytecode-3.2 --bytecode-3.3 \
+	$(PYTHON) test_pythonlib.py --bytecode-3.0 \
+       --bytecode-3.1 --bytecode-3.2 --bytecode-3.3 \
        --bytecode-3.4 --bytecode-3.5 --bytecode-pypy3.2
 
 #: Check deparsing bytecode that works running Python 2 and Python 3
@@ -107,7 +108,7 @@ check-bytecode-2.7:
 
 #: Check deparsing Python 3.0
 check-bytecode-3.0:
-	@echo testing not done yet
+	$(PYTHON) test_pythonlib.py --bytecode-3.0
 
 #: Check deparsing Python 3.1
 check-bytecode-3.1:
diff --git a/test/bytecode_3.0/00_assign.pyc b/test/bytecode_3.0/00_assign.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3c63e6d5667d2790ea148a1c0127b51b5d30128c
GIT binary patch
literal 186
zcmcEK;pGyttO!eHKmv?FwgV6sivfug28Jjg$;1%F#E`<s5XB5)2Wv0`rAk?VgkOGM
zYNieokf8zMmVz`V!ezkRBrut*0hD1t5Ty!0ZgFOAK~8FXaeir0a;koDNp4B8zJWn}
iVsUY1dY)cEWhn<xkxg!XN@-529mxD*5W&XC#s~mBXCC(e

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.0/00_import.pyc b/test/bytecode_3.0/00_import.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..27a0cba10f0332b17a2e7a65c819dbe111917e39
GIT binary patch
literal 272
zcmYjK%L>9U5Zt7#lv2S@@EAPU_N<8b0bUe@TtwP{g@lxDa_HF)@)zB-zCv~~Gdr8z
z<n!#2J}))=of+{x6&?s0x(qacoHz%~z;KWpSm;GTpWmqnWc-<6Ad@h95;1+#Qo&I$
zLLYQ@bN5LFYbC-?9}(byp3`gbn;VI1jq(XK0;$HR#Y&I?Kk!SE*qTnOD_Y;zsz7HP
e7G-%Q*Y<AR4L+sN*4V~twHsH4<vClhjJ*Je9W9Ok

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.0/00_pass.pyc b/test/bytecode_3.0/00_pass.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..280db7246eaf7487898af67d54f130912bffb80a
GIT binary patch
literal 123
zcmcEK;pN)SS{;_mfCLzUYzH7NW&si@3=F{<AQ3+eAi;n}l*$3ciZgQya#G`q^Gl18
qQ}v5Wa!ZQ!4GiK75{rxV3MxxEfJ$s~^HWN5Qtdzn6*B<|1||R&nH2p1

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.0/04_multi_assign.pyc b/test/bytecode_3.0/04_multi_assign.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a39cb2b18e763bffb7f8d4ebebaa2d7b00e03c44
GIT binary patch
literal 210
zcmYj|F%H5o3`L!`AOz(MY^W1uU;`mez`}r(fvBXRL`rBC#{(y1;ZV3`0Ly;*_W$1I
z^XdC_KWq4_l=XoJ7YqY%5g@sfuNE=|nSmTZ4R9(1XO6{~Ng1OG4bqH-cBtB*(74-R
z1cQ<Ka5eBcP#1iFA85%dTHiUNu%)0)iP1+a*Bj-@MXM@A+dNj?lO`P9`L-r!_DTQN
GBNrb&{V1OR

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.0/04_raise.pyc b/test/bytecode_3.0/04_raise.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..16a75a834b2098bd8ab293e51723b86bf458ec13
GIT binary patch
literal 360
zcma(~v1$TA5S_7zB2lyxQsm03qJ^CzN(kv}QUq*{b8m|y-tDn73kntz{ipn%Gk0K8
zq;O!~KHk20Z}!;h{=A<)4g47tzLce&Kn8FD*a$)Rh+Co<{nyb~g;!a65;y`>13<3L
zXM}Hr5&<Qmxm<^lxY(!0Zd3CWWzJGmI*#l<Cyq5Q^aWN#)^qO4H}9QqbS>g-EC@A(
zXJM2V)y^j5f;V<dTriC%)5NDa*_Y}NhT<`<s8Ykpt@c3=6#&~fz;%=Vul2X?{?3jB
O&kL7@on6#b+H?gA?@F2g

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.0/04_withas.pyc b/test/bytecode_3.0/04_withas.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7daa1c3afabf1f3fc811c06d3dc32cf7ef9354cf
GIT binary patch
literal 388
zcmb79O-sW-5Ph3^sKp-o3-p+i_3NgH;JqL@RFpD=WU8t8DA`?VB<)3ixHGGu;K_ma
zcso1u-tOhWcw{HtJj1UtqHhFtER+Kuz=H^bB#xw$>AlvTU?{j1*mI#?dMjXSurhcT
z5#eouKEf`-c7T3>WG;Ta!Or0BUStxh*(~^a^&;Ze!V&rXuS4y)C5ko5D_Jg=LD1vb
z;#-_9!YbEUlNa?<EMo}dk94D`)+Li|e4Fvqy2{z<$pvi+_ng|}b?5b$%ciYTw_$$C
i({7|&8U}M{X5oc@hkjE25j7OgtE$O;$=4x8Lp}k&2u%h6

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.0/10_for.pyc b/test/bytecode_3.0/10_for.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a25ba0ddda467dee6aec79bfc963697c764fb03a
GIT binary patch
literal 221
zcmZ9FJqyAx5Qg8x4<xj+;O1nfR_BU1IJ*cI1gWKorO-CDAy6j=|G1YfiU;@bKHMD_
zd%n26`g4w-no!<To0!ngA%TM7aP@EjB*TT_A&~S7DDM3IKU^V^9H(GJ_a$@SgyZ1W
zc{VV&?o*dFg$gL(3%eu@BU9FGrBb79m#e7Kx-FX`+N{&N?!xwIXSB7gwX~JmjVT*J
K5STK-ec}hf@FU*<

literal 0
HcmV?d00001

diff --git a/test/test_pythonlib.py b/test/test_pythonlib.py
index 3e960567..8deb221c 100755
--- a/test/test_pythonlib.py
+++ b/test/test_pythonlib.py
@@ -80,7 +80,7 @@ for  vers in (2.7, 3.4, 3.5, 3.6):
 
 for  vers in (1.5,
               2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7,
-              3.1, 3.2, 3.3,
+              3.0, 3.1, 3.2, 3.3,
               3.4, 3.5, 3.6, 'pypy3.2', 'pypy2.7'):
     bytecode = "bytecode_%s" % vers
     key = "bytecode-%s" % vers
diff --git a/uncompyle6/parsers/parse30.py b/uncompyle6/parsers/parse30.py
index ebc9e2a0..d345ef31 100644
--- a/uncompyle6/parsers/parse30.py
+++ b/uncompyle6/parsers/parse30.py
@@ -11,7 +11,6 @@ class Python30Parser(Python3Parser):
 
     def p_30(self, args):
         """
-
         # Store locals is only in Python 3.0 to 3.3
         stmt         ::= store_locals
         store_locals ::= LOAD_FAST STORE_LOCALS
@@ -21,7 +20,14 @@ class Python30Parser(Python3Parser):
         # it is 2.7 or 3.1. So we have a number of 2.6ish (and before) rules below
 
         _ifstmts_jump ::= c_stmts_opt JUMP_FORWARD come_froms POP_TOP COME_FROM
-        jmp_true ::= JUMP_IF_TRUE POP_TOP
+        jmp_true      ::= JUMP_IF_TRUE POP_TOP
+        jmp_false     ::= JUMP_IF_FALSE POP_TOP
+
+        withasstmt    ::= expr setupwithas designator suite_stmts_opt
+                          POP_BLOCK LOAD_CONST COME_FROM_FINALLY
+                          LOAD_FAST DELETE_FAST WITH_CLEANUP END_FINALLY
+        setupwithas   ::= DUP_TOP LOAD_ATTR STORE_FAST LOAD_ATTR CALL_FUNCTION_0 setup_finally
+        setup_finally ::= STORE_FAST SETUP_FINALLY LOAD_FAST DELETE_FAST
         """
 
 class Python30ParserSingle(Python30Parser, PythonParserSingle):