Merge branch 'master' into python-2.4

* Remove unneeded Makefile
* sync n_ifelsesmt transform with decompyle3

.circleci/config.yml

@@ -1,7 +1,6 @@
 version: 2
 jobs:
   build:
-    working_directory: ~/rocky/python-uncompyle6
     parallelism: 1
     shell: /bin/bash --login
     # CircleCI 2.0 does not support environment variables that refer to each other the same way as 1.0 did.
@@ -12,9 +11,8 @@ jobs:
       COMPILE: --compile
     # To see the list of pre-built images that CircleCI provides for most common languages see
     # https://circleci.com/docs/2.0/circleci-images/
-    machine:
-      python:
-        version: 2.7.14
+    docker:
+      - image: circleci/python:2.7
     steps:
     # Machine Setup
     #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
@@ -24,10 +22,6 @@ jobs:
     # In many cases you can simplify this from what is generated here.
     # 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/'
     - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
-    # This is based on your 1.0 configuration file or project settings
-    - run:
-        working_directory: ~/rocky/python-uncompyle6
-        command: pyenv install 2.4.6 && pyenv local 2.4.6 && pyenv rehash && easy_install nose && pyenv rehash
     # Dependencies
     #   This would typically go in either a build or a build-and-test job when using workflows
     # Restore the dependency cache
@@ -38,8 +32,8 @@ jobs:
           - v2-dependencies-
 
     # This is based on your 1.0 configuration file or project settings
-    - run: easy_install xdis spark-parser
-    - run: pip install -e .
+    - run:
+        command: sudo easy_install xdis spark-parser && sudo pip install -e . && sudo pip install -r requirements-dev.txt
 
     # Save dependency cache
     - save_cache:
@@ -57,8 +51,8 @@ jobs:
     # Test
     #   This would typically be a build job when using workflows, possibly combined with build
     # This is based on your 1.0 configuration file or project settings
-    - run: python ./setup.py develop && make check-2.4
-    - run: cd ./test/stdlib && pyenv local 2.4.6 && bash ./runtests.sh 'test_[p-z]*.py'
+    - run: sudo python ./setup.py develop && make check-2.7
+    - run: cd test/stdlib && bash ./runtests.sh 'test_[p-z]*.py'
     # Teardown
     #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
     # Save test results

NEWS.md

@@ -1,3 +1,67 @@
+3.6.5: 2020-4-1 April Fool
+==========================
+
+Back port some of the changes in decompile3 here which mostly helps 3.7 and 3.8 decompilation, although this may also help 3.6ish versions too.
+
+- Handle nested `async for in for...`  and Better async comprehension detection via `xdis`.  Still more work is needed.
+- include token number in listings when `-g` and there is a parser error
+- remove unneded `Makefile`s now that remake 4.3+1.5dbg is a thing that has `-c`
+- Bug in finding annotations in functions with docstrings
+- Fix bug found by 2.4 sre_parse.py testing
+- Fix `transform` module's  `ifelseif` bugs
+- Fix bug in 3.0 name module detection
+- Fix docstring detection
+
+3.6.4: 2020-2-9 Plateau
+=======================
+
+The main focus in this release was fix some of the more glaring problems creapt in from the last release due to that refactor.
+
+`uncompyle6` code is at a plateau where what is most needed is a code refactoring. In doing this, until everything refactored and replaced, decomplation may get worse.
+Therefore, this release largely serves as a checkpoint before more major upheaval.
+
+The upheaval, in  started last release, I believe the pinnicle was around c90ff51 which wasn't a release. I suppose I should tag that.
+
+After c90ff5, I started down the road of redoing control flow in a more comprehensible, debuggable, and scalable way. See [The Control Flow Mess](https://github.com/rocky/python-uncompyle6/wiki/The-Control-Flow-Mess)
+
+The bulk of the refactoring going on in the [decompyle3](https://github.com/rocky/python-decompil3) project, but I try to trickle down the changes.
+
+It is tricky because the changes are large and I have to figure decompose things so that little testable pieces can be done. And there is also the problem that what is in decompyle3 is incomplete as well.
+
+Other than control flow, another change that will probably happen in the next release is to redo the grammar for lambda expressions. Right now, we treat them as Python statements, you know, things with compound statements in them. But lambda aren't that. And so there is hackery to paper over difference making a statement out of an expression the wrong thing to do. For example, a return of an "and" expression can be expressed as nested "if" statements with return inside them, but the "if" variant of the bytecode is not valid in a lambda.
+
+In the decompyle3 code, I've gone down the road making the grammar goal symbol be an expression. This also offers the opportunity to split the grammar making parsing inside lambda not only more reliable because the wrong choices don't exist, but also simpler and faster because all those rules just need don't need to exist in parsing.
+
+I cringe in thinking about how the code has lived for so long without noticing such a simple stupidity, and lapse of sufficient thought.
+
+Some stats from testing. The below give numbers of decompiled tests from Python's test suite which succesfully ran
+
+```
+   Version  test-suites passing
+   -------  -------------------
+   2.4.6     243
+   2.5.6     265
+   2.6.9     305
+   3.3.7     300
+   3.4.10    304
+   3.5.9     260
+   3.6.10    236
+   3.7.6     306
+   3.8.1     114
+```
+
+Decompiled bytecode files distributed with Python (syntax check only):
+
+```
+2.7.17  647 files:   0 failed
+3.2.6   900 files:   0 failed
+3.3.7  1256 files:   0 failed
+3.4.10  800 files:   0 failed
+3.5.9   900 files:   0 failed
+3.6.10 1300 files:  28 failed
+```
+
+
 3.6.3: 2020-1-26 Martin and Susanne
 ===================================
 

README.rst

@@ -54,7 +54,7 @@ only; another patched that and handled only 3.3.  You get the
 idea. This code pulls all of these forks together and *moves
 forward*. There is some serious refactoring and cleanup in this code
 base over those old forks. Even more experimental refactoring is going
-on in decompile3_.
+on in decompyle3_.
 
 This demonstrably does the best in decompiling Python across all
 Python versions. And even when there is another project that only
@@ -139,9 +139,16 @@ Python syntax changes, you should use this option if the bytecode is
 the right bytecode for the Python interpreter that will be checking
 the syntax.
 
-You can also cross compare the results with another python decompiler
-like pycdc_ . Since they work differently, bugs here often aren't in
-that, and vice versa.
+You can also cross compare the results with either another version of
+`uncompyle6` since there are are sometimes regressions in decompiling
+specific bytecode as the overall quality improves.
+
+For Python 3.7 and above, the code in decompyle3_ is generally
+better.
+
+Or try specific another python decompiler like uncompyle2_, unpyc37_,
+or pycdc_.  Since the later two work differently, bugs here often
+aren't in that, and vice versa.
 
 There is an interesting class of these programs that is readily
 available give stronger verification: those programs that when run
@@ -240,7 +247,9 @@ See Also
 .. _debuggers: https://pypi.python.org/pypi/trepan3k
 .. _remake: https://bashdb.sf.net/remake
 .. _pycdc: https://github.com/zrax/pycdc
-.. _decompile3: https://github.com/rocky/python-decompile3
+.. _decompyle3: https://github.com/rocky/python-decompile3
+.. _uncompyle2: https://github.com/wibiti/uncompyle2
+.. _unpyc37: https://github.com/andrew-tavera/unpyc37
 .. _this: https://github.com/rocky/python-uncompyle6/wiki/Deparsing-technology-and-its-use-in-exact-location-reporting
 .. |buildstatus| image:: https://travis-ci.org/rocky/python-uncompyle6.svg :target: https://travis-ci.org/rocky/python-uncompyle6
 .. |packagestatus| image:: https://repology.org/badge/vertical-allrepos/python:uncompyle6.svg :target: https://repology.org/project/python:uncompyle6/versions

__pkginfo__.py

@@ -58,7 +58,7 @@ entry_points       = {
     ]}
 ftp_url            = None
 install_requires   = ["spark-parser >= 1.8.9, < 1.9.0",
-                      "xdis >= 4.2.2, < 4.3.0"]
+                      "xdis >= 4.2.4, < 4.3.0"]
 
 license            = "GPL3"
 mailing_list       = "python-debugger@googlegroups.com"

admin-tools/pyenv-newer-versions

@@ -5,4 +5,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1
 fi
-export PYVERSIONS='3.5.9 3.6.10 2.6.9 3.3.7 2.7.17 3.2.6 3.1.5 3.4.10 3.7.6 3.8.1'
+export PYVERSIONS='3.5.9 3.6.10 2.6.9 3.3.7 2.7.17 3.2.6 3.1.5 3.4.10 3.7.7 3.8.2'

