From 6aa4376fca9d6a975d969390a912874b992db411 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sun, 7 Jan 2018 08:40:57 -0500
Subject: [PATCH] Fix another 2.5- try/else (in loop) bug

---
 test/bytecode_2.4_run/02_try_else_loop.pyc | Bin 0 -> 529 bytes
 test/bytecode_2.4_run/03_try_else.pyc      | Bin 0 -> 510 bytes
 test/stdlib/runtests.sh                    |   4 ----
 uncompyle6/parser.py                       |   1 +
 uncompyle6/parsers/parse24.py              |  12 +++++++++++-
 uncompyle6/parsers/parse25.py              |   7 ++++++-
 uncompyle6/scanners/tok.py                 |  12 ++++++++----
 7 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 test/bytecode_2.4_run/02_try_else_loop.pyc
 create mode 100644 test/bytecode_2.4_run/03_try_else.pyc

diff --git a/test/bytecode_2.4_run/02_try_else_loop.pyc b/test/bytecode_2.4_run/02_try_else_loop.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..fcd11b61343dc597fa6c1be81d1685f3e84e8cb2
GIT binary patch
literal 529
zcmah`%Sr<=6g`>ggBGj>-{7Jyq_b*E!L^EyWf!ejDag>yq;;g7jL9u@pl+%^;m&XL
z3%r?1aU%xq$ssxC<R+PYZI$m&x`O~eL-2gTWp)`t;2jtM5_khdDA4m9-pJ%uTI9Oo
zGM@~K53nM15V{xx6W}S!7#DH<xWp@vRzVJyoF=dm=*K(A@xpT%stCa&K7e>27fA(z
zatL!)yuWfF{<Xdw|7GQ!K3}Eh<+;fY*}hw2x7BDZEZ8zfymqQ<VHC!7s_9{5WbH0Z
z<c-!!XFl$R%_^4M9WWY(RN{G~A)9?WoEk|LW|ziDO_7S%0rtqQeK?P64OC}lqFFMP
zzEN`>$mVE1X`eM)ZJ%`NOOEoVN+pdXr7CMl8u9}b8`ATDl(uo^kOATt1>uUSsEE9?
cw_zPGJJx>DFJ=u{7u^E0>@m)>C<~?SZ<r%n1poj5

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.4_run/03_try_else.pyc b/test/bytecode_2.4_run/03_try_else.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..58ce4945418f847eb9a6214f936e0f00c3c0be80
GIT binary patch
literal 510
zcmX|8!AiqG5Pg%hRwF4WB6zDpu_r5v7cVMWyj4w$N-sg1MOWKw$!?TFy;RSBtY6^F
zR$Q1jvorH%-X`OpINJWc84U4vLiVR@c9$UozJLJ-1jQKOlkgH?QUf`{oIqKKUaP{r
zLt+Tns%+<MmKm6NE>ldzy#YQ5c@re*P$v0w#i#2$GeA}q&gMM8G(xr{mAiZk702xn
zObp_a)jT5r-Oq^kFY~4@cL0~2zGep}lCH0MeJ!%=IzySi=H@+bjFo#f*>R(3waC>%
z^Dl5q94)FW1Sp0sVt4y6DpjW_OySn}I#7kV&~MsmllyE-dJ_+R6yMMia61fEk0&FQ
zT2mH7)qX6W4vyOUhp8*3sTx_eH<`K`w`C@E$~yUWc7p*FQzRC|6mnFjRq}EZDRvh-
hh3M)GXV$91{R@&OCsOn>JS6fq{$;?4-yw2W;$N2QQ`G<f

literal 0
HcmV?d00001

