From 874d196e5cf2b79c66321c5880399da67f1bcc89 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Thu, 13 Feb 2020 04:59:08 -0500
Subject: [PATCH] 3.x ifelsestmtc reduction rule fix

---
 test/bytecode_3.3_run/03_if_elif.pyc         | Bin 0 -> 668 bytes
 test/bytecode_3.5_run/03_if_elif.pyc         | Bin 0 -> 556 bytes
 test/bytecode_3.6/03_if_elif.pyc-notyet      | Bin 207 -> 0 bytes
 test/bytecode_3.6_run/03_if_elif.pyc         | Bin 0 -> 482 bytes
 test/bytecode_3.7/03_if_elif.pyc             | Bin 211 -> 0 bytes
 test/bytecode_3.7_run/03_if_elif.pyc         | Bin 0 -> 486 bytes
 test/simple_source/stmts/03_if_elif.py       |  23 +++++++++++++++++--
 test/stdlib/3.3-exclude.sh                   |   8 -------
 test/stdlib/3.4-exclude.sh                   |   4 ----
 test/stdlib/3.5-exclude.sh                   |  12 ----------
 test/stdlib/3.6-exclude.sh                   |   4 +---
 test/stdlib/3.7-exclude.sh                   |   6 ++---
 uncompyle6/parsers/reducecheck/ifelsestmt.py |  13 ++++++++++-
 13 files changed, 36 insertions(+), 34 deletions(-)
 create mode 100644 test/bytecode_3.3_run/03_if_elif.pyc
 create mode 100644 test/bytecode_3.5_run/03_if_elif.pyc
 delete mode 100644 test/bytecode_3.6/03_if_elif.pyc-notyet
 create mode 100644 test/bytecode_3.6_run/03_if_elif.pyc
 delete mode 100644 test/bytecode_3.7/03_if_elif.pyc
 create mode 100644 test/bytecode_3.7_run/03_if_elif.pyc

