From 6f5dce342f503f91e3a4199e09b15fc614896fd1 Mon Sep 17 00:00:00 2001
From: rocky <rocky@gnu.org>
Date: Fri, 8 Jul 2016 07:01:48 -0400
Subject: [PATCH] Start going over Python 2.5 bytecode

Fix 2.6 with bug
---
 test/add-test.py                            |   3 +-
 test/bytecode_2.5/00_assign.pyc             | Bin 0 -> 178 bytes
 test/bytecode_2.5/00_import.pyc             | Bin 0 -> 188 bytes
 test/bytecode_2.5/00_pass.pyc               | Bin 0 -> 119 bytes
 test/bytecode_2.5/01_class.pyc              | Bin 0 -> 448 bytes
 test/bytecode_2.5/01_list_comprehension.pyc | Bin 0 -> 363 bytes
 test/bytecode_2.5/02_def.pyc                | Bin 0 -> 759 bytes
 test/bytecode_2.5/03_if_elif.pyc            | Bin 0 -> 275 bytes
 test/bytecode_2.5/06_list_ifnot.pyc         | Bin 0 -> 233 bytes
 test/bytecode_2.5/06_list_ifnot_and.pyc     | Bin 0 -> 466 bytes
 test/bytecode_2.5/11-list-if.pyc            | Bin 0 -> 367 bytes
 test/bytecode_2.6/05_with.pyc               | Bin 0 -> 278 bytes
 test/simple_source/stmts/05_with.py         |   1 +
 uncompyle6/parser.py                        |   7 ++--
 uncompyle6/parsers/parse25.py               |  42 ++++++++++++++++++++
 uncompyle6/parsers/parse26.py               |   9 ++++-
 16 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 test/bytecode_2.5/00_assign.pyc
 create mode 100644 test/bytecode_2.5/00_import.pyc
 create mode 100644 test/bytecode_2.5/00_pass.pyc
 create mode 100644 test/bytecode_2.5/01_class.pyc
 create mode 100644 test/bytecode_2.5/01_list_comprehension.pyc
 create mode 100644 test/bytecode_2.5/02_def.pyc
 create mode 100644 test/bytecode_2.5/03_if_elif.pyc
 create mode 100644 test/bytecode_2.5/06_list_ifnot.pyc
 create mode 100644 test/bytecode_2.5/06_list_ifnot_and.pyc
 create mode 100644 test/bytecode_2.5/11-list-if.pyc
 create mode 100644 test/bytecode_2.6/05_with.pyc
 create mode 100644 uncompyle6/parsers/parse25.py

diff --git a/test/add-test.py b/test/add-test.py
index 85a64022..09ed8211 100755
--- a/test/add-test.py
+++ b/test/add-test.py
@@ -9,4 +9,5 @@ version = sys.version[0:3]
 cfile =  "bytecode_%s/%s" % (version, short) + 'c'
 print("byte-compiling %s to %s" % (path, cfile))
 py_compile.compile(path, cfile)
