Python 3.4 if ifelse decompyling now works.

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'])

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

test/simple-source/call_arguments/keyword.py

@@ -0,0 +1 @@
+a = b(c=d, e=f)

test/simple-source/call_arguments/positional.py

@@ -0,0 +1 @@
+a(b, c)

test/simple-source/looping/for.py

@@ -0,0 +1,2 @@
+for a in b:
+    c = d

test/simple-source/looping/while.py

@@ -0,0 +1,2 @@
+while a:
+    b = c

uncompyle6/parsers/parse2.py

@@ -3,7 +3,7 @@
 #  Copyright (c) 2005 by Dan Pascu <dan@windowmaker.org>
 #  Copyright (c) 2015 Rocky Bernstein
 #
-#  See main module for license.
+#  See LICENSE for lisence
 """
 A spark grammar for Python 2.x.
 

uncompyle6/parsers/parse3.py

@@ -3,7 +3,7 @@
 #  Copyright (c) 2005 by Dan Pascu <dan@windowmaker.org>
 #  Copyright (c) 2015 Rocky Bernstein
 #
-#  See main module for license.
+#  See LICENSE for license
 """
 A spark grammar for Python 3.x.
 

uncompyle6/parsers/spark.py

@@ -306,6 +306,7 @@ class GenericParser:
 
     def makeState(self, state, sym):
         assert sym is not None
+        # print(sym) # debug
         #
         #  Compute \epsilon-kernel state's core and see if
         #  it exists already.
@@ -554,7 +555,7 @@ class GenericParser:
             rule = self.ambiguity(self.newrules[nt])
         else:
             rule = self.newrules[nt][0]
-        # print(rule)
+        # print(rule) # debug
 
         rhs = rule[1]
         attr = [None] * len(rhs)
@@ -573,7 +574,7 @@ class GenericParser:
         rule = choices[0]
         if len(choices) > 1:
             rule = self.ambiguity(choices)
-        # print(rule)
+        # print(rule) # debug
 
         rhs = rule[1]
         attr = [None] * len(rhs)

uncompyle6/scanners/scanner34.py

@@ -37,9 +37,24 @@ class Scanner34(scan.Scanner):
         return fn(co)
 
     def disassemble_built_in(self, co):
-        bytecode = dis.Bytecode(co)
+        # Container for tokens
         tokens = []
+        self.code = co.co_code
+        self.build_lines_data(co)
+        self.build_prev_op()
+        # Get jump targets
+        # Format: {target offset: [jump offsets]}
+        jump_targets = self.find_jump_targets()
+        bytecode = dis.Bytecode(co)
         for inst in bytecode:
+            if inst.offset in jump_targets:
+                jump_idx = 0
+                for jump_offset in jump_targets[inst.offset]:
+                    tokens.append(Token('COME_FROM', None, repr(jump_offset),
+                                        offset='%s_%s' % (inst.offset, jump_idx)))
+                    jump_idx += 1
+                    pass
+                pass
             tokens.append(
                 Token(
                     type_ = inst.opname,
@@ -60,7 +75,6 @@ class Scanner34(scan.Scanner):
         """
         # Container for tokens
         tokens = []
-        customize = {}
         self.code = code = co.co_code
         codelen = len(code)
         self.build_lines_data(co)
@@ -116,7 +130,7 @@ class Scanner34(scan.Scanner):
                         free = co.co_cellvars + co.co_freevars
                     current_token.pattr = free[oparg]
             tokens.append(current_token)
-        return tokens, customize
+        return tokens, {}
 
     def build_lines_data(self, code_obj):
         """