diff --git a/test/bytecode_3.3_run/03_if_elif.pyc b/test/bytecode_3.3_run/03_if_elif.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..85f3a61180bfdbf3647b34c11fd5cba05b65a3f8
GIT binary patch
literal 668
zcma)2O-sW-5S>lZG=|iJ(u+l;x1iJtf?h-vX^(}{n+KQLY+x}Tb+;=D^`ia*@7}!n
zKRo!KoY@4dcyY7yc4pq2?99GJtuW{guHIdM8LX@Z`e$hR3qb&=9tZ}iZT&XfVu)l9
zk~Pq~uyEmtQL?DSM^JREer#ok4D`5`p(er2;055)1K~m9(0)dA;l=@dUn^_MvsA-U
zuPYQ5`j%>1>f<+6Re6^Btf?e`NgU!tGY5edon#kidJkcVvu?tYQG>^i42qBfy-mb~
z(vD4|H;M7lU?dr$r1y%^Af~?=%1td^S6QM=7eUK>o(Zl?qh_M77x_Z>4-UCZxyWR?
zKYuV0syI)xvQ&w@<9vszC<)AGEi{jX?2oEyqlqd>Qt1;=gEBxE4P)xikk5HB%?0Om
zkV<Ta8={BPObfG)-nrI7Eo4~?lq%Jq%YJ6E-aiMU%TMw$F_}1}_VgBl&m!jHP#d9d
L&vp<69Y)_bqs(`m

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.5_run/03_if_elif.pyc b/test/bytecode_3.5_run/03_if_elif.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f6b5d43c97143788e22ed93bdcbd70f6f0b7f7b1
GIT binary patch
literal 556
zcmY+Au}T9$5QhJ~OD^Yeu~33w5J?q+U;-94B8tQ&kS3jlOU!QIFu4o6i6F#AZG8+u
zpToj;xYp`k!OEFU5Z$}^cV@qt-Pzr#R->@dy?*t9FZ>x4<BZIHl4!s*p#@CM`8A|l
z?ARuh)47L7;ZO%@-DUP%0;z!QVU>^qN<evd2CjT)AIkkt9#jdp9;{hsu2C6`0*7Ay
zpfXg&q0phX|7cZJcIab`)CLBv=yK%Ib$Ia1c0pzjNS1WRZ7iuhf#U~(G~&SSF&OZ&
z=a$JEwETV{sH7;9yrbpiVwj5?!*Ax~yJ3^*Y@(&j7G|W|c0QfkcIQYYW2q;}_;7Zg
z$5M_bS!PsnC*?j>+L#0)5LL30h=i%|e(oUl3dTji!Uq*0NxxOfLn+hYR7=U;IH6Nz
zzIkq~HuEG)yT)W@wbO5Vt44XJJUp3ZYBABL9NArxK*YkQ4&o?qb1jU+y5R2zXwGHg

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.6/03_if_elif.pyc-notyet b/test/bytecode_3.6/03_if_elif.pyc-notyet
deleted file mode 100644
index a4e8a24883bc8434282940082978d10c9cf9f332..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 207
zcmYj}u?oUK42F|>LQ#5%ldGd0RB#p1!PUjh<q%EbpuH<e9bA19S6`{CldsUpJ0}DA
z^8evaR#`Uaf1alf0p9Re!NWGR%mWB`OvpM+?bOc!Ph8yP1d<a<-XsrnaD^kx@G$GO
zsWI+ckugyfwv0;eM2H*f-JaR=3s{BkKXg;ERUJ~|Z+xMJG*u&u<;vK?P-%;KeQ(os
W<*&DrHt|YE0SZ%0Pz_Zi>f{UMQ!@Sl

diff --git a/test/bytecode_3.6_run/03_if_elif.pyc b/test/bytecode_3.6_run/03_if_elif.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..177dcac015d2ea45487855eebb0033dd0586d9a1
GIT binary patch
literal 482
zcmYk1y-ve05XbM_q%~2Sp#wt~C|ehb+JOZj5GoVu(v1PD)Q%L9kIGJwkit?BZ^FPU
zWo61MFmacn3S0L-`**$%PkX&U4rdRaEr4(Mx9AR6WbT8+fE^gLA^9-t8gK(mR){SU
zInMeNn-HBCbQ7i-Xw>2z?pvm%X}<~WJqdT$WH9lGw23_Y5np$RNFwV!;Ws{!EfamP
zfKhO}5;P4j_G~v~?u4YI(Mr^K4zHNW65U}53m_txlt}5Vd5!e4_DQ~ABr051_-Og3
zjr<H<oURk2T)wd@Gj>H<xbfLk#gQ^e9G$LTs;*K|lIK>(&q^Iprt6XbdKi#-DA9Jf
zUekzAHHYgq3pc7I$$aEhQmJg28m0IY#ne?*;k9$d7IB`<tj+DN(tf<%pj@ev7iq3H
XiMiyP8<22k!TkfT@u8HmkGy{YOI~C6

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.7/03_if_elif.pyc b/test/bytecode_3.7/03_if_elif.pyc
deleted file mode 100644
index 33f5a30a4e12fe89c1437cd25387c1bf993decab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 211
zcmXwxu?hk)42F}l!l78i$<^_0P{CD12Uiz2mm*#c3fESWb8z)ZTzw^1CttzIR`7>>
z`Tvk)GZ^$Bs{6hlJ_zti;jfrs9ZRMW1Uw>S9lQ4Gmw?AU%}N3(38iea8+xc<4+ZXu
z&NDa09~~K!Ty2}=^hSiZwZU(h13!RO{QkpdBG#SbmV^tRXeO;|Wj0?JTN`R@Jw0Ea
Y`O<~z($Feh$uL4;jv1=HN<^J~0rEXF3;+NC

diff --git a/test/bytecode_3.7_run/03_if_elif.pyc b/test/bytecode_3.7_run/03_if_elif.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1340d45eeb3fa71ef031e1e576a5056de87c58e0
GIT binary patch
literal 486
zcmX|+J5R$f5XbMFgqo<$(1D=~l&uRzWne*whsuPybYrMhYDbF5qq0*Zq_7mkH(}r_
zWo61&VB)TYo^}7TfA&3m)9HjjCi~;rrw8!Ohkv6pT#>sE5(Bnp&_)!ayluesG<hl3
zNaQH*(%p#Y$e<fB%|W9U@9^LmPt$r6+J6%6ev`o@AhJhf_D2HUA|i<_cZA;rMAl67
z{uBn`-9pebY#iBd$=xwYMWa=y@f=<;mle8$3Z_6rFsYEzy-9=gvI$7OU?6Io*Z64p
zryKd{yChqtM!8~T7iQ?ntaQWEGnK^3q)B|Te5u<?#c5GkojfabNSUrp0_bB%?xRH8
z;(D7#yleQn*<;~GjU<^2{8}oN&oiSG@8X2Isye!M&e$?3^0Bpr-B#L-w;hx#)$$@M
Y^eQ!%d~!V!?ku=}=x<^qrR*ZFUuigG2LJ#7

literal 0
HcmV?d00001

diff --git a/test/simple_source/stmts/03_if_elif.py b/test/simple_source/stmts/03_if_elif.py
index 798f86b2..615a1b72 100644
--- a/test/simple_source/stmts/03_if_elif.py
+++ b/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
diff --git a/test/stdlib/3.3-exclude.sh b/test/stdlib/3.3-exclude.sh
index d1a69501..01b6b3ad 100644
--- a/test/stdlib/3.3-exclude.sh
+++ b/test/stdlib/3.3-exclude.sh
@@ -1,13 +1,5 @@
 SKIP_TESTS=(
-    [test_binop.py]=1  # FIXME: Works on c90ff51
-    [test_cgi.py]=1  # FIXME: Works on c90ff51
     [test_buffer.py]=1  # FIXME: Works on c90ff51
-    [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_shutil.py]=1  # FIXME: Works on c90ff51
-    [test_strftime.py]=1  # FIXME: Works on c90ff51
 
     [test_atexit.py]=1  # The atexit test starting at 3.3 looks for specific comments in error lines
 
diff --git a/test/stdlib/3.4-exclude.sh b/test/stdlib/3.4-exclude.sh
index dc70df5f..716ba1df 100644
--- a/test/stdlib/3.4-exclude.sh
+++ b/test/stdlib/3.4-exclude.sh
@@ -1,9 +1,5 @@
 SKIP_TESTS=(
     [test_buffer.py]=1  # FIXME: Works on c90ff51
-    [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_shutil.py]=1  # FIXME: Works on c90ff51
     [test_strftime.py]=1  # FIXME: Works on c90ff51
 
     [test___all__.py]=1  # it fails on its own
diff --git a/test/stdlib/3.5-exclude.sh b/test/stdlib/3.5-exclude.sh
index 9b0b304f..4ba394b5 100644
--- a/test/stdlib/3.5-exclude.sh
+++ b/test/stdlib/3.5-exclude.sh
@@ -1,17 +1,5 @@
 SKIP_TESTS=(
     [test_buffer.py]=1  # FIXME: Works on c90ff51
-    [test_decorators.py]=1  # FIXME: Works on c90ff51
-    [test_ftplib.py]=1 # FIXME: Works on c90ff51
-    [test_optparse.py]=1 # FIXME: Works on c90ff51
-    [test_os.py]=1  # FIXME: Works on c90ff51
-    [test_poplib.py]=1  # FIXME: Works on c90ff51?
-    [test_platform.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_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  #
diff --git a/test/stdlib/3.6-exclude.sh b/test/stdlib/3.6-exclude.sh
index ea27cbba..68433ec6 100644
--- a/test/stdlib/3.6-exclude.sh
+++ b/test/stdlib/3.6-exclude.sh
@@ -1,13 +1,11 @@
 SKIP_TESTS=(
     [test_ast.py]=1 # FIXME: Works on c90ff51
-    [test_binop.py]=1 # FIXME: Works on c90ff51
-    [test_complex.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_timeit.py]=1 # FIXME: Works on c90ff51
-    [test_os.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  #
diff --git a/test/stdlib/3.7-exclude.sh b/test/stdlib/3.7-exclude.sh
index 1e0ce7db..a00d6382 100644
--- a/test/stdlib/3.7-exclude.sh
+++ b/test/stdlib/3.7-exclude.sh
@@ -1,5 +1,4 @@
 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
@@ -10,12 +9,11 @@ SKIP_TESTS=(
     [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_string_literals.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  # Investigate improper lamdba with bogus "False" added
-    [test_grammar.py]=1 # investigate: like above: semantic rule missing probably
+    [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
diff --git a/uncompyle6/parsers/reducecheck/ifelsestmt.py b/uncompyle6/parsers/reducecheck/ifelsestmt.py
index 319b9bd9..25580f07 100644
--- a/uncompyle6/parsers/reducecheck/ifelsestmt.py
+++ b/uncompyle6/parsers/reducecheck/ifelsestmt.py
@@ -33,13 +33,23 @@ IFELSE_STMT_RULES = frozenset(
                 "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"
+                "else_suitec",
             ),
         ),
         (
@@ -94,6 +104,7 @@ def ifelsestmt(self, lhs, n, rule, ast, tokens, first, last):
         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