diff --git a/test/stdlib/runtests.sh b/test/stdlib/runtests.sh
index 10f60c4b..d268576a 100755
--- a/test/stdlib/runtests.sh
+++ b/test/stdlib/runtests.sh
@@ -12,7 +12,6 @@ typeset -A SKIP_TESTS
 case $PYVERSION in
     2.4)
 	SKIP_TESTS=(
-	    [test_binop.py]=1  # need to fix tryelse
 	    [test_codecs.py]=1    # need to fix tryelse
 	    [test_decorators.py]=1   # Syntax error decorators?
 	    [test_dis.py]=1   # We change line numbers - duh!
@@ -20,7 +19,6 @@ case $PYVERSION in
 	    [test_grp.py]=1      # Long test - might work Control flow?
 	    [test_imp.py]=1   # Control flow?
 	    [test_import.py]=1   # Control flow?
-	    [test_long_future.py]=1 # Control flow?
 	    [test_math.py]=1 # Control flow?
 	    [test_pwd.py]=1 # Long test - might work? Control flow?
 	    [test_queue.py]=1 # Control flow?
@@ -31,7 +29,6 @@ case $PYVERSION in
 	;;
     2.5)
 	SKIP_TESTS=(
-	    [test_binop.py]=1  # need to fix tryelse
 	    [test_codecs.py]=1    # need to fix tryelse
 	    [test_coercion.py]=1
 	    [test_contextlib.py]=1
@@ -43,7 +40,6 @@ case $PYVERSION in
 	    [test_grammar.py]=1  # Too many stmts. Handle large stmts
 	    [test_grp.py]=1      # Long test - might work Control flow?
 	    [test_imp.py]=1
-	    [test_long_future.py]=1 # Control flow?
 	    [test_math.py]=1 # Control flow?
 	    [test_pwd.py]=1 # Long test - might work? Control flow?
 	    [test_queue.py]=1 # Control flow?
diff --git a/uncompyle6/parser.py b/uncompyle6/parser.py
index 72855f60..200045cd 100644
--- a/uncompyle6/parser.py
+++ b/uncompyle6/parser.py
@@ -263,6 +263,7 @@ class PythonParser(GenericASTBuilder):
         c_stmts_opt ::= c_stmts
         c_stmts_opt ::= pass
 
+        # statements inside a loop
         l_stmts ::= _stmts
         l_stmts ::= returns
         l_stmts ::= continues
diff --git a/uncompyle6/parsers/parse24.py b/uncompyle6/parsers/parse24.py
index e1ee78f9..2c4584af 100644
--- a/uncompyle6/parsers/parse24.py
+++ b/uncompyle6/parsers/parse24.py
@@ -1,4 +1,4 @@
-#  Copyright (c) 2016-2017 Rocky Bernstein
+#  Copyright (c) 2016-2018 Rocky Bernstein
 """
 spark grammar differences over Python2.5 for Python 2.4.
 """
@@ -69,6 +69,7 @@ class Python24Parser(Python25Parser):
         super(Python24Parser, self).customize_grammar_rules(tokens, customize)
         if self.version == 2.4:
             self.check_reduce['nop_stmt'] = 'tokens'
+            self.check_reduce['try_except'] = 'tokens'
 
     def reduce_is_invalid(self, rule, ast, tokens, first, last):
         invalid = super(Python24Parser,
@@ -82,6 +83,15 @@ class Python24Parser(Python25Parser):
             l = len(tokens)
             if 0 <= l < len(tokens):
                 return not int(tokens[first].pattr) == tokens[last].offset
+        elif lhs == 'try_except':
+            if last == len(tokens):
+                last -= 1
+            if tokens[last] != 'COME_FROM' and tokens[last-1] == 'COME_FROM':
+                last -= 1
+            return (tokens[last] == 'COME_FROM'
+                    and tokens[last-1] == 'END_FINALLY'
+                    and tokens[last-2] == 'POP_TOP'
+                    and tokens[last-3].kind != 'JUMP_FORWARD')
 
         return False
 
diff --git a/uncompyle6/parsers/parse25.py b/uncompyle6/parsers/parse25.py
index 461c713f..cba2cdce 100644
--- a/uncompyle6/parsers/parse25.py
+++ b/uncompyle6/parsers/parse25.py
@@ -1,4 +1,4 @@
-#  Copyright (c) 2016-2017 Rocky Bernstein
+#  Copyright (c) 2016-2018 Rocky Bernstein
 """
 spark grammar differences over Python2.6 for Python 2.5.
 """
@@ -34,8 +34,13 @@ class Python25Parser(Python26Parser):
 
         store ::= STORE_NAME
 
+        # tryelsetmtl doesn't need COME_FROM since the jump might not
+        # be the the join point at the end of the "try" but instead back to the
+        # loop. FIXME: should "come_froms" below be a single COME_FROM?
         tryelsestmt    ::= SETUP_EXCEPT suite_stmts_opt POP_BLOCK
                            except_handler else_suite come_froms
+        tryelsestmtl   ::= SETUP_EXCEPT suite_stmts_opt POP_BLOCK
+                            except_handler else_suitel
 
         # Python 2.6 omits the LOAD_FAST DELETE_FAST below
         # withas is allowed as a "from future" in 2.5
diff --git a/uncompyle6/scanners/tok.py b/uncompyle6/scanners/tok.py
index f341e049..ae5e9309 100644
--- a/uncompyle6/scanners/tok.py
+++ b/uncompyle6/scanners/tok.py
@@ -1,4 +1,4 @@
-#  Copyright (c) 2016-2017 by Rocky Bernstein
+#  Copyright (c) 2016-2018 by Rocky Bernstein
 #  Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
 #  Copyright (c) 1999 John Aycock
 
@@ -34,14 +34,18 @@ class Token():
         self.opc = opc
 
     def __eq__(self, o):
-        """ '==', but it's okay if offsets and linestarts are different"""
+        """ '==' on kind and "pattr" attributes.
+            It is okay if offsets and linestarts are different"""
         if isinstance(o, Token):
-            # Both are tokens: compare type and attr
-            # It's okay if offsets are different
             return (self.kind == o.kind) and (self.pattr == o.pattr)
         else:
+            # ?? do we need this?
             return self.kind == o
 
+    def __ne__(self, o):
+        """ '!=', but it's okay if offsets and linestarts are different"""
+        return not self.__eq__(o)
+
     def __repr__(self):
         return str(self.kind)