-os.system("../bin/uncompyle6 -a -t %s" % cfile)
+if sys.version >= (2, 6, 0):
+    os.system("../bin/uncompyle6 -a -t %s" % cfile)
diff --git a/test/bytecode_2.5/00_assign.pyc b/test/bytecode_2.5/00_assign.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e1ef8cd94e50d41304004cf078e610a4128c2c9c
GIT binary patch
literal 178
zcmdn|iI*$)tx$L}0~9a<X$K%K76TF~3=B~~l8GUTi6MoNA&MEq4%T1>N|mqx3BUZj
z)Jz>FAVUMhEdgmx3<44mW)fH+Spy`1Ac_@$+~UmKf}GU&;{4L0<W&9QlH8JFeFKB|
i#Ny)2^gO+S%3=<nBAeX&l+v73JCNDMAcBpNjS&FRB_BWl

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.5/00_import.pyc b/test/bytecode_2.5/00_import.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c73f03f7e35b1966572c04630c3654e0c00a6a95
GIT binary patch
literal 188
zcmdn|iI*$)tx$L}0~D|TX$K%KRsa$yK*Y$9&A<=^VKXsgGcx2bF+?#jFajllHJE{l
zGXDdCp9Uk4Spw2skXVudmM8(q7FQORFahcO;vgW&pn*z&Z7I&oEyziYFU~J5N>0@;
nF3Bw^);BPS2a4twmFN{z7IOeK+2rP@l;)(`fz1RN$ioN#ww)zs

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.5/00_pass.pyc b/test/bytecode_2.5/00_pass.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..bde60dc2784566f6f0aabd2ce5155acf2573697b
GIT binary patch
literal 119
zcmdn|iI*$)tx$L}0~9a<X$K%KW&si@3=F{<AQ3+eAi;n}6w3j{iZgQya#G`q^Gl18
qQ}v5Wa!ZQ!4GiK75{rxV3Mz{^fJ$s~^HWN5Qtdzn6*B<|1||T;tQL&`

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.5/01_class.pyc b/test/bytecode_2.5/01_class.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3183b0271fe5430749c92b4ea53a0c2d9d83dda0
GIT binary patch
literal 448
zcmdn|iI;1|Kdta&1}I<#(hfjetP3PkfQXeLg^{6!fuWg!Au<ZcXJSZYWJqIVNMVMH
zGBKpEFa&F`0d<rx0trXBX&{~x5EpX*iBtxLC`N{$U=1LfL4yfMlz@ce<MR@8Q{&@H
zxWJs;{FKrhAQz$vD8v9}70Uuy#hJMUK)K@l(xT*4{gl)+eFMYz<ebFfV!eXOAdp&a
zkSdVTY>Z&1I1%fVAdpjoKsrgc7!+oFKn%6m4`KpH6zrxFP9V#*B0067Br`uR2qaFj
Q9pC`8frO16+>^r00QzN1V*mgE

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.5/01_list_comprehension.pyc b/test/bytecode_2.5/01_list_comprehension.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..adb300b7215b1a6a33839bf5f45e4cacc8292726
GIT binary patch
literal 363
zcmZ{eJxjzu5Qg7La-JWgFbI}c*n}%QPc20(tZl9kE`)Gohcl35lWeZA_9ywfZ0;90
z6M~1J3;WE+`_Als?!(jSD|*c_o)d{ra-9`yfnW`o37*psYXSpIh}ttG01dJSb0qTl
zAbTns;4*6GNW9VFg98{JAM|6CmTV(jMC}TR4>AE(@l@U{NZ~1bMId;Im47M!3lo{>
zbu3GkX+JC-%iDBJ?$Tae-KO4hEC~*9_foo|YD&(W-E}!Ha$7YWzj5sfTQ6>wSy{L~
a`_;W}-rcbbK2+B1N`4G=iT+_mSM&{CPdvW>

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.5/02_def.pyc b/test/bytecode_2.5/02_def.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..cd98701ca37892b2a4013d8e962efb3fa91f52fe
GIT binary patch
literal 759
zcmb7?&uYRz5XNWS__wwPuf9M|^<PgSMd-2MVLb?5q}@$HFet8q-hCsVs~4ZZ`9@<v
z6ivv?ewplkzs+p+hu2E{UmICEUpXH89KOrR5$%Y^ER+aEE=Nw&PSKbJ-+^c?IxjjP
zSD;~7<mDGr#SdRF4Nj)R5S2m5iLR2bbIniV#Vnfm`Fd%ihKv3h&Gv+c_r-RF4Q`rP
z?;%N9=p^n^FkyxClLDV(wXo?kYno^MJkS7`mDet%JgZqFV08D}FhNlAfxnV%R&3{m
zU6PifvkCSa^;-vb!5X|ZXiZk=#~aK~=Qs%AU^vL2V#L1yg`X+47WL@te2Lfe;<;PT
PqEB>B3T0gms=BI=VCru%

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.5/03_if_elif.pyc b/test/bytecode_2.5/03_if_elif.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7ab22f03a0d969677864320d2ae217be19270f26
GIT binary patch
literal 275
zcmY*Su?oU45WTCF7R3%O(y?17E4Yg2;OgSgF-V(2plxa{9UNTz9Y_DnFYr<d;=#Rl
z@7+u8{aMUbuSZ_MSjc?frkp_n=mbzA=sA-I+6TO)e`AX*ImerJ%*KP$MN9}?0B9%h
z<d}<=0GHGqIj26O4H<-JuZ<L96qTx-aBJt=h=(JQG*;>MWQ;Z`JMaTaSdwZwen+}D
qh0Mq{ma@%Os7lCMRqO6f?$oZ)Wnas^`<#{x0Y>O!fZ;S4IQG6nFfxh&

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.5/06_list_ifnot.pyc b/test/bytecode_2.5/06_list_ifnot.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..8516184a6d19a6f33beb76ba12809394ba7bdde4
GIT binary patch
literal 233
zcmYL?Jqp4=5QX2yD56;C0jyJqe}$EZg^i7kg^(bN#8CsuZge)FwMX&>UckF}0w*Fk
z@V=Sh&ClcAYP_DyO^jdolIJ3x3XVYdr5`E~u-JAHdY}r(!(Ab7LXkKgI_EZ&C{hT0
z?16Ql<iIMZ3SCWLb{X;5mG^Zt+Pc!dx{5F*<I1t`L?8wJ;GVRcWO+)OZE=Zd5Zf%j
k(1{Eu)(nOdohIybaxm8Q^BdP?VVc=}k<zSu#-5<2K5kboJ^%m!

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.5/06_list_ifnot_and.pyc b/test/bytecode_2.5/06_list_ifnot_and.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f2ae4037b3e773ec297a547e7720413d38ffd5ce
GIT binary patch
literal 466
zcmbVH!Ab)$6r5~})@qUJ!5{Fj2eI|yMG?WC3)+LAl(5~6-N^1{-Mk{g)=T{(|G-c3
z3w$pK-VMxT-b>z0^7%dJpM2fkr}$lp_iKh9FlE38@W4W07DwDk<-Eh#V%#wNjA;pU
z*9ru*z(!#*zrZ>|8^J1><<_1%hN1}6kvn{{iI4?$yHKr?*1^jVit#RK5;7%;)6^5z
zX;Ktg$6YSig&$=b>hta?X~@4?%4wU+Jn;!p6ZF!M=wKFR+~S$UKtG<%N&Zlpa$%a7
z6$1G&D{srXFxtCSlbTWL%DOSRsl0X7Xnd{<>q*<E%8^d0?6iKPLmmp<dbKEQs!Kz;
m%ly80Nea}F8meh5-?`gi`V0Jjs_(JUW$Ch2VXi_H*Z2XEgJb^y

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.5/11-list-if.pyc b/test/bytecode_2.5/11-list-if.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d899d4761fa18a7332753e60491f2964a9fb80b6
GIT binary patch
literal 367
zcmbV{!AiqG5QhIv6iZ7leFJatP}|U}h+xlxdJvQnLb^>Bl5EUODTUOFzL8I+PvA@}
zcz0p``I%w9+4=k)55Ml`PZ^HSNWPJvvB(<u0G`DdJVt?3GL@5K+)Ac}NG`QQfX-mK
zI>#YI7s3G@@NVEoFr73*OkTxGyahtjMR&dOP&u5oOgqO#q<9WRe8W7DT>3f}PpqBf
zC0?-(`$z=6(1kd1Ra4r8{I<>PEb~><+QQc4d_9ZfY3YckZgbh}Sx-}DQlylmZBA!8
eu9w05e(B*<{2%`xOK2d3tIDsprM>R?ivIzgY)Xm%

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.6/05_with.pyc b/test/bytecode_2.6/05_with.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5845d4ce1ce82426ea4b0d8a6d733b0b8aa7d9af
GIT binary patch
literal 278
zcmYL@!AiqG5QhIvlhhUz@h*4_2#p@R74fF0f_kW=$WWRoE+%csOwf8!5FgN2@db3Y
zEjSGS&d0DH^Zm2mKmB?i&#<f1-m4ElhBlPe4$na4P&hb_5c>`yALA1!61*LO6HF2m
zDLBRT&A5zk`(SaObxh!Ytukkm9$371eIn7Ra?J}JW!<poTM*4#Z5t-KGlGV{vKHOj
z?D*9yk@mK*P;QLkK$G)F4fc6vf&Y*b!$B^-UR6x8Y?~S9qP0qXc0u8c!D_v+59?*w
OR(u&O5}b$b*!=<VSUf8L

literal 0
HcmV?d00001

diff --git a/test/simple_source/stmts/05_with.py b/test/simple_source/stmts/05_with.py
index eb098c80..74706b8f 100644
--- a/test/simple_source/stmts/05_with.py
+++ b/test/simple_source/stmts/05_with.py
@@ -1,2 +1,3 @@
+from __future__ import with_statement
 with (sys) as f:
     print(f)
diff --git a/uncompyle6/parser.py b/uncompyle6/parser.py
index 59671e2f..583d192f 100644
--- a/uncompyle6/parser.py
+++ b/uncompyle6/parser.py
@@ -592,12 +592,11 @@ def get_python_parser(version, debug_parser, compile_mode='exec'):
             else:
                 p = parse23.Python23ParserSingle(debug_parser)
         elif version == 2.5:
-            # For now, we'll consider 2.5 exactly like 2.6
-            import uncompyle6.parsers.parse26 as parse25
+            import uncompyle6.parsers.parse25 as parse25
             if compile_mode == 'exec':
-                p = parse25.Python26Parser(debug_parser)
+                p = parse25.Python25Parser(debug_parser)
             else:
-                p = parse25.Python26ParserSingle(debug_parser)
+                p = parse25.Python25ParserSingle(debug_parser)
         elif version == 2.6:
             import uncompyle6.parsers.parse26 as parse26
             if compile_mode == 'exec':
diff --git a/uncompyle6/parsers/parse25.py b/uncompyle6/parsers/parse25.py
new file mode 100644
index 00000000..1f95ed2f
--- /dev/null
+++ b/uncompyle6/parsers/parse25.py
@@ -0,0 +1,42 @@
+#  Copyright (c) 2016 Rocky Bernstein
+"""
+spark grammar differences over Python2.6 for Python 2.6.
+"""
+
+from uncompyle6.parser import PythonParserSingle
+from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
+from uncompyle6.parsers.parse26 import Python26Parser
+
+class Python25Parser(Python26Parser):
+    def __init__(self, debug_parser=PARSER_DEFAULT_DEBUG):
+        super(Python25Parser, self).__init__(debug_parser)
+        self.customized = {}
+
+    def p_misc(self, args):
+        '''
+
+        # If "return_if_stmt" is in a loop, a JUMP_BACK can be emitted. In 2.6 the
+        # JUMP_BACK doesn't appear
+
+        return_if_stmt ::= ret_expr  RETURN_END_IF JUMP_BACK
+
+        # Pyython 2.6 uses ROT_TWO instead of the STORE_FAST
+        setupwithas ::= DUP_TOP LOAD_ATTR STORE_FAST LOAD_ATTR CALL_FUNCTION_0 STORE_FAST
+                        SETUP_FINALLY LOAD_FAST DELETE_FAST
+
+        # Python 2.6 omits ths LOAD_FAST DELETE_FAST below
+        withasstmt ::= expr setupwithas designator suite_stmts_opt
+                       POP_BLOCK LOAD_CONST COME_FROM
+                       LOAD_FAST DELETE_FAST
+                       WITH_CLEANUP END_FINALLY
+
+
+        '''
+
+class Python25ParserSingle(Python26Parser, PythonParserSingle):
+    pass
+
+if __name__ == '__main__':
+    # Check grammar
+    p = Python26Parser()
+    p.checkGrammar()
diff --git a/uncompyle6/parsers/parse26.py b/uncompyle6/parsers/parse26.py
index 30f2a93d..2488d8d6 100644
--- a/uncompyle6/parsers/parse26.py
+++ b/uncompyle6/parsers/parse26.py
@@ -128,6 +128,7 @@ class Python26Parser(Python2Parser):
                      POP_BLOCK LOAD_CONST COME_FROM WITH_CLEANUP END_FINALLY
 
         # Semantic actions want designator to be at index 2
+        # Rule is possibly 2.6 only
         withasstmt ::= expr setupwithas designator suite_stmts_opt
                        POP_BLOCK LOAD_CONST COME_FROM WITH_CLEANUP END_FINALLY
 
@@ -135,8 +136,12 @@ class Python26Parser(Python2Parser):
         # opcode SETUP_WITH
         setupwith ::= DUP_TOP LOAD_ATTR ROT_TWO LOAD_ATTR CALL_FUNCTION_0 POP_TOP
 
-        setupwithas ::= DUP_TOP LOAD_ATTR ROT_TWO LOAD_ATTR CALL_FUNCTION_0 STORE_FAST
-                        SETUP_FINALLY LOAD_FAST DELETE_FAST
+        # Possibly 2.6 only
+        setupwithas ::= DUP_TOP LOAD_ATTR ROT_TWO LOAD_ATTR CALL_FUNCTION_0 setup_finally
+
+        setup_finally ::= STORE_FAST SETUP_FINALLY LOAD_FAST DELETE_FAST
+        setup_finally ::= STORE_NAME SETUP_FINALLY LOAD_NAME DELETE_NAME
+
 
         whilestmt ::= SETUP_LOOP testexpr l_stmts_opt jb_pop POP_BLOCK _come_from
         whilestmt ::= SETUP_LOOP testexpr l_stmts_opt jb_cf_pop bp_come_from