Merge pull request #379 from rocky/elif-transformation-with-continue

Elif transformation with continue

test/simple_source/bug24/02_loop_continue_dead_code.py

@@ -0,0 +1,18 @@
+"""This program is self-checking!"""
+# Python 2.4 - 2.7 bug in transforming "else if" to "elif" in Python 2.4 .. 2.7
+# From Issue #377
+
+# RUNNABLE!
+def loop_continue_dead_code(slots):
+    for name in slots:
+        if name:
+            pass
+        else:
+            continue
+            # The below is dead code
+            if x:
+                y()
+            else:
+                z()
+
+loop_continue_dead_code([None, 1])

uncompyle6/semantics/transform.py

@@ -293,7 +293,8 @@ class TreeTransform(GenericASTTraversal, object):
         else_suite_index = 1
 
         len_n = len(n)
-        if len_n == 1 == len(n[0]) and n[0] == "stmt":
+        # Sometimes stmt  is reduced away and n[0] can be a single reduction like continue -> CONTINUE.
+        if len_n == 1 and isinstance(n[0], SyntaxTree) and len(n[0]) == 1 and n[0] == "stmt":
             n = n[0][0]
         elif len_n == 0:
             return node