admin-tools/setup-master.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-PYTHON_VERSION=3.7.6
+PYTHON_VERSION=3.7.7
 
 # FIXME put some of the below in a common routine
 function finish {

pytest/testdata/if-2.7.right

@@ -1,10 +1,10 @@
 # Python 2.7
 # Embedded file name: simple_source/branching/05_if.py
 
-   6         0  LOAD_NAME             0  'True'
+ L.   6         0  LOAD_NAME             0  'True'
                 3  POP_JUMP_IF_FALSE    15  'to 15'
 
-   7         6  LOAD_NAME             1  'False'
+ L.   7         6  LOAD_NAME             1  'False'
                 9  STORE_NAME            2  'b'
                12  JUMP_FORWARD          0  'to 15'
              15_0  COME_FROM            12  '12'

pytest/testdata/ifelse-2.7.right

@@ -1,14 +1,14 @@
 # Python 2.7
 # Embedded file name: simple_source/branching/05_ifelse.py
 
-   3         0  LOAD_NAME             0  'True'
+ L.   3         0  LOAD_NAME             0  'True'
                 3  POP_JUMP_IF_FALSE    15  'to 15'
 
-   4         6  LOAD_CONST               1
+ L.   4         6  LOAD_CONST               1
                 9  STORE_NAME            1  'b'
                12  JUMP_FORWARD          6  'to 21'
 
-   6        15  LOAD_CONST               2
+ L.   6        15  LOAD_CONST               2
                18  STORE_NAME            2  'd'
              21_0  COME_FROM            12  '12'
                21  LOAD_CONST               None

test/.gitignore

@@ -1,2 +1,3 @@
 /.coverage
+/.python-version
 /nohup.out

test/Makefile

@@ -78,7 +78,7 @@ check-3.7: check-bytecode
 # 	$(PYTHON) test_pythonlib.py --bytecode-3.8 --syntax-verify $(COMPILE)
 
 # FIXME
-#: this is called when running under pypy3.5-5.8.0 or pypy2-5.6.0
+#: this is called when running under pypy3.5-5.8.0, pypy2-5.6.0, or pypy3.6-7.3.0
 5.8 5.6:
 
 #: Check deparsing only, but from a different Python version
@@ -344,8 +344,8 @@ check-bytecode-pypy3.6: 7.1
 	$(PYTHON) test_pythonlib.py --bytecode-pypy3.6 --verify
 
 #: PyPy 5.0.x with Python 3.6.9
-check-bytecode-pypy3.6: 7.2
-7.2:
+check-bytecode-pypy3.6: 7.2 7.3
+7.3 7.2:
 	$(PYTHON) test_pythonlib.py --bytecode-pypy3.6-run --verify-run
 	$(PYTHON) test_pythonlib.py --bytecode-pypy3.6 --verify
 

test/decompyle/test_loops2.py

@@ -8,7 +8,7 @@ See http://www.goebel-consult.de/decompyle/ for download and
 for further information
 """
 
-# This is a seperate test pattern, since 'continue' within 'try'
+# This is a separate test pattern, since 'continue' within 'try'
 # was not allowed till Python 2.1
 
 for term in args:

test/run-and-email.sh

@@ -3,32 +3,54 @@
 function displaytime {
     printf "ran in "
     local T=$1
-    local D=$((T/60/60/24))
-    local H=$((T/60/60%24))
-    local M=$((T/60%60))
-    local S=$((T%60))
-    (( $D > 0 )) && printf '%d days ' $D
-    (( $H > 0 )) && printf '%d hours ' $H
-    (( $M > 0 )) && printf '%d minutes ' $M
-    (( $D > 0 || $H > 0 || $M > 0 )) && printf 'and '
+    ((D=T/60/60/24))
+    ((H=T/60/60%24))
+    ((M=T/60%60))
+    ((S=T%60))
+    (( D > 0 )) && printf '%d days ' $D
+    (( H > 0 )) && printf '%d hours ' $H
+    (( M > 0 )) && printf '%d minutes ' $M
+    (( D > 0 || H > 0 || M > 0 )) && printf 'and '
     printf '%d seconds\n' $S
 }
 
-. ../admin-tools/pyenv-newer-versions
+bs=${BASH_SOURCE[0]}
+if [[ $0 != $bs ]] ; then
+    echo "This script should not be *sourced* but run through bash"
+    exit 1
+fi
 
+mydir=$(dirname $bs)
+cd $mydir
+
+branch=$(cat ../.git/HEAD | cut -d'/' -f 3)
+if [[ $branch == 'python-2.4' ]]; then
+    . ../admin-tools/pyenv-older-versions
+elif [[ $branch == 'master' ]]; then
+    . ../admin-tools/pyenv-newer-versions
+else
+    echo &1>2 "Error git branch should either be 'master' or 'python-2.4'; got: '$branch'"
+    exit 1
+fi
+
+MAIN="test_pyenvlib.py"
 USER=${USER:-rocky}
 EMAIL=${EMAIL:-rb@dustyfeet.com}
+WHAT="uncompyle6 2.4 ${MAIN}"
 MAX_TESTS=${MAX_TESTS:-800}
+export BATCH=1
+
 typeset -i RUN_STARTTIME=$(date +%s)
 
 # PYVERSIONS="3.5.6"
-actual_versions=""
+MAILBODY=/tmp/${MAIN}-mailbody-$$.txt
+# for VERSION in 2.4.6 2.5.9 ; do
 for VERSION in $PYVERSIONS ; do
     typeset -i rc=0
-    LOGFILE=/tmp/pyenvlib-$VERSION-$$.log
+    LOGFILE=/tmp/${MAIN}-$VERSION-$$.log
 
     case "$VERSION" in
-	3.7.6 | 3.8.1 | 3.1.5 | 3.0.1 )
+	3.7.7 | 3.8.2 | 3.1.5 | 3.0.1 )
 	    continue
 	    ;;
 	3.5.9 )
@@ -46,6 +68,12 @@ for VERSION in $PYVERSIONS ; do
 	3.6.10 )
 	    MAX_TESTS=1300  # about 2139 exist
 	    ;;
+	2.4.6 )
+	    MAX_TESTS=600
+	    ;;
+	2.5.6 )
+	    MAX_TESTS=600
+	    ;;
 	2.6.9 )
 	    MAX_TESTS=1300
 	    ;;
@@ -58,11 +86,13 @@ for VERSION in $PYVERSIONS ; do
 
     if ! pyenv local $VERSION ; then
 	rc=1
+	mailbody_line="pyenv local $VERSION not installed"
+	echo $mailbody_line >> $MAILBODY
     else
       echo Python Version $(pyenv local) > $LOGFILE
       echo "" >> $LOGFILE
       typeset -i ALL_FILES_STARTTIME=$(date +%s)
-      cmd="python ./test_pyenvlib.py --max ${MAX_TESTS} --syntax-verify --$VERSION"
+      cmd="python ./${MAIN} --max ${MAX_TESTS} --syntax-verify --$VERSION"
       echo "$cmd" >>$LOGFILE 2>&1
       $cmd >>$LOGFILE 2>&1
       rc=$?
@@ -72,20 +102,25 @@ for VERSION in $PYVERSIONS ; do
 
       typeset -i ALL_FILES_ENDTIME=$(date +%s)
       (( time_diff =  ALL_FILES_ENDTIME - ALL_FILES_STARTTIME))
-      displaytime $time_diff >> $LOGFILE
+      time_str=$(displaytime $time_diff)
+      echo ${time_str}. >> $LOGFILE
     fi
 
-    SUBJECT_PREFIX="pyenv weak verify (max $MAX_TESTS) for"
+    SUBJECT_PREFIX="$WHAT (max $MAX_TESTS) for"
     if ((rc == 0)); then
+	mailbody_line="Python $VERSION ok; ${time_str}."
 	tail -v $LOGFILE | mail -s "$SUBJECT_PREFIX $VERSION ok" ${USER}@localhost
     else
+	mailbody_line="Python $VERSION failed; ${time_str}."
 	tail -v $LOGFILE | mail -s "$SUBJECT_PREFIX $VERSION not ok" ${USER}@localhost
-	tail -v $LOGFILE | mail -s "$SUBJECT_PREFIX $VERSION not ok" ${EMAIL}
+	tail -v $LOGFILE | mail -s "$HOST $SUBJECT_PREFIX $VERSION not ok" ${EMAIL}
     fi
+    echo $mailbody_line >> $MAILBODY
     rm .python-version
 done
 
 typeset -i RUN_ENDTIME=$(date +%s)
 (( time_diff =  RUN_ENDTIME - RUN_STARTTIME))
 elapsed_time=$(displaytime $time_diff)
-echo "Run complete $elapsed_time for versions $actual_versions" | mail -s "pyenv weak verify in $elapsed_time" ${EMAIL}
+echo "${WHAT} complete; ${elapsed_time}." >> $MAILBODY
+cat $MAILBODY | mail -s "$HOST $WHAT ${elapsed_time}." ${EMAIL}

test/simple_source/branching/02_ifelse_lambda.py

@@ -22,7 +22,7 @@ assert i[0]('a') == True
 assert i[0]('A') == False
 
 # Issue #170. Bug is needing an "conditional_not_lambda" grammar rule
-# in addition the the "if_expr_lambda" rule
+# in addition the the "if_exp_lambda" rule
 j = lambda a: False if not a else True
 assert j(True) == True
 assert j(False) == False

test/simple_source/branching/10_if_else_ternary.py

@@ -1,8 +1,8 @@
 # Tests:
 
 # ret_expr_or_cond ::= ret_expr
-# ret_cond ::= expr POP_JUMP_IF_FALSE expr RETURN_END_IF ret_expr_or_cond
-# ret_expr_or_cond ::= ret_cond
+# if_exp_ret ::= expr POP_JUMP_IF_FALSE expr RETURN_END_IF ret_expr_or_cond
+# ret_expr_or_cond ::= if_exp_ret
 # ret_or ::= expr JUMP_IF_TRUE_OR_POP ret_expr_or_cond COME_FROM
 
 # See https://github.com/rocky/python-uncompyle6/issues/5

test/simple_source/bug26/00_future_divide.py

@@ -0,0 +1,4 @@
+# From 2.7.17 fractions
+"""Rational, infinite-precision, real numbers."""
+
+from __future__ import division

test/simple_source/bug26/03_weird26.py

@@ -8,7 +8,7 @@ list(x for x in range(10) if x % 2 if x % 3)
 
 # expresion which evaluates True unconditionally,
 # but leave dead code or junk around that we have to match on.
-# Tests "if_expr_true" rule
+# Tests "if_exp_true" rule
 5 if 1 else 2
 
 0 or max(5, 3) if 0 else 3

test/simple_source/bug27+/03_not_dead_code.py

@@ -1,6 +1,6 @@
 # Bug found in 2.7 test_itertools.py
-# Bug was erroneously using reduction to if_expr_true
-# A proper fix would be to use if_expr_true only when we
+# Bug was erroneously using reduction to if_exp_true
+# A proper fix would be to use if_exp_true only when we
 # can determine there is or was dead code.
 from itertools import izip_longest
 for args in [['abc', range(6)]]:

test/simple_source/bug30/05_block_fallback.py

@@ -0,0 +1,32 @@
+# Adapted from 3.7.6 test_contains
+# The bug was in reconstructing something equivalent to
+# "while False: yelid None" which is *needed* in __iter__().
+# Sheeh!
+
+# RUNNABLE!
+def test_block_fallback():
+    # blocking fallback with __contains__ = None
+    class ByContains(object):
+        def __contains__(self, other):
+            return False
+    c = ByContains()
+    class BlockContains(ByContains):
+        """Is not a container
+
+        This class is a perfectly good iterable (as tested by
+        list(bc)), as well as inheriting from a perfectly good
+        container, but __contains__ = None prevents the usual
+        fallback to iteration in the container protocol. That
+        is, normally, 0 in bc would fall back to the equivalent
+        of any(x==0 for x in bc), but here it's blocked from
+        doing so.
+        """
+        def __iter__(self):
+            while False:
+                yield None
+        __contains__ = None
+    bc = BlockContains()
+    assert not (0 in c)
+    assert not (0 in list(bc))
+
+test_block_fallback()

test/simple_source/bug31/04_def_annotate.py

@@ -66,6 +66,14 @@ def div(a: dict(type=float, help='the dividend'),
     """Divide a by b"""
     return a / b
 
+# From 3.7.6 functools.py
+# Bug is in picking up the annotation.
+def f(a:"This is a new annotation"):
+    """This is a test"""
+    assert f.__annotations__['a'] == "This is a new annotation"
+
+f(5)
+
 class TestSignatureObject1():
     def test_signature_on_wkwonly(self):
         def test(*, a:float, b:str, c:str = 'test', **kwargs: int) -> int:

test/simple_source/bug35/02_async_for.py

@@ -1,3 +1,12 @@
 async def a(b, c):
     async for b in c:
         pass
+
+# From 3.7 test_generators.py
+# Bug was getting indentation correct for multiple async's
+async def foo(X):
+    async for i in X:
+        pass
+    async for i in X:
+        pass
+    raise Done

test/simple_source/bug37/02_async_for_generator.py

@@ -6,3 +6,11 @@ def make_arange(n):
 
 async def run(m):
     return [i async for i in m]
+
+# From 3.7.6 test_coroutines.py
+async def run_list(pair, f):
+    return [i for pair in p async for i in f]
+
+# FIXME: add this. It works in decompyle3
+# async def run_gen():
+#     return (i async for i in f if 0 < i < 4)

test/simple_source/bug37/04_async.py

@@ -10,3 +10,14 @@ async def test_enter(self):
             x = 1
             y = 2
         assert manager is context
+
+# From 3.7.6 test_coroutines.py
+# Bug was different form of code for "async with" below
+class CoroutineTest():
+    def test_with_8(self):
+        CNT = 0
+        async def foo():
+            nonlocal CNT
+            async with CM():
+                CNT += 1
+                return

test/simple_source/def/05_abc_class.py

@@ -12,3 +12,9 @@ class abstractclassmethod(classmethod):
     def __init__(self, callable):
         callable.__isabstractmethod__ = True
         super().__init__(callable)
+
+# From 2.7.17 test_abc.py
+# Bug was handling OldstyleClass correctly without
+# a "return locals() but with a "pass"
+class OldstyleClass:
+    pass

test/simple_source/expression/09_yield_from.py

@@ -17,7 +17,7 @@ def ybug(g):
 # From 3.5.1 _wakrefset.py
 #
 #  3.5:
-#  withstmt ::= expr SETUP_WITH POP_TOP suite_stmts_opt
+#  with ::= expr SETUP_WITH POP_TOP suite_stmts_opt
 #           POP_BLOCK LOAD_CONST COME_FROM
 #           WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
 

test/simple_source/looping/08_while1_if_continue.py

@@ -7,3 +7,40 @@ def readline (self):
                 continue
 
         return
+
+# From 2.4.6 sre.py
+# Bug has to do with "break" not being recognized
+# and is a JUMP_FORWARD.
+def _parse(a, b, source, state):
+    while 1:
+        if b:
+            while 1:
+                break
+        else:
+            raise
+
+def _parse2(source, state):
+    while 1:
+        if a:
+            if b:
+                while 1:
+                    this = 1
+                    break
+                continue
+
+        while 1:
+            if b:
+                break
+
+        x = 3
+
+# Bug was in 2.3 decompilation
+def _parse3(source, state):
+    while 1:
+        if a:
+            if b:
+                x = 1
+                while 1:
+                    if a:
+                        break
+                    raise

test/simple_source/operation_logic/05_control_flow_bugs.py

@@ -0,0 +1,76 @@
+# From 3.6.10 test_binascii.py
+# Bug was getting "while c and noise" parsed correclty
+# and not put into the "ifelsesmt"
+
+# RUNNABLE!
+def addnoise(c, noise):
+    while c and noise:
+        if c < 3:
+            c = 2
+        else:
+            c = 3
+        noise = False
+    return c
+
+assert addnoise(0, True) == 0
+assert addnoise(1, False) == 1
+assert addnoise(2, True) == 2
+assert addnoise(3, True) == 3
+assert addnoise(4, True) == 3
+assert addnoise(5, False) == 5
+
+# From 3.6.10 test_dbm_dumb.py
+# Bug was getting attaching "else" to the right "if" in the
+# presense of a loop.
+def test_random(a, r):
+    x = 0
+    for dummy in r:
+        if dummy:
+            if a:
+                x += 2
+        else:
+            x += 1
+    return x
+
+assert test_random(True, [1]) == 2
+assert test_random(True, [1, 1]) == 4
+assert test_random(False, [1]) == 0
+assert test_random(False, [1, 1]) == 0
+
+# From 2.7.17 test_frozen.py
+# Bug was getting making sure we have "try" not
+# "try"/"else"
+def test_frozen(a, b):
+    try:
+        x = 1 / a
+    except:
+        x = 2
+
+    try:
+        x += 3 / b
+    except:
+        x += 4
+
+    return x
+
+assert test_frozen(1, 1) == 4.0
+assert test_frozen(0, 1) == 5.0
+assert test_frozen(0.5, 0) == 6.0
+assert test_frozen(0, 0.5) == 8.0
+
+# From 3.6.10 test_binop.py
+# Bug was getting "other += 3" outside of "if"/"else.
+def __floordiv__(a, b):
+    other = 0
+    if a:
+        other = 1
+    else:
+        if not b:
+            return 2
+    other += 3
+    return other
+
+assert __floordiv__(True, True) == 4
+assert __floordiv__(True, False) == 4
+assert __floordiv__(False, True) == 3
+assert __floordiv__(False, False) == 2

test/simple_source/stmts/03_if_elif.py

@@ -1,11 +1,13 @@
 # 2.6.9 symbols.py
 # Bug in 2.6 is having multple COME_FROMs due to the
 # "and" in the "if" clause
+
+# RUNNABLE
 if __name__:
     if __file__ and __name__:
         pass
-    elif __name__:
-        pass
+    elif not __name__:
+        assert False
 
 # 2.6.9 transformer.py
 # Bug in 2.6 is multple COME_FROMs as a result
@@ -21,3 +23,20 @@ elif __file__:
     assert __name__ or __file__
 else:
     pass
+
+# From 3.3.7 test_binop.py
+# Bug was in ifelsestmt(c) ensuring b+=5 is not in "else"
+# Also note: ifelsetmtc should not have been used since this
+# this is not in a loop!
+def __floordiv__(a, b):
+    if a:
+        b += 1
+    elif not b:
+        return a
+    b += 5
+    return b
+
+assert __floordiv__(1, 1) == 7
+assert __floordiv__(1, 0) == 6
+assert __floordiv__(0, 3) == 8
+assert __floordiv__(0, 0) == 0

test/stdlib/2.4-exclude.sh

@@ -0,0 +1,55 @@
+SKIP_TESTS=(
+    [test_aepack.py]=1 # it fails on its own
+    [test_al.py]=1 # it fails on its own
+    [test_applesingle.py]=1 # it fails on its own
+    [test_bsddb185.py]=1 # it fails on its own
+    [test_bsddb3.py]=1 # it fails on its own
+    [test_bsddb.py]=1 # it fails on its own
+    [test_cd.py]=1 # it fails on its own
+    [test_cl.py]=1 # it fails on its own
+    [test_codecmaps_cn.py]=1 # it fails on its own
+    [test_codecmaps_hk.py]=1 # it fails on its own
+    [test_codecmaps_jp.py]=1 # it fails on its own
+    [test_codecmaps_kr.py]=1 # it fails on its own
+    [test_codecmaps_tw.py]=1 # it fails on its own
+    [test_curses.py]=1 # it fails on its own
+    [test_dbm.py]=1 # it fails on its own
+    [test_dl.py]=1 # it fails on its own
+    [test_gdbm.py]=1 # it fails on its own
+    [test_gl.py]=1 # it fails on its own
+    [test_imageop.py]=1 # it fails on its own
+    [test_imgfile.py]=1 # it fails on its own
+    [test_linuxaudiodev.py]=1 # it fails on its own
+    [test_macfs.py]=1 # it fails on its own
+    [test_macostools.py]=1 # it fails on its own
+    [test_nis.py]=1 # it fails on its own
+    [test_normalization.py]=1 # it fails on its own
+    [test_ossaudiodev.py]=1 # it fails on its own
+    [test_pep277.py]=1 # it fails on its own
+    [test_plistlib.py]=1 # it fails on its own
+    [test_rgbimg.py]=1 # it fails on its own
+    [test_scriptpackages.py]=1 # it fails on its own
+    [test_socket_ssl.py]=1 # it fails on its own
+    [test_sunaudiodev.py]=1 # it fails on its own
+    [test_support.py]=1 # it fails on its own
+    [test_tcl.py]=1 # it fails on its own
+    [test_urllib2net.py]=1 # it fails on its own
+    [test_urllibnet.py]=1 # it fails on its own
+    [test_winreg.py]=1 # it fails on its own
+    [test_winsound.py]=1 # it fails on its own
+    [test_zlib.py]=1 # it fails on its own
+
+    [test_decimal.py]=1  #
+    [test_dis.py]=1   # We change line numbers - duh!
+    [test_generators.py]=1  # Investigate
+    [test_grammar.py]=1    # Too many stmts. Handle large stmts
+    [test_grp.py]=1      # Long test - might work Control flow?
+    [test_pep247.py]=1 # Long test - might work? Control flow?
+    [test_pwd.py]=1 # Long test - might work? Control flow?
+    [test_socketserver.py]=1 # -- test takes too long to run: 40 seconds
+    [test_threading.py]=1 # test takes too long to run: 11 seconds
+    [test_thread.py]=1 # test takes too long to run: 36 seconds
+    [test_trace.py]=1 # Long test - works
+    [test_zipfile64.py]=1  # Runs ok but takes 204 seconds
+)
+ # About 243 files, 0 in 19 minutes

test/stdlib/2.5-exclude.sh

@@ -1,4 +1,44 @@
 SKIP_TESTS=(
+    [test_aepack.py]=1 # it fails on its own
+    [test_al.py]=1 # it fails on its own
+    [test_applesingle.py]=1 # it fails on its own
+    [test_bsddb185.py]=1 # it fails on its own
+    [test_bsddb3.py]=1 # it fails on its own
+    [test_bsddb.py]=1 # it fails on its own
+    [test_cd.py]=1 # it fails on its own
+    [test_cl.py]=1 # it fails on its own
+    [test_codecmaps_cn.py]=1 # it fails on its own
+    [test_codecmaps_hk.py]=1 # it fails on its own
+    [test_codecmaps_jp.py]=1 # it fails on its own
+    [test_codecmaps_kr.py]=1 # it fails on its own
+    [test_codecmaps_tw.py]=1 # it fails on its own
+    [test_curses.py]=1 # it fails on its own
+    [test_dbm.py]=1 # it fails on its own
+    [test_dl.py]=1 # it fails on its own
+    [test_gdbm.py]=1 # it fails on its own
+    [test_gl.py]=1 # it fails on its own
+    [test_imageop.py]=1 # it fails on its own
+    [test_imgfile.py]=1 # it fails on its own
+    [test_linuxaudiodev.py]=1 # it fails on its own
+    [test_macfs.py]=1 # it fails on its own
+    [test_macostools.py]=1 # it fails on its own
+    [test_nis.py]=1 # it fails on its own
+    [test_normalization.py]=1 # it fails on its own
+    [test_ossaudiodev.py]=1 # it fails on its own
+    [test_pep277.py]=1 # it fails on its own
+    [test_plistlib.py]=1 # it fails on its own
+    [test_rgbimg.py]=1 # it fails on its own
+    [test_scriptpackages.py]=1 # it fails on its own
+    [test_sunaudiodev.py]=1 # it fails on its own
+    [test_support.py]=1 # it fails on its own
+    [test_tcl.py]=1 # it fails on its own
+    [test_urllib2net.py]=1 # it fails on its own
+    [test_urllibnet.py]=1 # it fails on its own
+    [test_winreg.py]=1 # it fails on its own
+    [test_winsound.py]=1 # it fails on its own
+    [test_zlib.py]=1 # it fails on its own
+
+
     [test_coercion.py]=1
     [test_decimal.py]=1
     [test_dis.py]=1        # We change line numbers - duh!
@@ -28,14 +68,19 @@ SKIP_TESTS=(
     [test_struct.py]=1 # "if and" confused for if .. assert and
     [test_sunaudiodev.py]=1 # it fails on its own
     [test_support.py]=1 # it fails on its own
-    [test_tcl.py=1] # it fails on its own
+    [test_tcl.py]=1 # it fails on its own
     [test_threading.py]=1 # test takes too long to run: 11 seconds
     [test_thread.py]=1 # test takes too long to run: 36 seconds
     [test_trace.py]=1  # Line numbers are expected to be different
     [test_urllib2net.py]=1 # is interactive?
     [test_urllibnet.py]=1 # it fails on its own
     [test_winreg.py]=1 # it fails on its own
-    [test_winsound.py[=1 # it fails on its own
+    [test_winsound.py]=1 # it fails on its own
     [test_zipfile64.py]=1  # Runs ok but takes 204 seconds
     [test_zlib]=1  # fails on its own
 )
+# About 265 tests in 14 minutes
+
+if (( BATCH )) ; then
+    SKIP_TESTS[test_doctest.py]=1 # Fails on ppc64le
+fi

test/stdlib/2.6-exclude.sh

@@ -85,7 +85,7 @@ SKIP_TESTS=(
 )
 # About 305 unit-test files in about 12 minutes
 
-if (( batch )) ; then
+if (( BATCH )) ; then
     # Fails in crontab environment?
     # Figure out what's up here
     SKIP_TESTS[test_aifc.py]=1

test/stdlib/2.7-exclude.sh

@@ -1,4 +1,6 @@
 SKIP_TESTS=(
+    [test_cgi.py]=1 # FIXME: Works on c90ff51
+
     [test_bsddb3.py]=1 # test takes too long to run: 110 seconds
     [test_compile.py]=1  # Code introspects on co_consts in a non-decompilable way
     [test_curses.py]=1  # Possibly fails on its own but not detected
@@ -25,6 +27,7 @@ SKIP_TESTS=(
     [test_ssl.py]=1  #
     [test_subprocess.py]=1 # Runs ok but takes 22 seconds
     [test_sys_settrace.py]=1 # Line numbers are expected to be different
+
     [test_tokenize.py]=1 # test takes too long to run: 19 seconds
     [test_traceback.py]=1 # Line numbers change - duh.
     [test_unicode.py]=1  # Too long to run 11 seconds
@@ -34,7 +37,7 @@ SKIP_TESTS=(
 )
 # 334 unit-test files in about 15 minutes
 
-if (( batch )) ; then
+if (( BATCH )) ; then
     # Fails in crontab environment?
     # Figure out what's up here
     SKIP_TESTS[test_array.py]=1
@@ -43,6 +46,7 @@ if (( batch )) ; then
     SKIP_TESTS[test_doctest2.py]=1 # a POWER thing?
     SKIP_TESTS[test_httplib.py]=1  # Ok, but POWER has problems with this
     SKIP_TESTS[test_pdb.py]=1 # Ok, but POWER has problems with this
+    SKIP_TESTS[test_tarfile.py]=1 # test can take over 15 seconds to run on an overloaded POWER7 system
 
     # SyntaxError: Non-ASCII character '\xdd' in file test_base64.py on line 153, but no encoding declared; see http://www.python.org/peps/pep-0263.html for details
     SKIP_TESTS[test_base64.py]=1

test/stdlib/3.2-exclude.sh

@@ -1,14 +1,5 @@
 SKIP_TESTS=(
-    [test_decorators.py]=1 # FIXME: Works on c90ff51
-    [test_optparse.py]=1 # FIXME: Works on c90ff51
-    [test_os.py]=1 # FIXME: Works on c90ff51
-    [test_pyclbr.py]=1 # FIXME: Works on c90ff51
-    [test_strftime.py]=1 # FIXME: Works on c90ff51
-
-    [test_binop.py]=1 # FIXME: Works on c90ff51?
-    [test_cgi.py]=1 # FIXME: Works on c90ff51?
     [test_descr.py]=1 # FIXME: Works on c90ff51?
-    [test_doctest2.py]=1 # FIXME: Works on c90ff51?
 
     [test_cmd_line.py]=1
     [test_collections.py]=1
@@ -40,7 +31,7 @@ SKIP_TESTS=(
 
 )
 
-if (( batch )) ; then
+if (( BATCH )) ; then
     # Fails in crontab environment?
     # Figure out what's up here
     SKIP_TESTS[test_exception_variations.py]=1

test/stdlib/3.3-exclude.sh

@@ -1,20 +1,9 @@
 SKIP_TESTS=(
-    [test_binop.py]=1 # FIXME: Works on c90ff51
-    [test_cgi.py]=1 # FIXME: Works on c90ff51
-    [test_decorators.py]=1 # FIXME: Works on c90ff51
-    [test_pyclbr.py]=1 # FIXME: Works on c90ff51
-    [test_optparse.py]=1 # FIXME: Works on c90ff51
-    [test_os.py]=1 # FIXME: Works on c90ff51
-    [test_pep352.py]=1 # FIXME: Works on c90ff51
-    [test_pyclbr.py]=1 # FIXME: Works on c90ff51
-    [test_shutil.py]=1 # FIXME: Works on c90ff51
-    [test_strftime.py]=1 # FIXME: Works on c90ff51
-    [test_symtable.py]=1 # FIXME: Works on c90ff51
+    [test_buffer.py]=1  # FIXME: Works on c90ff51
+    [test_cmath.py]=1  # FIXME: Works on c90ff51
 
     [test_atexit.py]=1  # The atexit test starting at 3.3 looks for specific comments in error lines
 
-    [test_buffer.py]=1  # parse error
-
     [test_cmd_line.py]=1 # too long?
     [test_concurrent_futures.py]=1  # too long?
 
@@ -42,6 +31,7 @@ SKIP_TESTS=(
 
     [test_nntplib.py]=1
 
+    [test_pep352.py]=1  # test failures
     [test_peepholer.py]=1
     [test_poll.py]=1  # test takes too long to run: 11 seconds
     [test_pty.py]=1  # FIXME: Needs grammar loop isolation separation
@@ -69,7 +59,7 @@ SKIP_TESTS=(
 )
 # About 300 unit-test files in about 20 minutes
 
-if (( batch )) ; then
+if (( BATCH )) ; then
     SKIP_TESTS[test_ftplib.py]=1  # Runs too long on POWER; over 15 seconds
     SKIP_TESTS[test_idle.py]=1  # No tk
     SKIP_TESTS[test_pep352.py]=1  # UnicodeDecodeError may be funny on weird environments

test/stdlib/3.4-exclude.sh

@@ -1,20 +1,18 @@
 SKIP_TESTS=(
     [test_buffer.py]=1  # FIXME: Works on c90ff51
-    [test_decorators.py]=1 # FIXME: Works on c90ff51
-    [test_faulthandler.py]=1 # FIXME: too long to run 20 seconds. Works on c90ff51
-    [test_decimal.py]=1 # FIXME: Works on c90ff51
-    [test_optparse.py]=1 # FIXME: Works on c90ff51
-    [test_os.py]=1 # FIXME: Works on c90ff51
-    [test_shutil.py]=1 # FIXME: Works on c90ff51
+    [test_cmath.py]=1  # FIXME: Works on c90ff51
     [test_strftime.py]=1  # FIXME: Works on c90ff51
 
     [test___all__.py]=1  # it fails on its own
     [test_atexit.py]=1  # The atexit test looks for specific comments in error lines
+
     [test_cmd_line.py]=1 # takes too long to run
     [test_concurrent_futures.py]=1  # too long?
+
     [test_configparser.py]=1  # Doesn't terminate
     [test_ctypes.py]=1 # it fails on its own
     [test_curses.py]=1 # Investigate
+
     [test_dbm_gnu.py]=1   # fails on its own
     [test_devpoll.py]=1 # it fails on its own
     [test_descr.py]=1   # test assertion errors
@@ -23,33 +21,44 @@ SKIP_TESTS=(
     [test_doctest2.py]=1
     [test_doctest.py]=1  # test assert failures
     [test_docxmlrpc.py]=1
+
     [test_enum.py]=1 # compile syntax?
     [test_exceptions.py]=1
+
     [test_faulthandler.py]=1
     [test_file_eintr.py]=1   # parse error
     [test_fork1.py]=1 # too long
+
     [test_gdb.py]=1 # it fails on its own
     [test_grammar.py]=1 # parse error
+
     [test_httplib.py]=1 # it fails on its own
+
     [test_import.py]=1 # it fails on its own
     [test_io.py]=1
     [test_ioctl.py]=1 # it fails on its own
     [test_inspect.py]=1 # Syntax error Investigate
+
     [test_logging.py]=1 # Too long to run
     [test_long.py]=1 # FIXME: Works on c90ff51
+
     [test_modulefinder.py]=1  # test assertion error
     [test_multiprocessing_fork.py]=1 # doesn't terminate
     [test_multiprocessing_forkserver.py]=1 # doesn't terminate
     [test_multiprocessing_main_handling.py]=1  # doesn't terminate
     [test_multiprocessing_spawn.py]=1 # doesn't terminate
+
     [test_nntplib.py]=1 # too long to run
+
     [test_peepholer.py]=1 # control flow?
     [test_pep352.py]=1 # test assert failures
     [test_pickle.py]=1 # test assert failures
     [test_pkgimport.py]=1 # long
     [test_poll.py]=1 # Too long to run: 11 seconds
     [test_pydoc.py]=1 # test assertion failures
+
     [test_runpy.py]=1 # Too long:
+
     [test_select.py]=1 # Too long: 11 seconds
     [test_selectors.py]=1  # Too long: 11 seconds
     [test_signal.py]=1 # Too long: 22 seconds
@@ -59,12 +68,15 @@ SKIP_TESTS=(
     [test_subprocess.py]=1 # Too long
     [test_symtable.py]=1 # Investigate bad output
     [test_sys_settrace.py]=1 # test assert failures
+
     [test_tcl.py]=1 # May be implementation specific. On POWER though it fails
     [test_threading.py]=1 # Too long
     [test_threadsignals.py]=1 # Too long to run: 12 seconds
     [test_timeout.py]=1 # Too long to run: 19 seconds
     [test_traceback.py]=1 # introspects on code
+
     [test_urllib2net.py]=1 # Doesn't terminate
+
     [test_zipfile64.py]=1
     [test_zlib.py]=1
 )

test/stdlib/3.5-exclude.sh

@@ -1,20 +1,7 @@
 SKIP_TESTS=(
     [test_buffer.py]=1  # FIXME: Works on c90ff51
-    [test_decorators.py]=1 # FIXME: Works on c90ff51
-    [test_faulthandler.py]=1 # FIXME: too long to run 20 seconds. Works on c90ff51
-    [test_ftplib.py]=1 # Works on c90ff51
-    [test_marshal.py]=1 # FIXME: Works on c90ff51
-    [test_optparse.py]=1 # FIXME: Works on c90ff51
-    [test_os.py]=1 # FIXME: Works on c90ff51
     [test_platform.py]=1  # FIXME: Works on c90ff51
-    [test_poplib.py]=1 # FIXME: Works on c90ff51
     [test_pyclbr.py]=1  # FIXME: Works on c90ff51
-    [test_smtplib.py]=1 # FIXME: Works on c90ff51
-    [test_strftime.py]=1 # FIXME: Works on c90ff51
-    [test_shutil.py]=1 # FIXME: Works on c90ff51
-    [test_sysconfig.py]=1 # FIXME: Works on c90ff51
-    [test_tempfile.py]=1 # FIXME: Works on c90ff51
-    [test_uu.py]=1 # FIXME: Works on c90ff51
 
     [test___all__.py]=1 # it fails on its own
     [test_aifc.py]=1  #
@@ -33,7 +20,6 @@ SKIP_TESTS=(
     [test_collections.py]=1
     [test_compile.py]=1  # Code introspects on co_consts in a non-decompilable way
     [test_concurrent_futures.py]=1 # Takes long to run
-    [test_coroutines.py]=1 # Syntax error Investigate
     [test_curses.py]=1 #
 
     [test_devpoll.py]=1 # it fails on its own
@@ -50,6 +36,7 @@ SKIP_TESTS=(
     [test_exceptions.py]=1 # parse error
 
     [test_format.py]=1
+    [test_ftplib.py]=1 # Test assertion failures
 
     [test_gdb.py]=1 # it fails on its own
     [test_glob.py]=1 #
@@ -65,6 +52,7 @@ SKIP_TESTS=(
     [test_logging.py]=1 #
     [test_long.py]=1 # too long run time: 20 seconds
 
+    [test_marshal.py]=1 # test assertion errors
     [test_math.py]=1 # test assertion errors TypeError: a float is required
     [test_modulefinder.py]=1  # test assertion error
     [test_msilib.py]=1 # it fails on its own
@@ -99,7 +87,7 @@ SKIP_TESTS=(
     [test_selectors.py]=1 # Takes too long 17 seconds
     [test_set.py]=1 # # test assert failure and doesn't terminate
     [test_signal.py]=1 # too long?
-    [test_smtpd.py]=1 # test failures
+    [test_smtplib.py]=1 # probably control flow
     [test_socket.py]=1 # long
     [test_socketserver.py]=1
     [test_strtod.py]=1 # Test assert failure
@@ -108,6 +96,7 @@ SKIP_TESTS=(
     [test_sys_settrace.py]=1 # test assert fail
 
     [test_tcl.py]=1  # it fails on its own
+    [test_tempfile.py]=1  # test assertion failures
     [test_thread.py]=1
     [test_threading.py]=1
     [test_timeout.py]=1
@@ -123,6 +112,7 @@ SKIP_TESTS=(
     [test_urllib2net.py]=1 # it fails on its own
     [test_urllibnet.py]=1 # it fails on its own
     [test_urlparse.py]=1 # test assert error
+    [test_uu.py]=1 # test assert error
 
     [test_winreg.py]=1 # it fails on its own
     [test_winsound.py]=1 # it fails on its own
@@ -137,18 +127,19 @@ SKIP_TESTS=(
 )
 # About 260 unit-test in about 16 minutes
 
-if (( batch )) ; then
-    # Fails in crontab environment?
-    # Figure out what's up here
+if (( BATCH )) ; then
+    SKIP_TESTS[test_asyncore.py]=1 # Ok, but takes more than 15 seconds to run
     SKIP_TESTS[test_bisect.py]=1
-    SKIP_TESTS[test_buffer.py]=1  # too long
     SKIP_TESTS[test_compileall.py]=1  # Something weird on POWER
     SKIP_TESTS[test_codeccallbacks.py]=1 # Something differenet in locale?
     SKIP_TESTS[test_distutils.py]=1
 
     SKIP_TESTS[test_exception_variations.py]=1
-    SKIP_TESTS[test_quopri.py]=1
     SKIP_TESTS[test_ioctl.py]=1 # it fails on its own
+    SKIP_TESTS[test_poplib.py]=1 # May be a result of POWER installation
+
+    SKIP_TESTS[test_quopri.py]=1
+    SKIP_TESTS[test_sysconfig.py]=1 # POWER extension fails
     SKIP_TESTS[test_tarfile.py]=1 # too long to run on POWER 15 secs
     SKIP_TESTS[test_venv.py]=1 # takes too long 11 seconds
 fi

test/stdlib/3.6-exclude.sh

@@ -1,14 +1,13 @@
 SKIP_TESTS=(
-    [test_binop.py]=1 # FIXME: Works on c90ff51
+    [test_ast.py]=1 # FIXME: Works on c90ff51
     [test_cmath.py]=1  # FIXME: Works on c90ff51
-    [test_decorators.py]=1 # FIXME: Works on c90ff51
-    [test_format.py]=1  # FIXME: works on c90ff51
-    [test_locale.py]=1 # FIXME: Works on c90ff51
-    [test_optparse.py]=1 # FIXME: Works on c90ff51
-    [test_os.py]=1 # FIXME: Works on c90ff51
-    [test_pyclbr.py]=1 # FIXME: Works on c90ff51
+    [test_format.py]=1 # FIXME: Works on c90ff51
+    [test_ftplib.py]=1 # FIXME: Works on c90ff51
+    [test_slice.py]=1 # FIXME: Works on c90ff51
     [test_sort.py]=1 # FIXME: Works on c90ff51
     [test_strftime.py]=1 # FIXME: Works on c90ff51
+    [test_timeit.py]=1 # FIXME: Works on c90ff51
+    [test_os.py]=1 # parse error FIXME: Works on c90ff51
 
     [test___all__.py]=1  # it fails on its own
     [test_aifc.py]=1  #
@@ -22,9 +21,10 @@ SKIP_TESTS=(
     [test_bisect.py]=1  # it fails on its own
     [test_buffer.py]=1  # parse error
     [test_builtin.py]=1  # Fails on its own
+
     [test test_capi.py]=1 # it fails on its own
     [test_cmd_line.py]=1 # Interactive?
-
+    [test_codeccallbacks.py]=1 # TypeError: ... must return (str/bytes, int) tuple
     [test_codecencodings_cn.py]=1 # it fails on its own
     [test_codecencodings_hk.py]=1 # it fails on its own
     [test_codecencodings_iso2022.py]=1 # it fails on its own
@@ -42,13 +42,14 @@ SKIP_TESTS=(
     [test_concurrent_futures.py]=1 # Takes long
     [test_contextlib.py]=1 # test assertion failure
     [test_contextlib_async.py]=1 # Investigate
-    [test_coroutines.py]=1 # Parse error
+    [test_coroutines.py]=1 # parse error
     [test_curses.py]=1 # Parse error
     [test_ctypes.py]=1 # it fails on its own
 
     [test_datetime.py]=1 # it fails on its own
     [test_dbm_ndbm.py]=1 # it fails on its own
     [test_decimal.py]=1
+    [test_decorators.py]=1 # control-flow failures
     [test_descr.py]=1   # syntax error: Investigate
     [test_devpoll.py]=1 # it fails on its own
     [test_dict.py]=1 # it fails on its own
@@ -106,7 +107,8 @@ SKIP_TESTS=(
     [test_nntplib.py]=1 # test takes too long to run: 31 seconds
     [test_normalization.py]=1 # it fails on its own
 
-    [test_ordered_dict.py]= # it fails on its own
+    [test_optparse.py]=1 # test fails
+    [test_ordered_dict.py]=1 # it fails on its own
     [test_ossaudiodev.py]=1 # it fails on its own
 
     [test_pdb.py]=1 # Probably introspection
@@ -147,11 +149,13 @@ SKIP_TESTS=(
     [test_startfile.py]=1 # it fails on its own
     [test_statistics.py]=1 # it fails on its own
     [test_string_literals.py]=1
+    [test_strftime.py]=1 # test assertion failures
     [test_strtod.py]=1 # it fails on its own
     [test_struct.py]=1  # test assertion errors
     [test_subprocess.py]=1
     [test_sys.py]=1 # Investigate confusing "and" with nested "if" when there is an "else
     [test_sys_settrace.py]=1 # parse error
+    [test_sysconfig.py]=1 # if confused for ifelse in "test_triplet_in_ext_suffix"
 
     [test_tarfile.py]=1 # it fails on its own
     [test_tcl.py]=1 # Test assert failures
@@ -159,6 +163,9 @@ SKIP_TESTS=(
     [test_thread.py]=1 # it fails on its own
     [test_threading.py]=1
     [test_threadsignals.py]=1
+
+    [test_time.py]=1 # Works but not on POWER: Rounding error?
+
     [test_timeout.py]=1
     [test_tix.py]=1 # it fails on its own
     [test_tk.py]=1 # it fails on its own
@@ -177,6 +184,7 @@ SKIP_TESTS=(
     [test_urllib2.py]=1 # it fails on its own
     [test_urllibnet.py]=1 # it fails on its own
     [test_urllib.py]=1 # it fails on its own
+    [test_urlparse.py]=1 # test failure
 
     [test_venv.py]=1 # test takes too long to run: 13 seconds
 
@@ -195,8 +203,10 @@ SKIP_TESTS=(
 )
 # 236 unit-test files in about 13 minutes
 
-if (( batch )) ; then
+if (( BATCH )) ; then
     SKIP_TESTS[test_codeccallbacks.py]=1
+    SKIP_TESTS[test_complex.py]=1 # Something funky with POWER8
+
     # locale on test machine is probably customized
     SKIP_TESTS[test__locale.py]=1
 fi

test/stdlib/3.7-exclude.sh

@@ -1,136 +1,149 @@
 SKIP_TESTS=(
+    [test_builtin.py]=1 # FIXME works on decompyle6
+    [test_context.py]=1 # FIXME works on decompyle6
+    [test_doctest2.py]=1 # FIXME works on decompyle6
+    [test_format.py]=1 # FIXME works on decompyle6
+    [test_marshal.py]=1 # FIXME works on decompyle6
+    [test_normalization.py]=1 # FIXME works on decompyle6
+    [test_os.py]=1 # FIXME works on decompyle6
+    [test_pow.py]=1 # FIXME works on decompyle6
+    [test_slice.py]=1 # FIXME works on decompyle6
+    [test_sort.py]=1 # FIXME works on decompyle6
+    [test_statistics.py]=1 # FIXME works on decompyle6
+    [test_timeit.py]=1 # FIXME works on decompyle6
+    [test_urllib2_localnet.py]=1 # FIXME works on decompyle6
+    [test_urllib2.py]=1 # FIXME: works on uncompyle6
+    [test_generators.py]=1  # FIXME: works on uncompyle6 - lambda parsing probably
+    [test_grammar.py]=1 # FIXME: works on uncompyle6 - lambda parsing probably
+
     [test___all__.py]=1 # it fails on its own
     [test_argparse.py]=1 #- it fails on its own
     [test_asdl_parser.py]=1 # it fails on its own
-    [test_ast.py]=1  # Depends on comments in code
     [test_atexit.py]=1  # The atexit test looks for specific comments in error lines
     [test_baseexception.py]=1  # UnboundLocalError: local variable 'exc' referenced before assignment
     [test_bdb.py]=1  #
-    [test_buffer.py]=1  # test assertion errors
-    [test_builtin.py]=1  # parse error, but decompyle3 doesn't have this. (It has test assert failures though)
+    [test_buffer.py]=1  # parse error
     [test_clinic.py]=1 # it fails on its own
     [test_cmath.py]=1 # test assertion failure
     [test_cmd_line.py]=1  # Interactive?
     [test_cmd_line_script.py]=1
-    [test_compare.py]=1 # Weird test assert faiure AssertionError: [1] == [1]
     [test_compileall.py]=1 # fails on its own
     [test_compile.py]=1  # Code introspects on co_consts in a non-decompilable way
     [test_concurrent_futures.py]=1 # too long
-    [test_context.py]=1
-    [test_coroutines.py]=1 # Investigate: Parse error - async/yield  stuff?
+    [test_coroutines.py]=1 # parse error
     [test_codecs.py]=1 # test assert failures; encoding/decoding stuff
     [test_ctypes.py]=1 # it fails on its own
     [test_curses.py]=1 # probably byte string not handled properly
     [test_dataclasses.py]=1   # FIXME: control flow probably: AssertionError: unknown result 'exception'
     [test_datetime.py]=1   # Takes too long
-    [test_dbm_gnu.py]=1   # Takes too long
     [test_dbm_ndbm.py]=1 # it fails on its own
-    [test_decimal.py]=1   # test assertion failures
+    [test_decimal.py]=1   # parse error
     [test_descr.py]=1   # test assertion failures
     [test_devpoll.py]=1 # it fails on its own
-    [test_dis.py]=1   # We change line numbers - duh!
-    [test_doctest2.py]=1 # FIXME: assert failure - works on decompyle3
+    [test_dis.py]=1   # Investigate async out of place. Then We change line numbers - duh!
+    [test_doctest.py]=1   # test failures
     [test_docxmlrpc.py]=1
+
     [test_enum.py]=1   # probably bad control flow
-    [test_faulthandler.py]=1   # takes too long
-    [test_fcntl.py]=1
+
+    [test_faulthandler.py]=1   # test takes too long before decompiling
     [test_fileinput.py]=1 # Test assertion failures
-    [test_format.py]=1 # Probably not handling bytestrings properly
     [test_frame.py]=1 # test assertion errors
     [test_ftplib.py]=1 # parse error
-    [test_functools.py]=1 # parse error
     [test_fstring.py]=1 # need to disambiguate leading fstrings from docstrings
+    [test_functools.py]=1 # parse error
+
     [test_gdb.py]=1 # it fails on its own
-    [test_generators.py]=1  # Investigate improper lamdba with bogus "False" added
     [test_glob.py]=1  # TypeError: join() argument must be str or bytes, not 'tuple'
-    [test_grammar.py]=1 # investigate: index out of range in decompiler (template_engine?)
     [test_grp.py]=1 # Doesn't terminate (killed)
-    [test_hashlib.py]=1 # test assert failures
-    [test_imaplib-3.7.py]=1  # test assert failures
-    [test_idle.py]=1 # Probably installation specific
+
+    [test_imaplib.py]=1  # test run loops before decompiling? More than 15 seconds to run
     [test_io.py]=1 # test takes too long to run: 37 seconds
-    [test_imaplib.py]=1 # test assert failures
+    [test_imaplib.py]=1 # decompiled test loops - killing after 15 seconds
     [test_inspect.py]=1 # Investigate test failures involving lambda
+
     [test_kqueue.py]=1 # it fails on its own
+
     [test_lib2to3.py]=1 # it fails on its own
     [test_long.py]=1 # FIX: if boundaries wrong in Rat __init__
     [test_logging.py]=1 # test takes too long to run: 20 seconds
-    [test_mailbox.py]=1
-    [test_marshal.py]=1
+
+    [test_mailbox.py]=1 # probably control flow
     [test_math.py]=1  # test assert failures
-    [test_modulefinder.py]=1
-    [test_msilib.py]=1
+    [test_msilib.py]=1 # it fails on its own
     [test_multiprocessing_fork.py]=1 # test takes too long to run: 62 seconds
     [test_multiprocessing_forkserver.py]=1
     [test_multiprocessing_spawn.py]=1
-    [test_normalization.py]=1 # probably control flow (uninitialized variable)
-    [test_nntplib.py]=1
+
+    [test_nntplib.py]=1 # Too long in running before decomplation takes 25 seconds
+
     [test_optparse.py]=1 # doesn't terminate at test_consume_separator_stop_at_option
-    [test_os.py]=1 # probably control flow (uninitialized variable)
     [test_ossaudiodev.py]=1 # it fails on its own
+
     [test_pdb.py]=1 # Probably relies on comments
     [test_peepholer.py]=1 # test assert error
-    [test_pickle.py]=1 # Probably relies on comments
-    [test_poll.py]=1
-    [test_poplib.py]=1
-    [test_pydoc.py]=1 # it fails on its own
-    [test_runpy.py]=1  #
     [test_pkg.py]=1 # Investigate: lists differ
     [test_pkgutil.py]=1 # Investigate:
-    [test_platform.py]=1 # probably control flow: uninitialized variable
-    [test_pow.py]=1 # probably control flow: test assertion failure
+    [test_poll.py]=1 # Takes too long to run before decompiling 11 seconds
     [test_pwd.py]=1 # killing - doesn't terminate
+    [test_pydoc.py]=1 # it fails on its own
+
     [test_regrtest.py]=1 # lists differ
-    [test_re.py]=1 # test assertion error
     [test_richcmp.py]=1 # parse error
+    [test_runpy.py]=1  # Too long to run before decompiling
+
     [test_select.py]=1 # test takes too long to run: 11 seconds
-    [test_selectors.py]=1
+    [test_selectors.py]=1 # Takes too long to run before decompling: 17 seconds
     [test_shutil.py]=1 # fails on its own
-    [test_signal.py]=1 #
-    [test_slice.py]=1 # test assert error in data; Investigate
-    [test_smtplib.py]=1 #
-    [test_socket.py]=1
-    [test_socketserver.py]=1
-    [test_sort.py]=1 # Probably control flow; unintialized varaible
-    [test_ssl.py]=1 # Probably control flow; unintialized varaible
+    [test_signal.py]=1 # Takes too long to run before decompiling: 22 seconds
+    [test_smtplib.py]=1 # test failures
+    [test_socket.py]=1 # Takes too long to run before decompiling
+    [test_ssl.py]=1 # Takes too long to run more than 15 seconds. Probably control flow; unintialized variable
     [test_startfile.py]=1 # it fails on its own
-    [test_statistics.py]=1 # Probably control flow; unintialized varaible
-    [test_string_literals.py]=1 # Investigate boolean parsing
-    [test_strptime.py]=1 # test assertions failed
+    [test_strptime.py]=1 # parfse error
     [test_strtod.py]=1 # test assertions failed
-    [test_structmembers.py]=1 # test assertions failed
-    [test_struct.py]=1 # test assertions failed
-    [test_subprocess.py]=1
-    [test_sys_setprofile.py]=1 # test assertions failed
+    [test_struct.py]=1 # probably control flow
+    [test_subprocess.py]=1 # Takes too long to run before decompile: 25 seconds
     [test_sys_settrace.py]=1 # parse error
+
     [test_tarfile.py]=1 # test assertions failed
-    [test_threading.py]=1 #
-    [test_timeit.py]=1 # probably control flow uninitialized variable
+    [test_threading.py]=1 # test assertion failers
     [test_tk.py]=1  # test takes too long to run: 13 seconds
-    [test_tokenize.py]=1
+    [test_tokenize.py]=1 # test takes too long to run before decompilation: 43 seconds
     [test_trace.py]=1  # it fails on its own
     [test_traceback.py]=1 # Probably uses comment for testing
-    [test_tracemalloc.py]=1 #
+    [test_tracemalloc.py]=1 # test assert failres
+    [test_ttk_guionly.py]=1  # implementation specfic and test takes too long to run: 19 seconds
     [test_ttk_guionly.py]=1  # implementation specfic and test takes too long to run: 19 seconds
     [test_typing.py]=1 # parse error
     [test_types.py]=1 # parse error
+
     [test_unicode.py]=1 # unicode thing
-    [test_urllib2_localnet.py]=1 #
     [test_urllibnet.py]=1 # probably control flow - uninitialized variable
+
     [test_weakref.py]=1 # probably control flow - uninitialized variable
     [test_with.py]=1 # probably control flow - uninitialized variable
-    [test_xml_dom_minicompat.py]=1 # FIXME: parse error; imports again
+
     [test_winconsoleio.py]=1 # it fails on its own
     [test_winreg.py]=1 # it fails on its own
     [test_winsound.py]=1 # it fails on its own
+
     [test_zipfile.py]=1 # it fails on its own
     [test_zipfile64.py]=1 # Too long to run
 )
-# 278 unit-test files in about 15 minutes
+# 306 unit-test files in about 19 minutes
 
-if (( batch )) ; then
+if (( BATCH )) ; then
+    SKIP_TESTS[test_capi.py]=1 # more than 15 secs to run on POWER
+    SKIP_TESTS[test_dbm_gnu.py]=1 # fails on its own on POWER
     SKIP_TESTS[test_distutils.py]=1
     SKIP_TESTS[test_fileio.py]=1
     SKIP_TESTS[test_gc.py]=1
+    SKIP_TESTS[test_idle.py]=1 # Probably installation specific
+    SKIP_TESTS[test_sqlite.py]=1 # fails on its own on POWER
+    SKIP_TESTS[test_tix.py]=1 # it fails on its own
+    SKIP_TESTS[test_ttk_textonly.py]=1 # Installation dependent?
+    SKIP_TESTS[test_venv.py]=1 # Too long to run: 11 seconds
     SKIP_TESTS[test_zipimport_support.py]=1
+
 fi

test/stdlib/3.8-exclude.sh

@@ -1,152 +1,337 @@
 SKIP_TESTS=(
+    [test_time.py]=1 # FIXME: works on uncompyle6?
+    [test_urllib2.py]=1 # FIXME: works on uncompyle6?
+    [test_zipimport.py]=1 # FIXME: works on uncompyle6
+
     [test___all__.py]=1 # it fails on its own
+    [test_aifc.py]=1 # parse error
     [test_argparse.py]=1 #- it fails on its own
+    [test_array.py]=1 #- parse error
     [test_asdl_parser.py]=1 # it fails on its own
     [test_ast.py]=1  # Depends on comments in code
+    [test_asyncgen.py]=1 # parse error
+    [test_asynchat.py]=1 # parse error
+    [test_asyncore.py]=1 # parse error
     [test_atexit.py]=1  # The atexit test looks for specific comments in error lines
+    [test_audioop.py]=1  # test failure
+    [test_audit.py]=1  # parse error
 
+    [test_base64.py]=1  # parse error
     [test_baseexception.py]=1  #
+    [test_bigaddrspace.py]=1  # parse error
+    [test_bigmem.py]=1  # parse error
     [test_bdb.py]=1  #
+    [test_binascii.py]=1  # test failure
+    [test_binhex.py]=1  # parse error
+    [test_binop.py]=1  # parse error
+    [test_bool.py]=1  # parse error
     [test_buffer.py]=1  # parse error
     [test_builtin.py]=1  # parse error
+    [test_bytes.py]=1  # parse error
+    [test_bz2.py]=1  # parse error
 
+    [test_calendar.py]=1  # parse error
+    [test_cgi.py]=1  # parse error
+    [test_cgitb.py]=1  # parse error
     [test_clinic.py]=1 # it fails on its own
     [test_cmath.py]=1 # test assertion failure
+    [test_cmd.py]=1  # parse error
     [test_cmd_line.py]=1  # Interactive?
     [test_cmd_line_script.py]=1
+    [test_code_module.py]=1 # test failure
+    [test_codecmaps_cn.py]=1 # test before decompile takes too long to run 135 secs
+    [test_codecmaps_hk.py]=1 # test before decompile takes too long to run 46 secs
+    [test_codecs.py]=1
     [test_collections.py]=1
     [test_compare.py]=1
-    [test_compileall.py]=1 # fails on its own
     [test_compile.py]=1
+    [test_compileall.py]=1 # fails on its own
+    [test_complex.py]=1 # Investigate
     [test_concurrent_futures.py]=1 # too long
     [test_configparser.py]=1
     [test_context.py]=1
+    [test_contextlib.py]=1 # parse error
+    [test_contextlib_async.py]=1 # parse error
     [test_coroutines.py]=1 # Parse error
-    [test_codecs.py]=1
-    [test_compile.py]=1  # Parse error, but after that, the code introspects on co_consts in a non-decompilable way
-    [test_complex.py]=1 # Investigate
+    [test_cprofile.py]=1 # parse error
     [test_crypt.py]=1 # Parse error
+    [test_csv.py]=1 # Parse error
     [test_ctypes.py]=1 # it fails on its own
     [test_curses.py]=1 # Parse error
 
     [test_dataclasses.py]=1  # test assertion errors
     [test_datetime.py]=1   # Takes too long
+    [test_dbm.py]=1   # parse error
+    [test_dbm_dumb.py]=1   # parse error
     [test_dbm_gnu.py]=1   # Takes too long
     [test_dbm_ndbm.py]=1 # it fails on its own
     [test_decimal.py]=1   # Parse error
+    [test_decorators.py]=1   # parse error
+    [test_deque.py]=1   # parse error
     [test_descr.py]=1   # Parse error
+    [test_descrtut.py]=1   # parse error
     [test_devpoll.py]=1 # it fails on its own
+    [test_dict.py]=1   # parse error
     [test_dictcomps.py]=1 # Bad semantics - Investigate
+    [test_difflib.py]=1   # parse error
     [test_dis.py]=1   # We change line numbers - duh!
+    [test_doctest.py]=1 # parse error
     [test_docxmlrpc.py]=1
+    [test_dtrace.py]=1 # parse error
+    [test_dummy_thread.py]=1 # parse error
 
-    [test_exceptions.py]=1   # parse error
-    [test_enumerate.py]=1   #
+    [test_embed.py]=1   # parse error
+    [test_ensureip.py]=1   #
+    [test_ensurepip.py]=1 # parse error
     [test_enum.py]=1   #
+    [test_enumerate.py]=1   #
+    [test_eof.py]=1   # parse error
+    [test_epoll.py]=1   # parse error
+    [test_exception_hierarchy.py]=1 # control flow?
+    [test_exceptions.py]=1   # parse error
 
     [test_faulthandler.py]=1   # takes too long
     [test_fcntl.py]=1
+    [test_filecmp.py]=1   # parse error
     [test_fileinput.py]=1
-    [test_float.py]=1
+    [test_fileio.py]=1
+    [test_float.py]=1  # Takes a long time to decompile
+    [test_flufl.py]=1  # parse error
     [test_format.py]=1
     [test_frame.py]=1
+    [test_frozen.py]=1 # parse error
     [test_fstring.py]=1 # Investigate
     [test_ftplib.py]=1
     [test_functools.py]=1
+    [test_future.py]=1 # parse error
+    [test___future__.py]=1 # test failure
+    [test_future5.py]=1 # parse error
 
+    [test_gc.py]=1 # parse error
     [test_gdb.py]=1 # it fails on its own
+    [test_genericpath.py]=1 # parse error
     [test_generators.py]=1  # improper decompile of assert i < n and (n-i) % 3 == 0
+    [test_getpass.py]=1  # parse error
+    [test_gettext.py]=1  # parse error
     [test_glob.py]=1  #
     [test_grammar.py]=1
     [test_grp.py]=1 # Doesn't terminate (killed)
     [test_gzip.py]=1 # parse error
 
     [test_hashlib.py]=1 # test assert failures
+    [test_heapq.py]=1  # test failure
+    [test_hmac.py]=1  # parse error
     [test_httplib.py]=1 # parse error
     [test_http_cookiejar.py]=1
-    [test_imaplib-3.7.py]=1
-    [test_idle.py]=1 # Probably installation specific
+    [test_httpservers.py]=1 # parse error
+
+    [test_imghdr.py]=1 # parse error
+    [test_imp.py]=1 # parse error
+    [test_int.py]=1 # parse error
     [test_io.py]=1 # test takes too long to run: 37 seconds
+    [test_ioctl.py]=1 # parse error
     [test_imaplib.py]=1
+    [test_ipaddress.py]=1 # parse error
     [test_index.py]=1
     [test_inspect.py]=1
+    [test_iter.py]=1 # parse error
     [test_itertools.py]=1 # parse error
+
     [test_keywordonlyarg.py]=1 # parse error
     [test_kqueue.py]=1 # it fails on its own
+
+    [test__locale.py]=1 # parse error
+    [test_largefile.py]=1 # parse error
     [test_lib2to3.py]=1 # it fails on its own
-    [test_long.py]=1 # investigate
+    [test_linecache.py]=1 # parse error
+    [test_lltrace.py]=1 # parse error
+    [test_locale.py]=1 # parse error
     [test_logging.py]=1 # test takes too long to run: 20 seconds
-    [test_mailbox.py]=1
+    [test_long.py]=1 # investigate
+    [test_lzma.py]=1 # it fails on its own
+
+    [test_mailbox.py]=1 # parse error
+    [test_mailcap.py]=1 # parse error
     [test_marshal.py]=1
     [test_math.py]=1
+    [test_memoryio.py]=1 # test failure
+    [test_memoryview.py]=1 # parse error
+    [test_minidom.py]=1 # test failure
+    [test_mmap.py]=1 # parse error
     [test_modulefinder.py]=1
     [test_msilib.py]=1
     [test_multiprocessing_fork.py]=1 # test takes too long to run: 62 seconds
     [test_multiprocessing_forkserver.py]=1
+    [test_multiprocessing_main_handling.py]=1 # parse error
     [test_multiprocessing_spawn.py]=1
+
+    [test_named_expressions.py]=1 # parse error
+    [test_netrc.py]=1 # parse error
+    [test_nis.py]=1 # break outside of loop
     [test_normalization.py]=1 # probably control flow (uninitialized variable)
     [test_nntplib.py]=1
+    [test_ntpath.py]=1
+
+    [test__osx_support.py]=1 # parse error
+    [test_opcodes.py]=1 # parse error
+    [test_operator.py]=1 # parse error
     [test_optparse.py]=1 # doesn't terminate (killed)
+    [test_ordered_dict.py]=1 # parse error
     [test_os.py]=1 # probably control flow (uninitialized variable)
     [test_ossaudiodev.py]=1 # it fails on its own
+    [test_osx_env.py]=1 # parse error
+
     [test_pathlib.py]=1 # parse error
     [test_pdb.py]=1 # Probably relies on comments
     [test_peepholer.py]=1 # decompile takes a long time; then test assert error
     [test_pickle.py]=1 # Probably relies on comments
-    [test_poll.py]=1
-    [test_poplib.py]=1
-    [test_pydoc.py]=1 # it fails on its own
-    [test_runpy.py]=1  #
-    [test_pkg.py]=1 # parse error; Investigate: lists differ
-    [test_pkgutil.py]=1 # parse error
+    [test_picklebuffer.py]=1 # parse error
+    [test_pipes.py]=1 # parse error
+    [test_pkg.py]=1 # Investigate: lists differ
+    [test_pkgimport.py]=1 # parse error
+    [test_pkgutil.py]=1 # Investigate:
     [test_platform.py]=1 # parse error
+    [test_plistlib.py]=1 # parse error
+    [test_poll.py]=1
+    [test_popen.py]=1 # parse error
+    [test_poplib.py]=1 # Parse error
+    [test_positional_only_arg.py]=1 # test failures
+    [test_posixpath.py]=1 # parse error
+    [test_posix.py]=1 # parse error
+    [test_print.py]=1 # parse error
+    [test_profile.py]=1 # parse error
     [test_pwd.py]=1 # killing - doesn't terminate
-    [test_regrtest.py]=1 # parse error; test assertion error: lists differ
-    [test_re.py]=1 # parse error; test assertion error
-    [test_richcmp.py]=1 # Investigate: data[i] index error in semantic handling
+    [test_pulldom.py]=1 # killing - doesn't terminate
+    [test_py_compile.py]=1 # parse error
+    [test_pyexpat.py]=1 # parse error
+    [test_pyclbr.py]=1 # test failure
+    [test_pydoc.py]=1 # it fails on its own
+
+    [test_queue.py]=1  # parse error
+
+    [test_raise.py]=1  # parse error
+    [test_random.py]=1  # parse error
+    [test_range.py]=1  # parse error
+    [test_rcompleter.py]=1  # parse error
+    [test_re.py]=1 # test assertion error
+    [test_readline.py]=1  # parse error
+    [test_robotparser.py]=1  # too long to run before decompiling: 31 secs
+    [test_regrtest.py]=1 # lists differ
+    [test_reprlib.py]=1 # parse error
+    [test_resource.py]=1  # parse error
+    [test_richcmp.py]=1 # parse error
+    [test_runpy.py]=1  #
+
+    [test_sax.py]=1 # parse error
+    [test_sched.py]=1 # parse error
+    [test_scope.py]=1 # parse error
+    [test_script_helper.py]=1 # parse error
     [test_select.py]=1 # test takes too long to run: 11 seconds
     [test_selectors.py]=1
+    [test_set.py]=1 # parse error
+    [test_shelve.py]=1 # parse error
+    [test_shlex.py]=1 # probably control flow
     [test_shutil.py]=1 # fails on its own
     [test_signal.py]=1 #
-    [test_slice.py]=1 # Investigate: test assertion error
+    [test_site.py]=1 # parse error
+    [test_slice.py]=1 # Investigate
+    [test_smtpd.py]=1 # parse error
     [test_smtplib.py]=1 #
+    [test_smtpnet.py]=1 # parse error
     [test_socket.py]=1
     [test_socketserver.py]=1
-    [test_sort.py]=1 # parse error;
-    [test_ssl.py]=1 # parse error
+    [test_sort.py]=1 # Probably control flow; unintialized varaible
+    [test_source_encoding.py]=1 # parse error
+    [test_spwd.py]=1 # parse error
+    [test_ssl.py]=1 # Probably control flow; unintialized varaible
     [test_startfile.py]=1 # it fails on its own
-    [test_statistics.py]=1 # Takes more than 15 secs to run. Assert failures
-    [test_stat.py]=1 # parse error; test assertions failed
-    [test_string_literals.py]=1 # parse error; Investigate boolean parsing
+    [test_stat.py]=1 # test assertions failed
+    [test_statistics.py]=1 # Probably control flow; unintialized varaible
+    [test_strftime.py]=1 # parse error
+    [test_string.py]=1 # parse error
+    [test_string_literals.py]=1 # parse error
     [test_strptime.py]=1 # test assertions failed
     [test_strtod.py]=1 # test assertions failed
-    [test_structmembers.py]=1 # test assertions failed
     [test_struct.py]=1 # test assertions failed
+    [test_structmembers.py]=1 # test assertions failed
+    [test_subclassinit.py]=1 # parse error
     [test_subprocess.py]=1
+    [test_super.py]=1 # parse error
+    [test_support.py]=1 # parse error
+    [test_symbol.py]=1 # parse error
+    [test_sys.py]=1 # parse error
     [test_sys_setprofile.py]=1 # test assertions failed
     [test_sys_settrace.py]=1 # parse error
+    [test_sysconfig.py]=1 # parse error
+
+    [test_tabnanny.py]=1 # parse error
     [test_tarfile.py]=1 # parse error
+    [test_tcl.py]=1 # parse error
+    [test_telnetlib.py]=1 # parse error
+    [test_tempfile.py]=1 # parse error
+    [test_thread.py]=1 # parse error
+    [test_threaded_import.py]=1 # parse error
     [test_threading.py]=1 #
     [test_timeit.py]=1 # probably control flow uninitialized variable
+    [test_timeout.py]=1 # parse error
     [test_tk.py]=1  # test takes too long to run: 13 seconds
     [test_tokenize.py]=1
     [test_trace.py]=1  # it fails on its own
     [test_traceback.py]=1 # Probably uses comment for testing
     [test_tracemalloc.py]=1 #
     [test_ttk_guionly.py]=1  # implementation specfic and test takes too long to run: 19 seconds
-    [test_typing.py]=1 # parse error
+    [test_turtle_import.py]=1 # parse error
+    [test_turtle.py]=1 # parse error
     [test_types.py]=1 # parse error
+    [test_typing.py]=1 # parse error
+
+    [test_ucn.py]=1 # parse error
     [test_unicode.py]=1 # unicode thing
+    [test_unicode_file_functions.py]=1 # parse faiure
+    [test_unicodedata.py]=1 # test faiure
+    [test_univnewlines.py]=1 # parse error
+    [test_urllib.py]=1 # parse error
     [test_urllib2.py]=1 #
+    [test_urllib_response.py]=1 # parse error
     [test_urllib2_localnet.py]=1 #
+    [test_urllib2net.py]=1 # parse error
     [test_urllibnet.py]=1 # probably control flow - uninitialized variable
+    [test_urlparse.py]=1 # parse error
+    [test_userdict.py]=1 # test failures
+    [test_userstring.py]=1 # parse error
+    [test_utf8.py]=1 # parse error
+    [test_utf8_mode.py]=1 # parse error
+    [test_uu.py]=1 # parse error
+    [test_uuid.py]=1 # parse error
+
+    [test_venv.py]=1 # parse error
+
     [test_weakref.py]=1 # probably control flow - uninitialized variable
+    [test_weakset.py]=1 # parse error
+    [test_webbrowser.py]=1 # parse error
     [test_with.py]=1 # probably control flow - uninitialized variable
-    [test_xml_dom_minicompat.py]=1 # parse error
     [test_winconsoleio.py]=1 # it fails on its own
     [test_winreg.py]=1 # it fails on its own
     [test_winsound.py]=1 # it fails on its own
+    [test_wsgiref.py]=1 # parse error
+
+    [test_xml_etree.py]=1 # parse error
+    [test_xmlrpc.py]=1 # parse error
+    [test__xxsubinterpreters.py]=1 # parse error
+
+    [test_yield_from.py]=1 # parse error
+
+    [test_zlib.py]=1 # test looping take more than 15 seconds to run
+    [test_zipapp.py]=1 # parse error
+    [test_zipimport_support.py]=1 # parse error
     [test_zipfile.py]=1 # it fails on its own
     [test_zipfile64.py]=1 #
 )
-# 268 About unit-test files, in about 11 minutes
+# 114 test files, Elapsed time about 7 minutes
+
+if (( BATCH )) ; then
+    SKIP_TESTS[test_idle.py]=1 # Probably installation specific
+    SKIP_TESTS[test_tix.py]=1 # fails on its own
+    SKIP_TESTS[test_ttk_textonly.py]=1 # Installation dependent?
+
+fi

test/stdlib/compile-file.py

@@ -19,6 +19,6 @@ bytecode = "%s-%s.pyc" % (basename, PY_VERSION)
 
 import py_compile
 print("compiling %s to %s" % (source, bytecode))
-py_compile.compile(source, bytecode, 'exec')
+py_compile.compile(source, bytecode, source)
 # import os
 # os.system("../bin/uncompyle6 %s" % bytecode)

test/stdlib/run-and-email.sh

@@ -3,28 +3,50 @@
 function displaytime {
     printf "ran in "
     local T=$1
-    local D=$((T/60/60/24))
-    local H=$((T/60/60%24))
-    local M=$((T/60%60))
-    local S=$((T%60))
-    (( $D > 0 )) && printf '%d days ' $D
-    (( $H > 0 )) && printf '%d hours ' $H
-    (( $M > 0 )) && printf '%d minutes ' $M
-    (( $D > 0 || $H > 0 || $M > 0 )) && printf 'and '
+    ((D=T/60/60/24))
+    ((H=T/60/60%24))
+    ((M=T/60%60))
+    ((S=T%60))
+    (( D > 0 )) && printf '%d days ' $D
+    (( H > 0 )) && printf '%d hours ' $H
+    (( M > 0 )) && printf '%d minutes ' $M
+    (( D > 0 || H > 0 || M > 0 )) && printf 'and '
     printf '%d seconds\n' $S
 }
 
-. ../../admin-tools/pyenv-newer-versions
+bs=${BASH_SOURCE[0]}
+if [[ $0 != $bs ]] ; then
+    echo "This script should not be *sourced* but run through bash"
+    exit 1
+fi
+
+mydir=$(dirname $bs)
+cd $mydir
+
+branch=$(cat ../../.git/HEAD | cut -d'/' -f 3)
+if [[ $branch == 'python-2.4' ]]; then
+    . ../../admin-tools/pyenv-older-versions
+elif [[ $branch == 'master' ]]; then
+    . ../../admin-tools/pyenv-newer-versions
+else
+    echo &1>2 "Error git branch should either be 'master' or 'python-2.4'; got: '$branch'"
+    exit 1
+fi
+
+MAIN="runtests.sh"
+
 
 USER=${USER:-rocky}
 EMAIL=${EMAIL:-rb@dustyfeet.com}
-SUBJECT_PREFIX="stdlib unit testing for"
+WHAT="uncompyle6 ${MAIN}"
+export BATCH=1
 
 typeset -i RUN_STARTTIME=$(date +%s)
 
-actual_versions=""
 DEBUG=""  # -x
 
+MAILBODY=/tmp/${MAIN}-mailbody-$$.txt
+
 for VERSION in $PYVERSIONS ; do
     typeset -i rc=0
     LOGFILE=/tmp/runtests-$VERSION-$$.log
@@ -34,24 +56,37 @@ for VERSION in $PYVERSIONS ; do
 	    continue
 	    ;;
     esac
-    actual_versions="$actual_versions $VERSION"
 
     if ! pyenv local $VERSION ; then
 	rc=1
     else
+	typeset -i ALL_FILES_STARTTIME=$(date +%s)
 	STOP_ONERROR=1 /bin/bash $DEBUG ./runtests.sh  >$LOGFILE 2>&1
 	rc=$?
+
+	echo Python Version $(pyenv local) >> $LOGFILE
+	echo "" >>$LOGFILE
+	typeset -i ALL_FILES_ENDTIME=$(date +%s)
+	(( time_diff =  ALL_FILES_ENDTIME - ALL_FILES_STARTTIME))
+	time_str=$(displaytime $time_diff)
+	echo ${time_str}. >> $LOGFILE
     fi
-    SUBJECT_PREFIX="runtests verify for"
+
+    SUBJECT_PREFIX="$WHAT for"
     if ((rc == 0)); then
+	mailbody_line="Python $VERSION ok; ${time_str}."
 	tail -v $LOGFILE | mail -s "$SUBJECT_PREFIX $VERSION ok" ${USER}@localhost
     else
+	mailbody_line="Python $VERSION failed; ${time_str}."
 	tail -v $LOGFILE | mail -s "$SUBJECT_PREFIX $VERSION not ok" ${USER}@localhost
-	tail -v $LOGFILE | mail -s "$SUBJECT_PREFIX $VERSION not ok" $EMAIL
+	tail -v $LOGFILE | mail -s "$HOST $SUBJECT_PREFIX $VERSION not ok" $EMAIL
     fi
+    echo $mailbody_line >> $MAILBODY
 done
 
 typeset -i RUN_ENDTIME=$(date +%s)
 (( time_diff =  RUN_ENDTIME - RUN_STARTTIME))
 elapsed_time=$(displaytime $time_diff)
-echo "Run complete $elapsed_time for versions $actual_versions" | mail -s "runtests in $elapsed_time" ${EMAIL}
+echo "${WHAT} complete; ${elapsed_time}." >> $MAILBODY
+echo "Full results are in ${LOGFILE}." >> $MAILBODY
+cat $MAILBODY | mail -s "$HOST $WHAT $elapsed_time" ${EMAIL}

test/stdlib/runtests.sh

@@ -1,10 +1,12 @@
 #!/bin/bash
 me=${BASH_SOURCE[0]}
 
-typeset -i batch=1
-isatty=$(/usr/bin/tty 2>/dev/null)
-if [[ -n $isatty ]] && [[ "$isatty" != 'not a tty' ]] ; then
-    batch=0
+typeset -i BATCH=${BATCH:-0}
+if (( ! BATCH )) ; then
+    isatty=$(/usr/bin/tty 2>/dev/null)
+    if [[ -n $isatty ]] && [[ "$isatty" != 'not a tty' ]] ; then
+	BATCH=0
+    fi
 fi
 
 
@@ -51,20 +53,7 @@ function timeout_cmd {
 typeset -A SKIP_TESTS
 case $PYVERSION in
     2.4)
-	SKIP_TESTS=(
-	    [test_decimal.py]=1  #
-	    [test_dis.py]=1   # We change line numbers - duh!
-	    [test_generators.py]=1  # Investigate
-	    [test_grammar.py]=1    # Too many stmts. Handle large stmts
-	    [test_grp.py]=1      # Long test - might work Control flow?
-	    [test_pep247.py]=1 # Long test - might work? Control flow?
-	    [test_pwd.py]=1 # Long test - might work? Control flow?
-	    [test_socketserver.py]=1 # -- test takes too long to run: 40 seconds
-	    [test_threading.py]=1 # test takes too long to run: 11 seconds
-	    [test_thread.py]=1 # test takes too long to run: 36 seconds
-	    [test_trace.py]=1 # Long test - works
-	    [test_zipfile64.py]=1  # Runs ok but takes 204 seconds
-	)
+	. ./2.4-exclude.sh
 	;;
     2.5)
 	. ./2.5-exclude.sh
@@ -85,7 +74,7 @@ case $PYVERSION in
 	    [test_dis.py]=1   # We change line numbers - duh!
 	    [test_fileio.py]=1
 	)
-	if (( batch )) ; then
+	if (( BATCH )) ; then
 	    # Fails in crontab environment?
 	    # Figure out what's up here
 	    SKIP_TESTS[test_exception_variations.py]=1
@@ -98,7 +87,7 @@ case $PYVERSION in
 	    [test_dis.py]=1   # We change line numbers - duh!
 	    [test_fileio.py]=1
 	)
-	if (( batch )) ; then
+	if (( BATCH )) ; then
 	    # Fails in crontab environment?
 	    # Figure out what's up here
 	    SKIP_TESTS[test_exception_variations.py]=1
@@ -179,9 +168,12 @@ fi
 typeset -i ALL_FILES_STARTTIME=$(date +%s)
 typeset -i skipped=0
 
+NOT_INVERTED_TESTS=${NOT_INVERTED_TESTS:-1}
+
 for file in $files; do
     # AIX bash doesn't grok [[ -v SKIP... ]]
-    if [[ ${SKIP_TESTS[$file]} == 1 ]] ; then
+    [[ -z ${SKIP_TESTS[$file]} ]] && SKIP_TESTS[$file]=0
+    if [[ ${SKIP_TESTS[$file]} == ${NOT_INVERTED_TESTS} ]] ; then
 	((skipped++))
 	continue
     fi

test/test_pyenvlib.py

@@ -228,6 +228,6 @@ if __name__ == "__main__":
 
 # Verification notes:
 # - xdrlib fails verification due the same lambda used twice
-#   (verification is successfull when using original .pyo as
+#   (verification is successful when using original .pyo as
 #   input)
 #

uncompyle6/Makefile

@@ -1,7 +0,0 @@
-# Whatever it is you want to do, it should be forwarded to the 
-# to top-level irectories
-PHONY=check all
-all: check
-
-%: 
-	$(MAKE) -C .. $@

uncompyle6/bin/pydisassemble.py

@@ -18,7 +18,7 @@ Usage:
 Disassemble FILE with the instruction mangling that is done to
 assist uncompyle6 in parsing the instruction stream. For example
 instructions with variable-length arguments like CALL_FUNCTION and
-BUILD_LIST have arguement counts appended to the instruction name, and
+BUILD_LIST have argument counts appended to the instruction name, and
 COME_FROM instructions are inserted into the instruction stream.
 
 Examples:

uncompyle6/parser.py

@@ -28,9 +28,10 @@ from uncompyle6.show import maybe_show_asm
 
 
 class ParserError(Exception):
-    def __init__(self, token, offset):
+    def __init__(self, token, offset, debug):
         self.token = token
         self.offset = offset
+        self.debug = debug
 
     def __str__(self):
         return "Parse error at or near `%r' instruction at offset %s\n" % (
@@ -203,10 +204,10 @@ class PythonParser(GenericASTBuilder):
                     indent = "   "
                 else:
                     indent = "-> "
-                print "%s%s" % (indent, instructions[i])
-            raise ParserError(err_token, err_token.offset)
+                print("%s%s" % (indent, instructions[i]))
+            raise ParserError(err_token, err_token.offset, self.debug["reduce"])
         else:
-            raise ParserError(None, -1)
+            raise ParserError(None, -1, self.debug["reduce"])
 
     def get_pos_kw(self, token):
         """Return then the number of positional parameters and
@@ -349,7 +350,7 @@ class PythonParser(GenericASTBuilder):
         stmt ::= try_except
         stmt ::= tryelsestmt
         stmt ::= tryfinallystmt
-        stmt ::= withstmt
+        stmt ::= with
         stmt ::= withasstmt
 
         stmt ::= del_stmt
@@ -568,14 +569,14 @@ class PythonParser(GenericASTBuilder):
 
         _mklambda ::= mklambda
 
-        expr ::= conditional
+        expr ::= if_exp
 
         ret_expr ::= expr
         ret_expr ::= ret_and
         ret_expr ::= ret_or
 
         ret_expr_or_cond ::= ret_expr
-        ret_expr_or_cond ::= ret_cond
+        ret_expr_or_cond ::= if_exp_ret
 
         stmt ::= return_lambda
 

uncompyle6/parsers/parse2.py

@@ -669,8 +669,9 @@ class Python2Parser(PythonParser):
 
         fn = self.reduce_check_table.get(lhs, None)
         if fn:
-            return fn(self, lhs, n, rule, ast, tokens, first, last)
-
+            if fn(self, lhs, n, rule, ast, tokens, first, last):
+                return True
+            pass
         if rule == ("and", ("expr", "jmp_false", "expr", "\\e_come_from_opt")):
             # If the instruction after the instructions forming the "and"  is an "YIELD_VALUE"
             # then this is probably an "if" inside a comprehension.

uncompyle6/parsers/parse23.py

@@ -32,8 +32,21 @@ class Python23Parser(Python24Parser):
         while1stmt ::= _while1test l_stmts_opt JUMP_BACK
                        POP_TOP POP_BLOCK COME_FROM
 
-        while1stmt ::= _while1test l_stmts_opt JUMP_BACK
-                       COME_FROM POP_TOP POP_BLOCK COME_FROM
+        while1stmt ::= _while1test l_stmts_opt JUMP_BACK COME_FROM
+                       POP_TOP POP_BLOCK COME_FROM
+
+        # Python 2.3
+        # The following has no "JUMP_BACK" after l_stmts because
+        # l_stmts ends in a "break", "return", or "continue"
+        while1stmt ::= _while1test l_stmts
+                       POP_TOP POP_BLOCK
+
+        # The following has a "COME_FROM" at the end which comes from
+        # a "break" inside "l_stmts".
+        while1stmt ::= _while1test l_stmts COME_FROM JUMP_BACK
+                       POP_TOP POP_BLOCK COME_FROM
+        while1stmt ::= _while1test l_stmts JUMP_BACK
+                       POP_TOP POP_BLOCK
 
         list_comp  ::= BUILD_LIST_0 DUP_TOP LOAD_ATTR store list_iter del_stmt
         list_for   ::= expr for_iter store list_iter JUMP_BACK come_froms POP_TOP JUMP_BACK
@@ -49,7 +62,7 @@ class Python23Parser(Python24Parser):
         and2 ::= _jump jmp_false COME_FROM expr COME_FROM
 
         alias       ::= IMPORT_NAME attributes store
-        conditional ::= expr jmp_false expr JUMP_FORWARD expr COME_FROM
+        if_exp      ::= expr jmp_false expr JUMP_FORWARD expr COME_FROM
         '''
 
     def customize_grammar_rules(self, tokens, customize):

uncompyle6/parsers/parse24.py

@@ -38,8 +38,20 @@ class Python24Parser(Python25Parser):
         _ifstmts_jump24 ::= c_stmts_opt JUMP_FORWARD POP_TOP
 
         # Python 2.5+ omits POP_TOP POP_BLOCK
-        while1stmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK POP_TOP POP_BLOCK COME_FROM
-        while1stmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK POP_TOP POP_BLOCK
+        while1stmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK
+                       POP_TOP POP_BLOCK COME_FROM
+        while1stmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK
+                       POP_TOP POP_BLOCK
+        while1stmt ::= SETUP_LOOP l_stmts COME_FROM JUMP_BACK
+                       POP_TOP POP_BLOCK COME_FROM
+
+        continue   ::= JUMP_BACK JUMP_ABSOLUTE
+
+        # Python 2.4
+        # The following has no "JUMP_BACK" after l_stmts because
+        # l_stmts ends in a "break", "return", or "continue"
+        while1stmt ::= SETUP_LOOP l_stmts
+                       POP_TOP POP_BLOCK
 
         # Python 2.5+:
         #  call_stmt ::= expr POP_TOP
@@ -58,7 +70,7 @@ class Python24Parser(Python25Parser):
 
     def remove_rules_24(self):
         self.remove_rules("""
-        expr ::= conditional
+        expr ::= if_exp
         """)
 
 
@@ -73,8 +85,8 @@ class Python24Parser(Python25Parser):
         with_cleanup  ::= LOAD_FAST DELETE_FAST WITH_CLEANUP END_FINALLY
         with_cleanup  ::= LOAD_NAME DELETE_NAME WITH_CLEANUP END_FINALLY
         withasstmt    ::= expr setupwithas store suite_stmts_opt POP_BLOCK LOAD_CONST COME_FROM with_cleanup
-        withstmt      ::= expr setupwith SETUP_FINALLY suite_stmts_opt POP_BLOCK LOAD_CONST COME_FROM with_cleanup
-        stmt ::= withstmt
+        with          ::= expr setupwith SETUP_FINALLY suite_stmts_opt POP_BLOCK LOAD_CONST COME_FROM with_cleanup
+        stmt ::= with
         stmt ::= withasstmt
         """)
         super(Python24Parser, self).customize_grammar_rules(tokens, customize)

uncompyle6/parsers/parse25.py

@@ -30,7 +30,7 @@ class Python25Parser(Python26Parser):
                         setup_finally
         # opcode SETUP_WITH
         setupwith ::= DUP_TOP LOAD_ATTR store LOAD_ATTR CALL_FUNCTION_0 POP_TOP
-        withstmt  ::= expr setupwith SETUP_FINALLY suite_stmts_opt
+        with      ::= expr setupwith SETUP_FINALLY suite_stmts_opt
                       POP_BLOCK LOAD_CONST COME_FROM with_cleanup
 
         # Semantic actions want store to be at index 2
@@ -70,7 +70,7 @@ class Python25Parser(Python26Parser):
         ifelsestmt    ::= testexpr c_stmts_opt jf_cf_pop else_suite come_froms
 
         setupwith  ::= DUP_TOP LOAD_ATTR ROT_TWO LOAD_ATTR CALL_FUNCTION_0 POP_TOP
-        withstmt   ::= expr setupwith SETUP_FINALLY suite_stmts_opt
+        with       ::= expr setupwith SETUP_FINALLY suite_stmts_opt
                        POP_BLOCK LOAD_CONST COME_FROM WITH_CLEANUP END_FINALLY
         withasstmt ::= expr setupwithas store suite_stmts_opt
                        POP_BLOCK LOAD_CONST COME_FROM WITH_CLEANUP END_FINALLY
@@ -80,7 +80,7 @@ class Python25Parser(Python26Parser):
         classdefdeco1 ::= expr classdefdeco2 CALL_FUNCTION_1
         classdefdeco2 ::= LOAD_CONST expr mkfunc CALL_FUNCTION_0 BUILD_CLASS
         kv3 ::= expr expr STORE_MAP
-        ret_cond ::= expr jmp_false_then expr RETURN_END_IF POP_TOP ret_expr_or_cond
+        if_exp_ret       ::= expr jmp_false_then expr RETURN_END_IF POP_TOP ret_expr_or_cond
         return_if_lambda ::= RETURN_END_IF_LAMBDA POP_TOP
         return_if_stmt   ::= ret_expr RETURN_END_IF POP_TOP
         return_if_stmts  ::= return_if_stmt
@@ -89,12 +89,11 @@ class Python25Parser(Python26Parser):
         return_stmt_lambda ::= ret_expr RETURN_VALUE_LAMBDA
         setupwithas      ::= DUP_TOP LOAD_ATTR ROT_TWO LOAD_ATTR CALL_FUNCTION_0 setup_finally
         stmt             ::= classdefdeco
-        stmt             ::= if_expr_lambda
-        stmt             ::= conditional_not_lambda
-        if_expr_lambda   ::= expr jmp_false_then expr return_if_lambda
+        stmt             ::= if_exp_lambda
+        stmt             ::= if_exp_not_lambda
+        if_exp_lambda    ::= expr jmp_false_then expr return_if_lambda
                                return_stmt_lambda LAMBDA_MARKER
-        conditional_not_lambda
-                           ::= expr jmp_true_then expr return_if_lambda
+        if_exp_not_lambda ::= expr jmp_true_then expr return_if_lambda
                               return_stmt_lambda LAMBDA_MARKER
         """)
         super(Python25Parser, self).customize_grammar_rules(tokens, customize)

uncompyle6/parsers/parse26.py

@@ -119,7 +119,7 @@ class Python26Parser(Python2Parser):
         ifelsestmtc ::= testexpr c_stmts_opt ja_cf_pop    else_suitec
 
         # Semantic actions want suite_stmts_opt to be at index 3
-        withstmt ::= expr setupwith SETUP_FINALLY suite_stmts_opt
+        with        ::= expr setupwith SETUP_FINALLY suite_stmts_opt
                         POP_BLOCK LOAD_CONST COME_FROM WITH_CLEANUP END_FINALLY
 
         # Semantic actions want store to be at index 2
@@ -262,8 +262,8 @@ class Python26Parser(Python2Parser):
         '''
         ret_and      ::= expr jmp_false ret_expr_or_cond COME_FROM
         ret_or       ::= expr jmp_true ret_expr_or_cond COME_FROM
-        ret_cond     ::= expr jmp_false_then expr RETURN_END_IF POP_TOP ret_expr_or_cond
-        ret_cond     ::= expr jmp_false_then expr ret_expr_or_cond
+        if_exp_ret   ::= expr jmp_false_then expr RETURN_END_IF POP_TOP ret_expr_or_cond
+        if_exp_ret   ::= expr jmp_false_then expr ret_expr_or_cond
 
         return_if_stmt ::= ret_expr RETURN_END_IF POP_TOP
         return ::= ret_expr RETURN_VALUE POP_TOP
@@ -283,11 +283,11 @@ class Python26Parser(Python2Parser):
         kvlist ::= kvlist kv3
 
         # Note: preserve positions 0 2 and 4 for semantic actions
-        conditional_not    ::= expr jmp_true  expr jf_cf_pop expr COME_FROM
-        conditional        ::= expr jmp_false expr jf_cf_pop expr come_from_opt
-        conditional        ::= expr jmp_false expr ja_cf_pop expr
+        if_exp_not         ::= expr jmp_true  expr jf_cf_pop expr COME_FROM
+        if_exp             ::= expr jmp_false expr jf_cf_pop expr come_from_opt
+        if_exp             ::= expr jmp_false expr ja_cf_pop expr
 
-        expr               ::= conditional_not
+        expr               ::= if_exp_not
 
         and                ::= expr JUMP_IF_FALSE POP_TOP expr JUMP_IF_FALSE POP_TOP
 
@@ -311,27 +311,27 @@ class Python26Parser(Python2Parser):
         compare_chained2   ::= expr COMPARE_OP return_lambda
 
         return_if_lambda   ::= RETURN_END_IF_LAMBDA POP_TOP
-        stmt               ::= if_expr_lambda
-        stmt               ::= conditional_not_lambda
-        if_expr_lambda     ::= expr jmp_false_then expr return_if_lambda
+        stmt               ::= if_exp_lambda
+        stmt               ::= if_exp_not_lambda
+        if_exp_lambda      ::= expr jmp_false_then expr return_if_lambda
                                return_stmt_lambda LAMBDA_MARKER
-        conditional_not_lambda ::=
+        if_exp_not_lambda ::=
                                expr jmp_true_then expr return_if_lambda
                                return_stmt_lambda LAMBDA_MARKER
 
-        # if_expr_true are for conditions which always evaluate true
+        # if_exp_true are for conditions which always evaluate true
         # There is dead or non-optional remnants of the condition code though,
         # and we use that to match on to reconstruct the source more accurately
-        expr               ::= if_expr_true
-        if_expr_true       ::= expr jf_pop expr COME_FROM
+        expr               ::= if_exp_true
+        if_exp_true        ::= expr jf_pop expr COME_FROM
 
         # This comes from
         #   0 or max(5, 3) if 0 else 3
         # where there seems to be an additional COME_FROM at the
         # end. Not sure if this is appropriately named or
         # is the best way to handle
-        expr               ::= conditional_false
-        conditional_false  ::= conditional COME_FROM
+        expr               ::= if_exp_false
+        if_exp_false  ::= if_exp COME_FROM
 
         """
 
@@ -366,10 +366,10 @@ class Python26Parser(Python2Parser):
             if ast[1] is None:
                 return False
 
-            # For now, we won't let the 2nd 'expr' be a "conditional_not"
+            # For now, we won't let the 2nd 'expr' be a "if_exp_not"
             # However in < 2.6 where we don't have if/else expression it *can*
             # be.
-            if self.version >= 2.6 and ast[2][0] == 'conditional_not':
+            if self.version >= 2.6 and ast[2][0] == "if_exp_not":
                 return True
 
             test_index = last

uncompyle6/parsers/parse27.py

@@ -6,6 +6,10 @@ from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
 from xdis import next_offset
 from uncompyle6.parser import PythonParserSingle, nop_func
 from uncompyle6.parsers.parse2 import Python2Parser
+from uncompyle6.parsers.reducecheck import (
+    ifelsestmt,
+    tryelsestmt,
+)
 
 class Python27Parser(Python2Parser):
 
@@ -95,7 +99,7 @@ class Python27Parser(Python2Parser):
 
         ret_and    ::= expr JUMP_IF_FALSE_OR_POP ret_expr_or_cond COME_FROM
         ret_or     ::= expr JUMP_IF_TRUE_OR_POP ret_expr_or_cond COME_FROM
-        ret_cond ::= expr POP_JUMP_IF_FALSE expr RETURN_END_IF COME_FROM ret_expr_or_cond
+        if_exp_ret ::= expr POP_JUMP_IF_FALSE expr RETURN_END_IF COME_FROM ret_expr_or_cond
 
         or   ::= expr JUMP_IF_TRUE_OR_POP expr COME_FROM
         and  ::= expr JUMP_IF_FALSE_OR_POP expr COME_FROM
@@ -112,17 +116,17 @@ class Python27Parser(Python2Parser):
         compare_chained2 ::= expr COMPARE_OP return_lambda
         compare_chained2 ::= expr COMPARE_OP return_lambda
 
-        # if_expr_true are for conditions which always evaluate true
+        # if_exp_true are for conditions which always evaluate true
         # There is dead or non-optional remnants of the condition code though,
         # and we use that to match on to reconstruct the source more accurately.
         # FIXME: we should do analysis and reduce *only* if there is dead code?
         #        right now we check that expr is "or". Any other nodes types?
 
-        expr             ::= if_expr_true
-        if_expr_true     ::= expr JUMP_FORWARD expr COME_FROM
+        expr             ::= if_exp_true
+        if_exp_true      ::= expr JUMP_FORWARD expr COME_FROM
 
-        conditional      ::= expr jmp_false expr JUMP_FORWARD expr COME_FROM
-        conditional      ::= expr jmp_false expr JUMP_ABSOLUTE expr
+        if_exp           ::= expr jmp_false expr JUMP_FORWARD expr COME_FROM
+        if_exp           ::= expr jmp_false expr JUMP_ABSOLUTE expr
         """
 
     def p_stmt27(self, args):
@@ -135,9 +139,11 @@ class Python27Parser(Python2Parser):
         # assert condition, expr
         assert2    ::= assert_expr jmp_true LOAD_ASSERT expr CALL_FUNCTION_1 RAISE_VARARGS_1
 
+        continue   ::= JUMP_BACK JUMP_ABSOLUTE
+
         for_block  ::= returns _come_froms
 
-        withstmt   ::= expr SETUP_WITH POP_TOP suite_stmts_opt
+        with       ::= expr SETUP_WITH POP_TOP suite_stmts_opt
                        POP_BLOCK LOAD_CONST COME_FROM_WITH
                        WITH_CLEANUP END_FINALLY
 
@@ -176,26 +182,29 @@ class Python27Parser(Python2Parser):
 
         ifstmt            ::= testexpr return_stmts COME_FROM
         ifstmt            ::= testexpr return_if_stmts COME_FROM
-        ifelsestmt        ::= testexpr c_stmts_opt JUMP_FORWARD else_suite COME_FROM
+        ifelsestmt        ::= testexpr c_stmts_opt JUMP_FORWARD else_suite come_froms
         ifelsestmtc       ::= testexpr c_stmts_opt JUMP_ABSOLUTE else_suitec
         ifelsestmtl       ::= testexpr c_stmts_opt JUMP_BACK else_suitel
         ifelsestmtl       ::= testexpr c_stmts_opt CONTINUE else_suitel
 
+        # In the future when we have ifelsestmtl checking we should add something like:
+        # ifelsestmtl       ::= testexpr c_stmts_opt JUMP_FORWARD else_suite come_froms
+        # c_stmts           ::= ifelsestmtl
+
         # "if"/"else" statement that ends in a RETURN
         ifelsestmtr       ::= testexpr return_if_stmts COME_FROM returns
 
         # Common with 2.6
         return_if_lambda   ::= RETURN_END_IF_LAMBDA COME_FROM
-        stmt               ::= if_expr_lambda
-        stmt               ::= conditional_not_lambda
-        if_expr_lambda     ::= expr jmp_false expr return_if_lambda
+        stmt               ::= if_exp_lambda
+        stmt               ::= if_exp_not_lambda
+        if_exp_lambda      ::= expr jmp_false expr return_if_lambda
                                return_stmt_lambda LAMBDA_MARKER
-        conditional_not_lambda
-                           ::= expr jmp_true expr return_if_lambda
+        if_exp_not_lambda  ::= expr jmp_true expr return_if_lambda
                                return_stmt_lambda LAMBDA_MARKER
 
-        expr ::= conditional_not
-        conditional_not ::= expr jmp_true expr _jump expr COME_FROM
+        expr               ::= if_exp_not
+        if_exp_not         ::= expr jmp_true expr _jump expr COME_FROM
 
         kv3 ::= expr expr STORE_MAP
         """
@@ -216,8 +225,16 @@ class Python27Parser(Python2Parser):
 
 
         super(Python27Parser, self).customize_grammar_rules(tokens, customize)
+
+        # FIXME: Put more in this table
+        self.reduce_check_table = {
+            # "ifelsestmt": ifelsestmt,
+            "tryelsestmt": tryelsestmt,
+            "tryelsestmtl": tryelsestmt,
+        }
+
         self.check_reduce["and"] = "AST"
-        self.check_reduce["conditional"] = "AST"
+        self.check_reduce["if_exp"] = "AST"
 
         self.check_reduce["except_handler"] = "tokens"
         self.check_reduce["except_handler_else"] = "tokens"
@@ -225,10 +242,11 @@ class Python27Parser(Python2Parser):
         # self.check_reduce["or"] = "AST"
         self.check_reduce["raise_stmt1"] = "AST"
         self.check_reduce["iflaststmtl"] = "AST"
+        self.check_reduce["ifelsestmt"] = "AST"
         self.check_reduce["list_if_not"] = "AST"
         self.check_reduce["list_if"] = "AST"
         self.check_reduce["comp_if"] = "AST"
-        self.check_reduce["if_expr_true"] = "tokens"
+        self.check_reduce["if_exp_true"] = "tokens"
         self.check_reduce["whilestmt"] = "tokens"
 
         return
@@ -238,6 +256,12 @@ class Python27Parser(Python2Parser):
                         self).reduce_is_invalid(rule, ast,
                                                 tokens, first, last)
 
+        lhs = rule[0]
+        n = len(tokens)
+        fn = self.reduce_check_table.get(lhs, None)
+        if fn:
+            invalid = fn(self, lhs, n, rule, ast, tokens, first, last)
+        last = min(last, n-1)
         if invalid:
             return invalid
 
@@ -247,7 +271,7 @@ class Python27Parser(Python2Parser):
                 return tokens[first].offset < jmp_false[0].attr < tokens[last].offset
             pass
         elif (rule[0], rule[1][0:5]) == (
-                "conditional",
+                "if_exp",
                 ("expr", "jmp_false", "expr", "JUMP_ABSOLUTE", "expr")):
             jmp_false = ast[1]
             if jmp_false[0] == "POP_JUMP_IF_FALSE":
@@ -317,7 +341,7 @@ class Python27Parser(Python2Parser):
             while (tokens[i] != "JUMP_BACK"):
                 i -= 1
             return tokens[i].attr != tokens[i-1].attr
-        elif rule[0] == "if_expr_true":
+        elif rule[0] == "if_exp_true":
             return (first) > 0 and tokens[first-1] == "POP_JUMP_IF_FALSE"
 
         return False

uncompyle6/parsers/parse3.py

@@ -30,9 +30,12 @@ import re
 from uncompyle6.scanners.tok import Token
 from uncompyle6.parser import PythonParser, PythonParserSingle, nop_func
 from uncompyle6.parsers.reducecheck import (
+    and_check,
     except_handler_else,
+    ifelsestmt,
     ifstmt,
-    # iflaststmt,
+    iflaststmt,
+    or_check,
     testtrue,
     tryelsestmtl3,
     tryexcept,
@@ -266,7 +269,7 @@ class Python3Parser(PythonParser):
         jmp_abs ::= JUMP_ABSOLUTE
         jmp_abs ::= JUMP_BACK
 
-        withstmt ::= expr SETUP_WITH POP_TOP suite_stmts_opt
+        with    ::= expr SETUP_WITH POP_TOP suite_stmts_opt
                     POP_BLOCK LOAD_CONST COME_FROM_WITH
                     WITH_CLEANUP END_FINALLY
 
@@ -333,7 +336,7 @@ class Python3Parser(PythonParser):
         # FIXME: Common with 2.7
         ret_and    ::= expr JUMP_IF_FALSE_OR_POP ret_expr_or_cond COME_FROM
         ret_or     ::= expr JUMP_IF_TRUE_OR_POP ret_expr_or_cond COME_FROM
-        ret_cond ::= expr POP_JUMP_IF_FALSE expr RETURN_END_IF COME_FROM ret_expr_or_cond
+        if_exp_ret ::= expr POP_JUMP_IF_FALSE expr RETURN_END_IF COME_FROM ret_expr_or_cond
 
         or   ::= expr JUMP_IF_TRUE_OR_POP expr COME_FROM
         or   ::= expr jmp_true expr
@@ -348,13 +351,12 @@ class Python3Parser(PythonParser):
 
     def p_stmt3(self, args):
         """
-        stmt               ::= if_expr_lambda
+        stmt               ::= if_exp_lambda
 
-        stmt               ::= conditional_not_lambda
-        if_expr_lambda     ::= expr jmp_false expr return_if_lambda
+        stmt               ::= if_exp_not_lambda
+        if_exp_lambda      ::= expr jmp_false expr return_if_lambda
                                return_stmt_lambda LAMBDA_MARKER
-        conditional_not_lambda
-                           ::= expr jmp_true expr return_if_lambda
+        if_exp_not_lambda  ::= expr jmp_true expr return_if_lambda
                                return_stmt_lambda LAMBDA_MARKER
 
         return_stmt_lambda ::= ret_expr RETURN_VALUE_LAMBDA
@@ -468,18 +470,18 @@ class Python3Parser(PythonParser):
     def p_expr3(self, args):
         """
         expr           ::= LOAD_STR
-        expr           ::= conditionalnot
-        conditionalnot ::= expr jmp_true  expr jump_forward_else expr COME_FROM
+        expr           ::= if_exp_not
+        if_exp_not     ::= expr jmp_true  expr jump_forward_else expr COME_FROM
 
         # a JUMP_FORWARD to another JUMP_FORWARD can get turned into
         # a JUMP_ABSOLUTE with no COME_FROM
-        conditional    ::= expr jmp_false expr jump_absolute_else expr
+        if_exp         ::= expr jmp_false expr jump_absolute_else expr
 
-        # if_expr_true are for conditions which always evaluate true
+        # if_exp_true are for conditions which always evaluate true
         # There is dead or non-optional remnants of the condition code though,
         # and we use that to match on to reconstruct the source more accurately
-        expr           ::= if_expr_true
-        if_expr_true   ::= expr JUMP_FORWARD expr COME_FROM
+        expr           ::= if_exp_true
+        if_exp_true    ::= expr JUMP_FORWARD expr COME_FROM
         """
 
     @staticmethod
@@ -706,12 +708,11 @@ class Python3Parser(PythonParser):
               stmt ::= assign2_pypy
               assign3_pypy       ::= expr expr expr store store store
               assign2_pypy       ::= expr expr store store
-              stmt               ::= if_expr_lambda
-              stmt               ::= conditional_not_lambda
+              stmt               ::= if_exp_lambda
+              stmt               ::= if_exp_not_lambda
               if_expr_lambda     ::= expr jmp_false expr return_if_lambda
                                      return_lambda LAMBDA_MARKER
-              conditional_not_lambda
-                                 ::= expr jmp_true expr return_if_lambda
+              if_exp_not_lambda  ::= expr jmp_true expr return_if_lambda
                                      return_lambda LAMBDA_MARKER
               """,
                 nop_func,
@@ -1530,15 +1531,36 @@ class Python3Parser(PythonParser):
                 pass
             pass
 
+        # FIXME: Put more in this table
+        self.reduce_check_table = {
+            "except_handler_else": except_handler_else,
+            # "ifstmt": ifstmt,
+            "ifstmtl": ifstmt,
+            "ifelsestmtc": ifelsestmt,
+            "ifelsestmt": ifelsestmt,
+            "or": or_check,
+            "testtrue": testtrue,
+            "tryelsestmtl3": tryelsestmtl3,
+            "try_except": tryexcept,
+        }
+
+        if self.version == 3.6:
+            self.reduce_check_table["and"] =  and_check
+            self.check_reduce["and"] = "AST"
+
+        self.check_reduce["annotate_tuple"] = "noAST"
         self.check_reduce["aug_assign1"] = "AST"
         self.check_reduce["aug_assign2"] = "AST"
-        self.check_reduce["while1stmt"] = "noAST"
-        self.check_reduce["while1elsestmt"] = "noAST"
-        self.check_reduce["ifelsestmt"] = "AST"
-        self.check_reduce["ifstmt"] = "AST"
-        # self.check_reduce["iflaststmtl"] = "AST"
-        self.check_reduce["annotate_tuple"] = "noAST"
         self.check_reduce["except_handler_else"] = "tokens"
+        self.check_reduce["ifelsestmt"] = "AST"
+        self.check_reduce["ifelsestmtc"] = "AST"
+        self.check_reduce["ifstmt"] = "AST"
+        self.check_reduce["ifstmtl"] = "AST"
+        if self.version == 3.6:
+            self.reduce_check_table["iflaststmtl"] = iflaststmt
+            self.check_reduce["iflaststmt"] = "AST"
+            self.check_reduce["iflaststmtl"] = "AST"
+        self.check_reduce["or"] = "AST"
         self.check_reduce["testtrue"] = "tokens"
         if not PYTHON3:
             self.check_reduce["kwarg"] = "noAST"
@@ -1548,25 +1570,29 @@ class Python3Parser(PythonParser):
             self.check_reduce["try_except"] = "AST"
 
         self.check_reduce["tryelsestmtl3"] = "AST"
-        # FIXME: remove parser errors caused by the below
-        # self.check_reduce['while1elsestmt'] = 'noAST'
+        self.check_reduce["while1stmt"] = "noAST"
+        self.check_reduce["while1elsestmt"] = "noAST"
         return
 
     def reduce_is_invalid(self, rule, ast, tokens, first, last):
         lhs = rule[0]
         n = len(tokens)
         last = min(last, n-1)
+        fn = self.reduce_check_table.get(lhs, None)
+        if fn:
+            if fn(self, lhs, n, rule, ast, tokens, first, last):
+                return True
+            pass
+        # FIXME: put more in reduce_check_table
         if lhs in ("aug_assign1", "aug_assign2") and ast[0][0] == "and":
             return True
         elif lhs == "annotate_tuple":
             return not isinstance(tokens[first].attr, tuple)
-        elif lhs in ("except_handler_else"):
-            return except_handler_else(self, lhs, n, rule, ast, tokens, first, last)
         elif lhs == "kwarg":
             arg = tokens[first].attr
             return not (isinstance(arg, str) or isinstance(arg, unicode))
-        # elif lhs == "iflaststmtl":
-        #     return iflaststmt(self, lhs, n, rule, ast, tokens, first, last)
+        elif lhs in ("iflaststmt", "iflaststmtl") and self.version == 3.6:
+            return ifstmt(self, lhs, n, rule, ast, tokens, first, last)
         elif rule == ("ifstmt", ("testexpr", "_ifstmts_jump")):
             # FIXME: go over what's up with 3.0. Evetually I'd like to remove RETURN_END_IF
             if self.version <= 3.0 or tokens[last] == "RETURN_END_IF":
@@ -1606,10 +1632,6 @@ class Python3Parser(PythonParser):
                 <= jump_forward_else[0].attr
                 < tokens[last].off2int()
             )
-        elif lhs == "testtrue":
-            return testtrue(self, lhs, n, rule, ast, tokens, first, last)
-        elif lhs == "tryelsestmtl3":
-            return tryelsestmtl3(self, lhs, n, rule, ast, tokens, first, last)
         elif lhs == "while1stmt":
 
             if while1stmt(self, lhs, n, rule, ast, tokens, first, last):
@@ -1658,8 +1680,6 @@ class Python3Parser(PythonParser):
                 return False
             # 3.8+ Doesn't have SETUP_LOOP
             return self.version < 3.8 and tokens[first].attr > tokens[last].offset
-        elif lhs == "try_except":
-            return tryexcept(self, lhs, n, rule, ast, tokens, first, last)
         elif rule == (
             "ifelsestmt",
             (

uncompyle6/parsers/parse30.py

@@ -211,7 +211,7 @@ class Python30Parser(Python31Parser):
         whilestmt      ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK JUMP_BACK COME_FROM_LOOP
         whilestmt      ::= SETUP_LOOP testexpr returns POP_TOP POP_BLOCK COME_FROM_LOOP
         withasstmt     ::= expr SETUP_WITH store suite_stmts_opt POP_BLOCK LOAD_CONST COME_FROM_WITH WITH_CLEANUP END_FINALLY
-        withstmt       ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK LOAD_CONST COME_FROM_WITH WITH_CLEANUP END_FINALLY
+        with           ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK LOAD_CONST COME_FROM_WITH WITH_CLEANUP END_FINALLY
 
         # lc_body ::= LOAD_FAST expr LIST_APPEND
         # lc_body ::= LOAD_NAME expr LIST_APPEND
@@ -262,9 +262,9 @@ class Python30Parser(Python31Parser):
                              compare_chained2 COME_FROM
         ret_or           ::= expr JUMP_IF_TRUE_OR_POP  ret_expr_or_cond COME_FROM
         ret_and          ::= expr JUMP_IF_FALSE_OR_POP ret_expr_or_cond COME_FROM
-        ret_cond         ::= expr POP_JUMP_IF_FALSE expr RETURN_END_IF
+        if_exp_ret       ::= expr POP_JUMP_IF_FALSE expr RETURN_END_IF
                              COME_FROM ret_expr_or_cond
-        ret_expr_or_cond ::= ret_cond
+        ret_expr_or_cond ::= if_exp_ret
         or               ::= expr JUMP_IF_TRUE_OR_POP expr COME_FROM
         and              ::= expr JUMP_IF_TRUE_OR_POP expr COME_FROM
         and              ::= expr JUMP_IF_FALSE_OR_POP expr COME_FROM

uncompyle6/parsers/parse31.py

@@ -14,7 +14,7 @@ class Python31Parser(Python32Parser):
 
         setupwith      ::= DUP_TOP LOAD_ATTR store LOAD_ATTR CALL_FUNCTION_0 POP_TOP
         setupwithas    ::= DUP_TOP LOAD_ATTR store LOAD_ATTR CALL_FUNCTION_0 store
-        withstmt       ::= expr setupwith SETUP_FINALLY
+        with           ::= expr setupwith SETUP_FINALLY
                            suite_stmts_opt
                            POP_BLOCK LOAD_CONST COME_FROM_FINALLY
                            load del_stmt WITH_CLEANUP END_FINALLY

uncompyle6/parsers/parse32.py

@@ -15,7 +15,7 @@ class Python32Parser(Python3Parser):
 
     def p_32to35(self, args):
         """
-        conditional ::= expr jmp_false expr jump_forward_else expr COME_FROM
+        if_exp            ::= expr jmp_false expr jump_forward_else expr COME_FROM
 
         # compare_chained2 is used in a "chained_compare": x <= y <= z
         # used exclusively in compare_chained

uncompyle6/parsers/parse35.py

@@ -49,7 +49,7 @@ class Python35Parser(Python34Parser):
 
         # Python 3.5+ has WITH_CLEANUP_START/FINISH
 
-        withstmt   ::= expr
+        with       ::= expr
                        SETUP_WITH POP_TOP suite_stmts_opt
                        POP_BLOCK LOAD_CONST COME_FROM_WITH
                        WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
@@ -137,7 +137,7 @@ class Python35Parser(Python34Parser):
         self.remove_rules("""
           yield_from ::= expr GET_ITER LOAD_CONST YIELD_FROM
           yield_from ::= expr expr YIELD_FROM
-          withstmt   ::= expr SETUP_WITH POP_TOP suite_stmts_opt
+          with       ::= expr SETUP_WITH POP_TOP suite_stmts_opt
                          POP_BLOCK LOAD_CONST COME_FROM_WITH
                          WITH_CLEANUP END_FINALLY
           withasstmt ::= expr SETUP_WITH store suite_stmts_opt
@@ -172,24 +172,31 @@ class Python35Parser(Python34Parser):
                 rules_str = """
                    async_with_stmt    ::= expr
                    stmt               ::= async_with_stmt
+                   async_with_pre     ::= BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM SETUP_ASYNC_WITH
+                   async_with_post    ::= COME_FROM_ASYNC_WITH
+                                          WITH_CLEANUP_START GET_AWAITABLE LOAD_CONST YIELD_FROM
+                                          WITH_CLEANUP_FINISH END_FINALLY
 
                    async_with_stmt    ::= expr
-                            BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM
-                            SETUP_ASYNC_WITH POP_TOP suite_stmts_opt
-                            POP_BLOCK LOAD_CONST COME_FROM_ASYNC_WITH
-                            WITH_CLEANUP_START
-                            GET_AWAITABLE LOAD_CONST YIELD_FROM
-                            WITH_CLEANUP_FINISH END_FINALLY
+                                          async_with_pre
+                                          POP_TOP
+                                          suite_stmts_opt
+                                          POP_BLOCK LOAD_CONST
+                                          async_with_post
+                   async_with_stmt    ::= expr
+                                          async_with_pre
+                                          POP_TOP
+                                          suite_stmts_opt
+                                          async_with_post
 
                    stmt               ::= async_with_as_stmt
 
                    async_with_as_stmt ::= expr
-                               BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM
-                               SETUP_ASYNC_WITH store suite_stmts_opt
-                               POP_BLOCK LOAD_CONST COME_FROM_ASYNC_WITH
-                               WITH_CLEANUP_START
-                               GET_AWAITABLE LOAD_CONST YIELD_FROM
-                               WITH_CLEANUP_FINISH END_FINALLY
+                                          async_with_pre
+                                          store
+                                          suite_stmts_opt
+                                          POP_BLOCK LOAD_CONST
+                                          async_with_post
                 """
                 self.addRule(rules_str, nop_func)
             elif opname == 'BUILD_MAP_UNPACK':
@@ -201,7 +208,7 @@ class Python35Parser(Python34Parser):
             elif opname == 'SETUP_WITH':
                 # Python 3.5+ has WITH_CLEANUP_START/FINISH
                 rules_str = """
-                  withstmt   ::= expr
+                  with ::= expr
                            SETUP_WITH POP_TOP suite_stmts_opt
                            POP_BLOCK LOAD_CONST COME_FROM_WITH
                            WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY

uncompyle6/parsers/parse36.py

@@ -64,7 +64,7 @@ class Python36Parser(Python35Parser):
         jf_cf       ::= JUMP_FORWARD COME_FROM
         cf_jf_else  ::= come_froms JUMP_FORWARD ELSE
 
-        conditional ::= expr jmp_false expr jf_cf expr COME_FROM
+        if_exp ::= expr jmp_false expr jf_cf expr COME_FROM
 
         async_for_stmt     ::= SETUP_LOOP expr
                                GET_AITER
@@ -112,9 +112,16 @@ class Python36Parser(Python35Parser):
         except_suite ::= c_stmts_opt COME_FROM POP_EXCEPT jump_except COME_FROM
 
         jb_cfs      ::= JUMP_BACK come_froms
+
+        # If statement inside a loop.
+        stmt                ::= ifstmtl
+        ifstmtl            ::= testexpr _ifstmts_jumpl
+        _ifstmts_jumpl     ::= c_stmts JUMP_BACK
+
         ifelsestmtl ::= testexpr c_stmts_opt jb_cfs else_suitel
         ifelsestmtl ::= testexpr c_stmts_opt cf_jf_else else_suitel
         ifelsestmt  ::= testexpr c_stmts_opt cf_jf_else else_suite _come_froms
+        ifelsestmt  ::= testexpr c_stmts come_froms else_suite come_froms
 
         # In 3.6+, A sequence of statements ending in a RETURN can cause
         # JUMP_FORWARD END_FINALLY to be omitted from try middle
@@ -157,8 +164,8 @@ class Python36Parser(Python35Parser):
     # that and then we can remove this.
     def p_37conditionals(self, args):
         """
-        expr                       ::= conditional37
-        conditional37              ::= expr expr jf_cfs expr COME_FROM
+        expr                       ::= if_exp37
+        if_exp37                   ::= expr expr jf_cfs expr COME_FROM
         jf_cfs                     ::= JUMP_FORWARD _come_froms
         ifelsestmt                 ::= testexpr c_stmts_opt jf_cfs else_suite opt_come_from_except
         """
@@ -168,6 +175,8 @@ class Python36Parser(Python35Parser):
         # """)
         super(Python36Parser, self).customize_grammar_rules(tokens, customize)
         self.remove_rules("""
+           _ifstmts_jumpl     ::= c_stmts_opt
+           _ifstmts_jumpl     ::= _ifstmts_jump
            except_handler     ::= JUMP_FORWARD COME_FROM_EXCEPT except_stmts END_FINALLY COME_FROM
            async_for_stmt     ::= SETUP_LOOP expr
                                   GET_AITER
@@ -230,24 +239,26 @@ class Python36Parser(Python35Parser):
             elif opname == 'BEFORE_ASYNC_WITH':
                 rules_str = """
                   stmt ::= async_with_stmt
+                  async_with_pre     ::= BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM SETUP_ASYNC_WITH
+                  async_with_post    ::= COME_FROM_ASYNC_WITH
+                                         WITH_CLEANUP_START GET_AWAITABLE LOAD_CONST YIELD_FROM
+                                         WITH_CLEANUP_FINISH END_FINALLY
                   async_with_as_stmt ::= expr
-                               BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM
-                               SETUP_ASYNC_WITH store
+                               async_with_pre
+                               store
                                suite_stmts_opt
                                POP_BLOCK LOAD_CONST
-                               COME_FROM_ASYNC_WITH
-                               WITH_CLEANUP_START
-                               GET_AWAITABLE LOAD_CONST YIELD_FROM
-                               WITH_CLEANUP_FINISH END_FINALLY
+                               async_with_post
                  stmt ::= async_with_as_stmt
                  async_with_stmt ::= expr
-                               BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM
-                               SETUP_ASYNC_WITH POP_TOP suite_stmts_opt
+                               POP_TOP
+                               suite_stmts_opt
                                POP_BLOCK LOAD_CONST
-                               COME_FROM_ASYNC_WITH
-                               WITH_CLEANUP_START
-                               GET_AWAITABLE LOAD_CONST YIELD_FROM
-                               WITH_CLEANUP_FINISH END_FINALLY
+                               async_with_post
+                 async_with_stmt ::= expr
+                               POP_TOP
+                               suite_stmts_opt
+                               async_with_post
                 """
                 self.addRule(rules_str, nop_func)
 
@@ -295,7 +306,7 @@ class Python36Parser(Python35Parser):
                 self.check_reduce['assign'] = 'token'
             elif opname == 'SETUP_WITH':
                 rules_str = """
-                withstmt   ::= expr SETUP_WITH POP_TOP suite_stmts_opt COME_FROM_WITH
+                with       ::= expr SETUP_WITH POP_TOP suite_stmts_opt COME_FROM_WITH
                                WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
 
                 # Removes POP_BLOCK LOAD_CONST from 3.6-
@@ -304,13 +315,13 @@ class Python36Parser(Python35Parser):
                 """
                 if self.version < 3.8:
                     rules_str += """
-                    withstmt   ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK
+                    with       ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK
                                    LOAD_CONST
                                    WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
                     """
                 else:
                     rules_str += """
-                    withstmt   ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK
+                    with       ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK
                                    BEGIN_FINALLY COME_FROM_WITH
                                    WITH_CLEANUP_START WITH_CLEANUP_FINISH
                                    END_FINALLY

uncompyle6/parsers/parse37.py

@@ -185,14 +185,14 @@ class Python37Parser(Python37BaseParser):
 
         _mklambda ::= mklambda
 
-        expr ::= conditional
+        expr      ::= if_exp
 
         ret_expr  ::= expr
         ret_expr  ::= ret_and
         ret_expr  ::= ret_or
 
         ret_expr_or_cond ::= ret_expr
-        ret_expr_or_cond ::= ret_cond
+        ret_expr_or_cond ::= if_exp_ret
 
         stmt ::= return_lambda
 
@@ -321,6 +321,7 @@ class Python37Parser(Python37BaseParser):
 
         import           ::= LOAD_CONST LOAD_CONST alias
         import_from_star ::= LOAD_CONST LOAD_CONST IMPORT_NAME IMPORT_STAR
+        import_from_star ::= LOAD_CONST LOAD_CONST IMPORT_NAME_ATTR IMPORT_STAR
         import_from      ::= LOAD_CONST LOAD_CONST IMPORT_NAME importlist POP_TOP
         importmultiple   ::= LOAD_CONST LOAD_CONST alias imports_cont
 
@@ -404,7 +405,7 @@ class Python37Parser(Python37BaseParser):
 
     def p_32on(self, args):
         """
-        conditional::= expr jmp_false expr jump_forward_else expr COME_FROM
+        if_exp::= expr jmp_false expr jump_forward_else expr COME_FROM
 
         # compare_chained2 is used in a "chained_compare": x <= y <= z
         # used exclusively in compare_chained
@@ -629,8 +630,8 @@ class Python37Parser(Python37BaseParser):
 
     def p_37conditionals(self, args):
         """
-        expr                       ::= conditional37
-        conditional37              ::= expr expr jf_cfs expr COME_FROM
+        expr                       ::= if_exp37
+        if_exp37              ::= expr expr jf_cfs expr COME_FROM
         jf_cfs                     ::= JUMP_FORWARD _come_froms
         ifelsestmt                 ::= testexpr c_stmts_opt jf_cfs else_suite opt_come_from_except
 
@@ -711,18 +712,18 @@ class Python37Parser(Python37BaseParser):
 
     def p_expr3(self, args):
         """
-        expr           ::= conditionalnot
-        conditionalnot ::= expr jmp_true  expr jump_forward_else expr COME_FROM
+        expr           ::= if_exp_not
+        if_exp_not     ::= expr jmp_true  expr jump_forward_else expr COME_FROM
 
         # a JUMP_FORWARD to another JUMP_FORWARD can get turned into
         # a JUMP_ABSOLUTE with no COME_FROM
-        conditional    ::= expr jmp_false expr jump_absolute_else expr
+        if_exp         ::= expr jmp_false expr jump_absolute_else expr
 
-        # if_expr_true are for conditions which always evaluate true
+        # if_exp_true are for conditions which always evaluate true
         # There is dead or non-optional remnants of the condition code though,
         # and we use that to match on to reconstruct the source more accurately
-        expr           ::= if_expr_true
-        if_expr_true   ::= expr JUMP_FORWARD expr COME_FROM
+        expr           ::= if_exp_true
+        if_exp_true    ::= expr JUMP_FORWARD expr COME_FROM
         """
 
     def p_generator_exp3(self, args):
@@ -921,7 +922,7 @@ class Python37Parser(Python37BaseParser):
         # FIXME: Common with 2.7
         ret_and    ::= expr JUMP_IF_FALSE_OR_POP ret_expr_or_cond COME_FROM
         ret_or     ::= expr JUMP_IF_TRUE_OR_POP ret_expr_or_cond COME_FROM
-        ret_cond ::= expr POP_JUMP_IF_FALSE expr RETURN_END_IF COME_FROM ret_expr_or_cond
+        if_exp_ret ::= expr POP_JUMP_IF_FALSE expr RETURN_END_IF COME_FROM ret_expr_or_cond
 
         jitop_come_from ::= JUMP_IF_TRUE_OR_POP come_froms
         jifop_come_from ::= JUMP_IF_FALSE_OR_POP come_froms
@@ -965,15 +966,15 @@ class Python37Parser(Python37BaseParser):
 
     def p_stmt3(self, args):
         """
-        stmt               ::= if_expr_lambda
-        stmt               ::= conditional_not_lambda
+        stmt               ::= if_exp_lambda
+        stmt               ::= if_exp_not_lambda
 
         # If statement inside a loop:
         stmt               ::= ifstmtl
 
-        if_expr_lambda     ::= expr jmp_false expr return_if_lambda
+        if_exp_lambda      ::= expr jmp_false expr return_if_lambda
                                return_stmt_lambda LAMBDA_MARKER
-        conditional_not_lambda
+        if_exp_not_lambda
                            ::= expr jmp_true expr return_if_lambda
                                return_stmt_lambda LAMBDA_MARKER
 
@@ -985,6 +986,7 @@ class Python37Parser(Python37BaseParser):
 
         stmt               ::= whileTruestmt
         ifelsestmt         ::= testexpr c_stmts_opt JUMP_FORWARD else_suite _come_froms
+        ifelsestmtl        ::= testexpr c_stmts_opt jump_forward_else else_suitec
 
         ifstmtl            ::= testexpr _ifstmts_jumpl
 
@@ -1090,7 +1092,7 @@ class Python37Parser(Python37BaseParser):
         jf_cf       ::= JUMP_FORWARD COME_FROM
         cf_jf_else  ::= come_froms JUMP_FORWARD ELSE
 
-        conditional ::= expr jmp_false expr jf_cf expr COME_FROM
+        if_exp ::= expr jmp_false expr jf_cf expr COME_FROM
 
         async_for_stmt     ::= setup_loop expr
                                GET_AITER
@@ -1206,25 +1208,31 @@ class Python37Parser(Python37BaseParser):
 
             elif opname == "BEFORE_ASYNC_WITH":
                 rules_str = """
-                  stmt ::= async_with_stmt
+                  stmt               ::= async_with_stmt SETUP_ASYNC_WITH
+                  async_with_pre     ::= BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM SETUP_ASYNC_WITH
+                  async_with_post    ::= COME_FROM_ASYNC_WITH
+                                         WITH_CLEANUP_START GET_AWAITABLE LOAD_CONST YIELD_FROM
+                                         WITH_CLEANUP_FINISH END_FINALLY
+
+                  stmt               ::= async_with_as_stmt
                   async_with_as_stmt ::= expr
-                               BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM
-                               SETUP_ASYNC_WITH store
+                                         async_with_pre
+                                         store
                                          suite_stmts_opt
                                          POP_BLOCK LOAD_CONST
-                               COME_FROM_ASYNC_WITH
-                               WITH_CLEANUP_START
-                               GET_AWAITABLE LOAD_CONST YIELD_FROM
-                               WITH_CLEANUP_FINISH END_FINALLY
-                 stmt ::= async_with_as_stmt
+                                         async_with_post
+
                  async_with_stmt     ::= expr
-                               BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM
-                               SETUP_ASYNC_WITH POP_TOP suite_stmts_opt
+                                         async_with_pre
+                                         POP_TOP
+                                         suite_stmts_opt
                                          POP_BLOCK LOAD_CONST
-                               COME_FROM_ASYNC_WITH
-                               WITH_CLEANUP_START
-                               GET_AWAITABLE LOAD_CONST YIELD_FROM
-                               WITH_CLEANUP_FINISH END_FINALLY
+                                         async_with_post
+                 async_with_stmt     ::= expr
+                                         async_with_pre
+                                         POP_TOP
+                                         suite_stmts_opt
+                                         async_with_post
                 """
                 self.addRule(rules_str, nop_func)
 
@@ -1262,7 +1270,7 @@ class Python37Parser(Python37BaseParser):
                 self.addRule(rule, nop_func)
             elif opname == "SETUP_WITH":
                 rules_str = """
-                withstmt   ::= expr SETUP_WITH POP_TOP suite_stmts_opt COME_FROM_WITH
+                with       ::= expr SETUP_WITH POP_TOP suite_stmts_opt COME_FROM_WITH
                                WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
 
                 # Removes POP_BLOCK LOAD_CONST from 3.6-
@@ -1271,13 +1279,13 @@ class Python37Parser(Python37BaseParser):
                 """
                 if self.version < 3.8:
                     rules_str += """
-                    withstmt   ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK
+                    with       ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK
                                    LOAD_CONST
                                    WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
                     """
                 else:
                     rules_str += """
-                    withstmt   ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK
+                    with       ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK
                                    BEGIN_FINALLY COME_FROM_WITH
                                    WITH_CLEANUP_START WITH_CLEANUP_FINISH
                                    END_FINALLY

uncompyle6/parsers/parse37base.py

@@ -159,12 +159,11 @@ class Python37BaseParser(PythonParser):
               stmt ::= assign2_pypy
               assign3_pypy       ::= expr expr expr store store store
               assign2_pypy       ::= expr expr store store
-              stmt               ::= if_expr_lambda
-              stmt               ::= conditional_not_lambda
-              if_expr_lambda     ::= expr jmp_false expr return_if_lambda
+              stmt               ::= if_exp_lambda
+              stmt               ::= if_exp_not_lambda
+              if_exp_lambda      ::= expr jmp_false expr return_if_lambda
                                      return_lambda LAMBDA_MARKER
-              conditional_not_lambda
-                                 ::= expr jmp_true expr return_if_lambda
+              if_exp_not_lambda  ::= expr jmp_true expr return_if_lambda
                                      return_lambda LAMBDA_MARKER
               """,
                 nop_func,
@@ -211,37 +210,111 @@ class Python37BaseParser(PythonParser):
 
                 if self.version < 3.8:
                     rules_str += """
+                      stmt                 ::= async_with_stmt SETUP_ASYNC_WITH
+                      c_stmt               ::= c_async_with_stmt SETUP_ASYNC_WITH
                       async_with_stmt      ::= expr
-                                              BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM
-                                              SETUP_ASYNC_WITH POP_TOP suite_stmts_opt
-                                              POP_BLOCK LOAD_CONST COME_FROM_ASYNC_WITH
-                                              WITH_CLEANUP_START
-                                              GET_AWAITABLE LOAD_CONST YIELD_FROM
-                                              WITH_CLEANUP_FINISH END_FINALLY
+                                               async_with_pre
+                                               POP_TOP
+                                               suite_stmts_opt
+                                               POP_BLOCK LOAD_CONST
+                                               async_with_post
+                      c_async_with_stmt    ::= expr
+                                               async_with_pre
+                                               POP_TOP
+                                               c_suite_stmts_opt
+                                               POP_BLOCK LOAD_CONST
+                                               async_with_post
+                      async_with_stmt      ::= expr
+                                               async_with_pre
+                                               POP_TOP
+                                               suite_stmts_opt
+                                               async_with_post
+                      c_async_with_stmt    ::= expr
+                                               async_with_pre
+                                               POP_TOP
+                                               c_suite_stmts_opt
+                                               async_with_post
                       async_with_as_stmt   ::= expr
-                                              BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM
-                                              SETUP_ASYNC_WITH store suite_stmts_opt
-                                              POP_BLOCK LOAD_CONST COME_FROM_ASYNC_WITH
-                                              WITH_CLEANUP_START
-                                              GET_AWAITABLE LOAD_CONST YIELD_FROM
-                                              WITH_CLEANUP_FINISH END_FINALLY
+                                               async_with_pre
+                                               store
+                                               suite_stmts_opt
+                                               POP_BLOCK LOAD_CONST
+                                               async_with_post
+                      c_async_with_as_stmt ::= expr
+                                              async_with_pre
+                                              store
+                                              c_suite_stmts_opt
+                                              POP_BLOCK LOAD_CONST
+                                              async_with_post
+                      async_with_as_stmt   ::= expr
+                                              async_with_pre
+                                              store
+                                              suite_stmts_opt
+                                              async_with_post
+                      c_async_with_as_stmt ::= expr
+                                              async_with_pre
+                                              store
+                                              suite_stmts_opt
+                                              async_with_post
                     """
                 else:
                     rules_str += """
+                      async_with_pre       ::= BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM SETUP_ASYNC_WITH
+                      async_with_post      ::= BEGIN_FINALLY COME_FROM_ASYNC_WITH
+                                               WITH_CLEANUP_START GET_AWAITABLE LOAD_CONST YIELD_FROM
+                                               WITH_CLEANUP_FINISH END_FINALLY
                       async_with_stmt      ::= expr
-                                              BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM
-                                              SETUP_ASYNC_WITH POP_TOP suite_stmts
-                                              POP_TOP POP_BLOCK BEGIN_FINALLY COME_FROM_ASYNC_WITH
-                                              WITH_CLEANUP_START
-                                              GET_AWAITABLE LOAD_CONST YIELD_FROM
+                                               async_with_pre
+                                               POP_TOP
+                                               suite_stmts
+                                               POP_TOP POP_BLOCK
+                                               async_with_post
+                      c_async_with_stmt    ::= expr
+                                               async_with_pre
+                                               POP_TOP
+                                               c_suite_stmts
+                                               POP_TOP POP_BLOCK
+                                               async_with_post
+                      async_with_stmt      ::= expr
+                                               async_with_pre
+                                               POP_TOP
+                                               suite_stmts
+                                               POP_BLOCK
+                                               BEGIN_FINALLY
+                                               WITH_CLEANUP_START GET_AWAITABLE LOAD_CONST YIELD_FROM
+                                               WITH_CLEANUP_FINISH POP_FINALLY LOAD_CONST RETURN_VALUE
+                                               COME_FROM_ASYNC_WITH
+                                               WITH_CLEANUP_START GET_AWAITABLE LOAD_CONST YIELD_FROM
+                                               WITH_CLEANUP_FINISH END_FINALLY
+                      c_async_with_stmt   ::= expr
+                                              async_with_pre
+                                              POP_TOP
+                                              c_suite_stmts
+                                              POP_BLOCK
+                                              BEGIN_FINALLY
+                                              WITH_CLEANUP_START GET_AWAITABLE LOAD_CONST YIELD_FROM
+                                              WITH_CLEANUP_FINISH POP_FINALLY LOAD_CONST RETURN_VALUE
+                                              COME_FROM_ASYNC_WITH
+                                              WITH_CLEANUP_START GET_AWAITABLE LOAD_CONST YIELD_FROM
                                               WITH_CLEANUP_FINISH END_FINALLY
                       async_with_as_stmt   ::= expr
-                                              BEFORE_ASYNC_WITH GET_AWAITABLE LOAD_CONST YIELD_FROM
-                                              SETUP_ASYNC_WITH store suite_stmts
-                                              POP_TOP POP_BLOCK BEGIN_FINALLY COME_FROM_ASYNC_WITH
-                                              WITH_CLEANUP_START
-                                              GET_AWAITABLE LOAD_CONST YIELD_FROM
-                                              WITH_CLEANUP_FINISH END_FINALLY
+                                               async_with_pre
+                                               store suite_stmts
+                                               POP_TOP POP_BLOCK
+                                               async_with_post
+                      c_async_with_as_stmt ::= expr
+                                               async_with_pre
+                                               store suite_stmts
+                                               POP_TOP POP_BLOCK
+                                               async_with_post
+                      async_with_as_stmt   ::= expr
+                                               async_with_pre
+                                               store suite_stmts
+                                               POP_BLOCK async_with_post
+                      c_async_with_as_stmt ::= expr
+                                               async_with_pre
+                                               store suite_stmts
+                                               POP_BLOCK async_with_post
                     """
                 self.addRule(rules_str, nop_func)
 
@@ -520,7 +593,7 @@ class Python37BaseParser(PythonParser):
 
                     stmt                ::= genexpr_func_async
 
-                    func_async_prefix   ::= SETUP_EXCEPT GET_ANEXT LOAD_CONST YIELD_FROM
+                    func_async_prefix   ::= _come_froms SETUP_EXCEPT GET_ANEXT LOAD_CONST YIELD_FROM
                     func_async_middle   ::= POP_BLOCK JUMP_FORWARD COME_FROM_EXCEPT
                                             DUP_TOP LOAD_GLOBAL COMPARE_OP POP_JUMP_IF_TRUE
                                             END_FINALLY COME_FROM
@@ -529,22 +602,24 @@ class Python37BaseParser(PythonParser):
                                             JUMP_BACK COME_FROM
                                             POP_TOP POP_TOP POP_TOP POP_EXCEPT POP_TOP
 
-                    expr                ::= listcomp_async
-                    listcomp_async      ::= LOAD_LISTCOMP LOAD_STR MAKE_FUNCTION_0
+                    expr                ::= list_comp_async
+                    list_comp_async     ::= LOAD_LISTCOMP LOAD_STR MAKE_FUNCTION_0
                                             expr GET_AITER CALL_FUNCTION_1
                                             GET_AWAITABLE LOAD_CONST
                                             YIELD_FROM
 
-                    expr                 ::= listcomp_async
-                    listcomp_async       ::= BUILD_LIST_0 LOAD_FAST func_async_prefix
+                    expr                ::= list_comp_async
+                    list_afor2          ::= func_async_prefix
                                             store func_async_middle list_iter
                                             JUMP_BACK COME_FROM
                                             POP_TOP POP_TOP POP_TOP POP_EXCEPT POP_TOP
-
+                    list_comp_async     ::= BUILD_LIST_0 LOAD_FAST list_afor2
+                    get_aiter           ::= LOAD_DEREF GET_AITER
+                    list_afor           ::= get_aiter list_afor2
+                    list_iter           ::= list_afor
                    """,
                     nop_func,
                 )
-                custom_ops_processed.add(opname)
             elif opname == "JUMP_IF_NOT_DEBUG":
                 v = token.attr
                 self.addRule(
@@ -920,15 +995,15 @@ class Python37BaseParser(PythonParser):
 
             elif opname == "SETUP_WITH":
                 rules_str = """
-                  stmt       ::= withstmt
+                  stmt       ::= with
                   stmt       ::= withasstmt
 
-                  withstmt   ::= expr SETUP_WITH POP_TOP suite_stmts_opt COME_FROM_WITH
+                  with       ::= expr SETUP_WITH POP_TOP suite_stmts_opt COME_FROM_WITH
                                  WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
                   withasstmt ::= expr SETUP_WITH store suite_stmts_opt COME_FROM_WITH
                                  WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
 
-                  withstmt   ::= expr
+                  with       ::= expr
                                  SETUP_WITH POP_TOP suite_stmts_opt
                                  POP_BLOCK LOAD_CONST COME_FROM_WITH
                                  WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
@@ -937,7 +1012,7 @@ class Python37BaseParser(PythonParser):
                                  POP_BLOCK LOAD_CONST COME_FROM_WITH
                                  WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
 
-                  withstmt   ::= expr
+                  with       ::= expr
                                  SETUP_WITH POP_TOP suite_stmts_opt
                                  POP_BLOCK LOAD_CONST COME_FROM_WITH
                                  WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
@@ -948,13 +1023,13 @@ class Python37BaseParser(PythonParser):
                 """
                 if self.version < 3.8:
                     rules_str += """
-                    withstmt   ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK
+                    with     ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK
                                    LOAD_CONST
                                    WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
                     """
                 else:
                     rules_str += """
-                      withstmt   ::= expr
+                      with    ::= expr
                                      SETUP_WITH POP_TOP suite_stmts_opt
                                      POP_BLOCK LOAD_CONST COME_FROM_WITH
                                      WITH_CLEANUP_START WITH_CLEANUP_FINISH END_FINALLY
@@ -963,7 +1038,7 @@ class Python37BaseParser(PythonParser):
                                      SETUP_WITH store suite_stmts_opt
                                      POP_BLOCK LOAD_CONST COME_FROM_WITH
 
-                       withstmt  ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK
+                       with    ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK
                                      BEGIN_FINALLY COME_FROM_WITH
                                      WITH_CLEANUP_START WITH_CLEANUP_FINISH
                                      END_FINALLY
@@ -993,6 +1068,7 @@ class Python37BaseParser(PythonParser):
             "_ifstmts_jump": ifstmts_jump,
             "and": and_check,
             "ifelsestmt": ifelsestmt,
+            "ifelsestmtl": ifelsestmt,
             "iflaststmt": iflaststmt,
             "iflaststmtl": iflaststmt,
             "ifstmt": ifstmt,
@@ -1013,6 +1089,7 @@ class Python37BaseParser(PythonParser):
         self.check_reduce["while1elsestmt"] = "noAST"
         self.check_reduce["_ifstmts_jump"] = "AST"
         self.check_reduce["ifelsestmt"] = "AST"
+        self.check_reduce["ifelsestmtl"] = "AST"
         self.check_reduce["iflaststmt"] = "AST"
         self.check_reduce["iflaststmtl"] = "AST"
         self.check_reduce["ifstmt"] = "AST"
@@ -1070,8 +1147,8 @@ class Python37BaseParser(PythonParser):
                 + token.kind
             )
 
-            # Note: semantic actions make use of the fact of wheter  "args_pos"
-            # zero or not in creating a template rule.
+            # Note: Semantic actions make use of whether or not "args_pos"
+            # is zero when creating a template rule.
             self.add_unique_rule(rule, token.kind, args_pos, customize)
         else:
             token.kind = self.call_fn_name(token)
@@ -1107,8 +1184,17 @@ class Python37BaseParser(PythonParser):
         n = len(tokens)
         last = min(last, n-1)
         fn = self.reduce_check_table.get(lhs, None)
+        try:
             if fn:
                 return fn(self, lhs, n, rule, ast, tokens, first, last)
+        except:
+            import sys, traceback
+            print("Exception in %s %s\n" +
+                  "rule: %s\n" +
+                  "offsets %s .. %s",
+                  (fn.__name__, sys.exc_info()[1], rule2str(rule), tokens[first].offset, otokens[last].offset))
+            print(traceback.print_tb(sys.exc_info()[2],-1))
+            raise ParserError(tokens[last], tokens[last].off2int(), self.debug["rules"])
 
         if lhs in ("aug_assign1", "aug_assign2") and ast[0][0] == "and":
             return True

uncompyle6/parsers/reducecheck/and_check.py

@@ -14,6 +14,9 @@ def and_check(self, lhs, n, rule, ast, tokens, first, last):
         if rule == ("and", ("expr", "jmp_false", "expr", "jmp_false")):
             jmp2_target = ast[3][0].attr
             return jmp_target != jmp2_target
+        elif rule == ("and", ("expr", "jmp_false", "expr", "POP_JUMP_IF_TRUE")):
+            jmp2_target = ast[3].attr
+            return jmp_target == jmp2_target
         elif rule == ("and", ("expr", "jmp_false", "expr")):
             if tokens[last] == "POP_JUMP_IF_FALSE":
                 # Ok if jump_target doesn't jump to last instruction

uncompyle6/parsers/reducecheck/and_not_check.py

@@ -0,0 +1,19 @@
+#  Copyright (c) 2020 Rocky Bernstein
+
+
+def and_not_check(
+    self, lhs, n, rule, ast, tokens, first, last
+) -> bool:
+    jmp = ast[1]
+    if jmp.kind.startswith("jmp_"):
+        if last == n:
+            return True
+        jmp_target = jmp[0].attr
+
+        if tokens[first].off2int() <= jmp_target < tokens[last].off2int():
+            return True
+        if rule == ("and_not", ("expr", "jmp_false", "expr", "POP_JUMP_IF_TRUE")):
+            jmp2_target = ast[3].attr
+            return jmp_target != jmp2_target
+        return jmp_target != tokens[last].off2int()
+    return False

uncompyle6/parsers/reducecheck/ifelsestmt.py

@@ -2,13 +2,8 @@
 
 from uncompyle6.scanners.tok import Token
 
-
-def ifelsestmt(self, lhs, n, rule, ast, tokens, first, last):
-    if (last + 1) < n and tokens[last + 1] == "COME_FROM_LOOP":
-        # ifelsestmt jumped outside of loop. No good.
-        return True
-
-    if rule not in (
+IFELSE_STMT_RULES = frozenset(
+    [
                 (
             "ifelsestmt",
             (
@@ -29,6 +24,34 @@ def ifelsestmt(self, lhs, n, rule, ast, tokens, first, last):
                 "\\e__come_froms",
             ),
         ),
+        (
+            "ifelsestmtl",
+            (
+                "testexpr",
+                "c_stmts_opt",
+                "jump_forward_else",
+                "else_suitec",
+            ),
+        ),
+        (
+            "ifelsestmtc",
+            (
+                "testexpr",
+                "c_stmts_opt",
+                "jump_forward_else",
+                "else_suitec",
+                "\\e__come_froms",
+            ),
+        ),
+        (
+            "ifelsestmtc",
+            (
+                "testexpr",
+                "c_stmts_opt",
+                "jump_absolute_else",
+                "else_suitec",
+            ),
+        ),
         (
             "ifelsestmt",
             (
@@ -39,6 +62,16 @@ def ifelsestmt(self, lhs, n, rule, ast, tokens, first, last):
                 "\\e_opt_come_from_except",
             ),
         ),
+        (
+            "ifelsestmt",
+            (
+                "testexpr",
+                "c_stmts_opt",
+                "JUMP_FORWARD",
+                "else_suite",
+                "come_froms",
+            ),
+        ),
         (
             "ifelsestmt",
             ("testexpr", "c_stmts", "come_froms", "else_suite", "come_froms",),
@@ -62,31 +95,53 @@ def ifelsestmt(self, lhs, n, rule, ast, tokens, first, last):
                 "else_suite",
             ),
         ),
-    ):
+    ])
+
+def ifelsestmt(self, lhs, n, rule, ast, tokens, first, last):
+
+    if (last + 1) < n and tokens[last + 1] == "COME_FROM_LOOP" and lhs != "ifelsestmtc":
+        # ifelsestmt jumped outside of loop. No good.
+        return True
+
+    if rule not in IFELSE_STMT_RULES:
+        # print("XXX", rule)
         return False
+
+    # Avoid if/else where the "then" is a "raise_stmt1" for an
+    # assert statemetn. Parse this as an "assert" instead.
+    stmts = ast[1]
+    if stmts in ("c_stmts",) and len(stmts) == 1:
+        raise_stmt1 = stmts[0]
+        if (
+                raise_stmt1 == "raise_stmt1" and
+                raise_stmt1[0] in ("LOAD_ASSERT",)
+        ):
+            return True
+
     # Make sure all of the "come froms" offset at the
     # end of the "if" come from somewhere inside the "if".
     # Since the come_froms are ordered so that lowest
     # offset COME_FROM is last, it is sufficient to test
     # just the last one.
-    come_froms = ast[-1]
-    if come_froms.kind != "else_suite":
-        if come_froms == "opt_come_from_except" and len(come_froms) > 0:
-            come_froms = come_froms[0]
-        if not isinstance(come_froms, Token):
-            if len(come_froms):
-                return tokens[first].offset > come_froms[-1].attr
-        elif tokens[first].offset > come_froms.attr:
+    if len(ast) == 5:
+        end_come_froms = ast[-1]
+        if end_come_froms.kind != "else_suite" and self.version >= 3.0:
+            if end_come_froms == "opt_come_from_except" and len(end_come_froms) > 0:
+                end_come_froms = end_come_froms[0]
+            if not isinstance(end_come_froms, Token):
+                if len(end_come_froms):
+                    return tokens[first].offset > end_come_froms[-1].attr
+            elif tokens[first].offset > end_come_froms.attr:
                 return True
 
-    # For mysterious reasons a COME_FROM in tokens[last+1] might be part of the grammar rule
-    # even though it is not found in come_froms.
-    # Work around this.
-    if (
-        last < n
-        and tokens[last] == "COME_FROM"
-        and tokens[first].offset > tokens[last].attr
-    ):
+        # FIXME: There is weirdness in the grammar we need to work around.
+        # we need to clean up the grammar.
+        if self.version < 3.0:
+            last_token = ast[-1]
+        else:
+            last_token = tokens[last]
+        if last_token == "COME_FROM" and tokens[first].offset > last_token.attr:
+            if self.version < 3.0 and self.insts[self.offset2inst_index[last_token.attr]].opname != "SETUP_LOOP":
                 return True
 
     testexpr = ast[0]
@@ -94,49 +149,66 @@ def ifelsestmt(self, lhs, n, rule, ast, tokens, first, last):
     # Check that the condition portion of the "if"
     # jumps to the "else" part.
     if testexpr[0] in ("testtrue", "testfalse"):
-        test = testexpr[0]
+        if_condition = testexpr[0]
 
         else_suite = ast[3]
-        assert else_suite == "else_suite"
+        assert else_suite.kind.startswith("else_suite")
 
-        if len(test) > 1 and test[1].kind.startswith("jmp_"):
+        if len(if_condition) > 1 and if_condition[1].kind.startswith("jmp_"):
             if last == n:
                 last -= 1
-            jmp = test[1]
+            jmp = if_condition[1]
             if self.version > 2.6:
                 jmp_target = jmp[0].attr
             else:
                 jmp_target = int(jmp[0].pattr)
 
 
-            # Make sure we don't jump at the end of the "then" inside the "else"
-            # (jf_cf_pop may be a 2.6ish specific thing.)
-            jf_cf_pop = ast[2]
+            # Below we check that jmp_target is jumping to a feasible
+            # location. It should be to the transition after the "then"
+            # block and to the beginning of the "else" block.
+            # However the "if/else" is inside a loop the false test can be
+            # back to the loop.
 
-            if jf_cf_pop == "jf_cf_pop" and jf_cf_pop[0] == "JUMP_FORWARD":
-                jump_forward = jf_cf_pop[0]
-                endif_target = int(jump_forward.pattr)
+            # FIXME: the below logic for jf_cfs could probably be
+            # simplified.
+            jump_else_end = ast[2]
+            if jump_else_end == "jf_cf_pop":
+                jump_else_end = jump_else_end[0]
+
+            jump_to_jump = False
+            if jump_else_end == "JUMP_FORWARD":
+                jump_to_jump = True
+                endif_target = int(jump_else_end.pattr)
                 last_offset = tokens[last].off2int()
                 if endif_target != last_offset:
                     return True
-
-            # The jump inside "else" check below should be added.
-            # add this until we can find out what's wrong with
-            # not being able to parse:
-            #     if a and b or c:
-            #         x = 1
-            #     else:
-            #         x = 2
-
-            # FIXME: add this
-            # if jmp_target < else_suite.first_child().off2int():
-            #     return True
+            last_offset = tokens[last].off2int(prefer_last=False)
+            if jmp_target == last_offset:
+                # jmp_target should be jumping to the end of the if/then/else
+                # but is it jumping to the beginning of the "else"
+                return True
+            if (
+                jump_else_end in ("jf_cfs", "jump_forward_else")
+                and jump_else_end[0] == "JUMP_FORWARD"
+            ):
+                # If the "else" jump jumps before the end of the the "if .. else end", then this
+                # is not this kind of "ifelsestmt".
+                jump_else_forward = jump_else_end[0]
+                jump_else_forward_target = jump_else_forward.attr
+                if jump_else_forward_target < last_offset:
+                    return True
+                pass
+            if (
+                jump_else_end in ("jb_elsec", "jb_elsel", "jf_cfs", "jb_cfs")
+                and jump_else_end[-1] == "COME_FROM"
+            ):
+                if jump_else_end[-1].off2int() != jmp_target:
+                    return True
 
             if tokens[first].off2int() > jmp_target:
                 return True
 
-            return (jmp_target > tokens[last].off2int()) and tokens[
-                last
-            ] != "JUMP_FORWARD"
+            return (jmp_target > last_offset) and tokens[last] != "JUMP_FORWARD"
 
     return False

uncompyle6/parsers/reducecheck/ifstmt.py

@@ -7,7 +7,9 @@ def ifstmt(self, lhs, n, rule, ast, tokens, first, last):
             last -= 1
             pass
         if tokens[last].attr and isinstance(tokens[last].attr, int):
-            return tokens[first].offset < tokens[last].attr
+            if tokens[first].offset >= tokens[last].attr:
+                return True
+            pass
         pass
 
     # Make sure jumps don't extend beyond the end of the if statement.
@@ -23,6 +25,9 @@ def ifstmt(self, lhs, n, rule, ast, tokens, first, last):
         # instead of POP_JUMP_IF, should we use op attributes?
         if t.kind in ("POP_JUMP_IF_FALSE", "POP_JUMP_IF_TRUE"):
             pjif_target = t.attr
+            target_instr = self.insts[self.offset2inst_index[pjif_target]]
+            if lhs == "iflaststmtl" and target_instr.opname == "JUMP_ABSOLUTE":
+                pjif_target = target_instr.arg
             if pjif_target > last_offset:
                 # In come cases, where we have long bytecode, a
                 # "POP_JUMP_IF_TRUE/FALSE" offset might be too

uncompyle6/parsers/reducecheck/ifstmts_jump.py

@@ -9,12 +9,6 @@ def ifstmts_jump(self, lhs, n, rule, ast, tokens, first, last):
         return False
 
     come_froms = ast[-1]
-    # Make sure all of the "come froms" offset at the
-    # end of the "if" come from somewhere inside the "if".
-    # Since the come_froms are ordered so that lowest
-    # offset COME_FROM is last, it is sufficient to test
-    # just the last one.
-
     # This is complicated, but note that the JUMP_IF instruction comes immediately
     # *before* _ifstmts_jump so that's what we have to test
     # the COME_FROM against. This can be complicated by intervening
@@ -28,31 +22,30 @@ def ifstmts_jump(self, lhs, n, rule, ast, tokens, first, last):
         "COME_FROM",
     ):
         pop_jump_index -= 1
-    come_froms = ast[-1]
 
     # FIXME: something is fishy when and EXTENDED ARG is needed before the
     # pop_jump_index instruction to get the argment. In this case, the
     # _ifsmtst_jump can jump to a spot beyond the come_froms.
     # That is going on in the non-EXTENDED_ARG case is that the POP_JUMP_IF
     # jumps to a JUMP_(FORWARD) which is changed into an EXTENDED_ARG POP_JUMP_IF
-    # to the jumped forwareded address
+    # to the jumped forwarded address
     if tokens[pop_jump_index].attr > 256:
         return False
 
+    pop_jump_offset = tokens[pop_jump_index].off2int(prefer_last=False)
     if isinstance(come_froms, Token):
         if (
-            tokens[pop_jump_index].attr < tokens[pop_jump_index].offset
-            and ast[0] != "pass"
+            tokens[pop_jump_index].attr < pop_jump_offset and ast[0] != "pass"
         ):
             # This is a jump backwards to a loop. All bets are off here when there the
             # unless statement is "pass" which has no instructions associated with it.
             return False
         return (
             come_froms.attr is not None
-            and tokens[pop_jump_index].offset > come_froms.attr
+            and pop_jump_offset > come_froms.attr
         )
 
     elif len(come_froms) == 0:
         return False
     else:
-        return tokens[pop_jump_index].offset > come_froms[-1].attr
+        return pop_jump_offset > come_froms[-1].attr

uncompyle6/parsers/reducecheck/or_check.py

@@ -1,9 +1,9 @@
 #  Copyright (c) 2020 Rocky Bernstein
 
-
+ASSERT_OPS = frozenset(["LOAD_ASSERT", "RAISE_VARARGS_1"])
 def or_check(self, lhs, n, rule, ast, tokens, first, last):
     if rule == ("or", ("expr", "jmp_true", "expr")):
-        if tokens[last] in ("LOAD_ASSERT", "RAISE_VARARGS_1",):
+        if tokens[last] in  ASSERT_OPS or tokens[last-1] in ASSERT_OPS:
             return True
 
         # The following test is be the most accurate. It prevents "or" from being

uncompyle6/parsers/reducecheck/tryelsestmt.py

@@ -7,6 +7,8 @@ def tryelsestmt(self, lhs, n, rule, ast, tokens, first, last):
     # inside the except handler to the end. If that happens
     # then this is a "try" with no "else".
     except_handler = ast[3]
+    if except_handler == "except_handler_else":
+        except_handler = except_handler[0]
     if except_handler == "except_handler":
 
         come_from = except_handler[-1]

uncompyle6/parsers/treenode.py

@@ -6,6 +6,7 @@ from spark_parser.ast import AST as spark_AST
 if PYTHON3:
     intern = sys.intern
 
+
 class SyntaxTree(spark_AST):
     def __init__(self, *args, **kwargs):
         spark_AST.__init__(self, *args, **kwargs)
@@ -17,7 +18,7 @@ class SyntaxTree(spark_AST):
         return len(self.data) == 1 and NoneToken == self.data[0]
 
     def __repr__(self):
-        return self.__repr1__('', None)
+        return self.__repr1__("", None)
 
     def __repr1__(self, indent, sibNum=None):
         rv = str(self.kind)
@@ -33,16 +34,16 @@ class SyntaxTree(spark_AST):
             else:
                 rv += " (transformed by %s)" % self.transformed_by
         rv = indent + rv
-        indent += '    '
+        indent += "    "
         i = 0
         for node in self:
-            if hasattr(node, '__repr1__'):
+            if hasattr(node, "__repr1__"):
                 if enumerate_children:
                     child = node.__repr1__(indent, i)
                 else:
                     child = node.__repr1__(indent, None)
             else:
-                inst = node.format(line_prefix='L.')
+                inst = node.format(line_prefix="")
                 if inst.startswith("\n"):
                     # Nuke leading \n
                     inst = inst[1:]

uncompyle6/scanners/tok.py

@@ -123,11 +123,17 @@ class Token:   # Python 2.4 can't have empty ()
     def __str__(self):
         return self.format(line_prefix="")
 
-    def format(self, line_prefix=""):
+    def format(self, line_prefix="", token_num=None):
+        if token_num is not None:
             if self.linestart:
-            prefix = "\n%s%4d  " % (line_prefix, self.linestart)
+                prefix = "\n(%03d)%s L.%4d  " % (token_num, line_prefix, self.linestart)
             else:
-            prefix = (" " * (6 + len(line_prefix)))
+                prefix = "(%03d)%s" % (token_num, " " * (9 + len(line_prefix)))
+        else:
+            if self.linestart:
+                prefix = "\n%s L.%4d  " % (line_prefix, self.linestart)
+            else:
+                prefix = " " * (9 + len(line_prefix))
         offset_opname = "%8s  %-17s" % (self.offset, self.kind)
 
         if not self.has_arg: