Python 3.4 if ifelse decompyling now works.

2025-08-03 00:45:53 +08:00 · 2015-12-17 08:10:43 -05:00
parent 2dc8375ed0
commit 87a3c5d687
24 changed files with 45 additions and 15 deletions
--- a/test/bytecode_2.7/keyword.pyc
+++ b/test/bytecode_2.7/keyword.pyc
--- a/test/bytecode_2.7/positional.pyc
+++ b/test/bytecode_2.7/positional.pyc
--- a/test/bytecode_3.2/for.cpython-32.pyc
+++ b/test/bytecode_3.2/for.cpython-32.pyc
--- a/test/bytecode_3.2/if.cpython-32.pyc
+++ b/test/bytecode_3.2/if.cpython-32.pyc
--- a/test/bytecode_3.2/ifelse.cpython-32.pyc
+++ b/test/bytecode_3.2/ifelse.cpython-32.pyc
--- a/test/bytecode_3.2/keyword.cpython-32.pyc
+++ b/test/bytecode_3.2/keyword.cpython-32.pyc
--- a/test/bytecode_3.2/positional.cpython-32.pyc
+++ b/test/bytecode_3.2/positional.cpython-32.pyc
--- a/test/bytecode_3.2/while.cpython-32.pyc
+++ b/test/bytecode_3.2/while.cpython-32.pyc
--- a/test/bytecode_3.4/if.cpython-34.pyc
+++ b/test/bytecode_3.4/if.cpython-34.pyc
--- a/test/bytecode_3.4/ifelse.cpython-34.pyc
+++ b/test/bytecode_3.4/ifelse.cpython-34.pyc
--- a/test/bytecode_3.4/keyword.cpython-34.pyc
+++ b/test/bytecode_3.4/keyword.cpython-34.pyc
--- a/test/bytecode_3.4/positional.python-34.pyc
+++ b/test/bytecode_3.4/positional.python-34.pyc
--- a/test/bytecompile-tests
+++ b/test/bytecompile-tests
@@ -55,17 +55,19 @@ tests['2.5'] = tests['2.3']
 tests['2.6'] = tests['2.5']
 # tests['2.7'] = ['mine'] + tests['2.6']
 tests['2.7'] = [
-    'source_3.4/branching/ifelse',
-    'source_3.4/branching/if'
-    # 'source_3.4/call_arguments/keyword',
-    # 'source_3.4/call_arguments/positional'
+    'simple-source/branching/ifelse',
+    'simple-source/branching/if'
+    # 'simple-source/call_arguments/keyword',
+    # 'simple-source/call_arguments/positional'
    ]

 tests['3.4'] = [
-    # 'source_3.4/branching/ifelse',
-    # 'source_3.4/branching/if'
-    'source_3.4/call_arguments/keyword',
-    'source_3.4/call_arguments/positional'
+    # 'simple-source/branching/ifelse',
+    # 'simple-source/branching/if'
+    # 'simple-source/call_arguments/keyword',
+    # 'simple-source/call_arguments/positional'
+    'simple-source/looping/for',
+    'simple-source/looping/while'
    ]

 total_tests = len(tests['2.7'])
--- a/test/simple-source/README
+++ b/test/simple-source/README
@@ -0,0 +1,7 @@
+Files in this directory contain very simnple constructs that work
+across all versions of Python.
+
+Their simnplicity is to try to make it easier to debug grammar
+and AST walking routines.
+
+This code originally taken from https://github.com/DarkFenX/uncompyle3
--- a/test/simple-source/branching/if.py
+++ b/test/simple-source/branching/if.py
--- a/test/simple-source/branching/ifelse.py
+++ b/test/simple-source/branching/ifelse.py
--- a/test/simple-source/call_arguments/keyword.py
+++ b/test/simple-source/call_arguments/keyword.py
@@ -0,0 +1 @@
+a = b(c=d, e=f)
--- a/test/simple-source/call_arguments/positional.py
+++ b/test/simple-source/call_arguments/positional.py
@@ -0,0 +1 @@
+a(b, c)
--- a/test/simple-source/looping/for.py
+++ b/test/simple-source/looping/for.py
@@ -0,0 +1,2 @@
+for a in b:
+    c = d
--- a/test/simple-source/looping/while.py
+++ b/test/simple-source/looping/while.py
@@ -0,0 +1,2 @@
+while a:
+    b = c