From f030b3316c467102c37feb5cf563e85a2122f1f0 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Fri, 12 Jul 2024 11:21:48 -0400
Subject: [PATCH] Fix some 2.5 parsing bugs

---
 test/bytecode_2.5/06_if_and_bugs.pyc       | Bin 0 -> 786 bytes
 test/simple_source/bug25/06_if_and_bugs.py |  18 ++++++++++++++++++
 uncompyle6/parsers/parse25.py              |   5 +++++
 uncompyle6/semantics/customize25.py        |   1 +
 4 files changed, 24 insertions(+)
 create mode 100644 test/bytecode_2.5/06_if_and_bugs.pyc
 create mode 100644 test/simple_source/bug25/06_if_and_bugs.py

diff --git a/test/bytecode_2.5/06_if_and_bugs.pyc b/test/bytecode_2.5/06_if_and_bugs.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f3fb33e467771693fc8174ae4359f09f89966bcb
GIT binary patch
literal 786
zcmbVKOG_L<5U!e4ceAXIcnEkgC&`?AfjI;bAre@GMP>!Tunc2Q&pJ3x?@srq0nH^I
za`m_P&-?{`)w}9h2kNWp>U#B8^Y}F1{@;Db6ivSXdLLp}0BJxe(LK{CQ_6HtbP7*E
z{jh;sB`^aK{S#s@0JlUrkr@!*GUYz+ACu|g9FX||g#cKa#5Y?$I-rBWD%~{*0XeWi
zlF%Y{Gt?jN5JOJJYI+_LmrRVg`k@Tlv(kQj^e3Eyb_)Pyu5{HcRZ-jgO1l<Zx=ihL
z?#|u(%l%QJE|Q_Pt__cMN#!O1@}T3Y)@Y96rqrPr{$zELc_YgU?V50pCPlpSIw@TU
zA9=8Auxx%gDs*g3T`9eBRu8v#Ha5S<c@`&S8sls+x1Udvf1#?p$SzA2Zu1g<<~Gei
zF9jV|awoIQLOk7vFu<nSpOA`i)`^D*x(lXjI2e4H5(`$b46Fp)E|0&`U#vhV#xh^&
zWYp`uJy)4Bb3&@sNu|ys=^aUP9}>w;BqaFP$G^7*PBx)$)Q4F3gxnVvwq=X910ZgK
nh$esI7We#L=O>6{Y0)C!t=Btgw=HDvUYfKn^q!|(pwoE<qI{H7

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug25/06_if_and_bugs.py b/test/simple_source/bug25/06_if_and_bugs.py
new file mode 100644
index 00000000..0dbd1636
--- /dev/null
+++ b/test/simple_source/bug25/06_if_and_bugs.py
@@ -0,0 +1,18 @@
+# 2.5 Bug is from nose/plugins/cover.py
+def wantFile(self, file, package=None):
+    if self.coverInclusive:
+        if file.endswith(".py"):
+            if package and self.coverPackages:
+                for want in self.coverPackages:
+                    if package.startswith(want):
+                        return True
+            else:
+                return True
+    return None
+
+
+# 2.5 bug is from nose/plugins/doctests.py
+def wantFile2(self, file):
+    if self and (self.conf or [exc.search(file) for exc in self.conf]):
+        return True
+    return None
diff --git a/uncompyle6/parsers/parse25.py b/uncompyle6/parsers/parse25.py
index c9aebb0e..06bea5b8 100644
--- a/uncompyle6/parsers/parse25.py
+++ b/uncompyle6/parsers/parse25.py
@@ -62,6 +62,11 @@ class Python25Parser(Python26Parser):
         kv     ::= DUP_TOP expr ROT_TWO expr STORE_SUBSCR
 
         _ifstmts_jump ::= c_stmts_opt COME_FROM JUMP_ABSOLUTE COME_FROM POP_TOP
+
+
+        # "and_then" is a hack around the fact we have THEN detection.
+        and_then ::= expr JUMP_IF_FALSE THEN POP_TOP expr JUMP_IF_FALSE THEN POP_TOP
+        testexpr_then ::= and_then
         """
 
     def customize_grammar_rules(self, tokens, customize):
diff --git a/uncompyle6/semantics/customize25.py b/uncompyle6/semantics/customize25.py
index ee3a2d44..d3df25d2 100644
--- a/uncompyle6/semantics/customize25.py
+++ b/uncompyle6/semantics/customize25.py
@@ -33,6 +33,7 @@ def customize_for_version25(self, version):
             # Note: It is safe to put the variables after "as" in parenthesis,
             # and sometimes it is needed.
             "with": ("%|with %c:\n%+%c%-", 0, 3),
+            "and_then": ("%c and %c", (0, "expr"), (4, "expr")),
         }
     )