From 29715bb8bfe35adce53d7a863ad4ec9f60029352 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Wed, 22 Jan 2020 22:50:27 -0500
Subject: [PATCH] 3.8 ifelsestmt grammar rule...

and remove optional "c_stmts" in 3.7 "ifelsesmt" rule. We may
have to come back and add something, but when we do we'll be more
careful and this is probably all for the better.
---
 test/bytecode_3.8/01_extended_arg.pyc            | Bin 0 -> 2582 bytes
 ...p_back.pyc => 04_for_no_jump_back.pyc-notyet} | Bin
 uncompyle6/parsers/parse37.py                    |   2 +-
 uncompyle6/parsers/parse38.py                    |   4 ++++
 4 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 test/bytecode_3.8/01_extended_arg.pyc
 rename test/bytecode_3.8_run/{04_for_no_jump_back.pyc => 04_for_no_jump_back.pyc-notyet} (100%)

diff --git a/test/bytecode_3.8/01_extended_arg.pyc b/test/bytecode_3.8/01_extended_arg.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..54c3327517d7ba4a665d3e6df78492215208fc80
GIT binary patch
literal 2582
zcmds3OK%)S5bo-k>FHhXItd2@fe22KHU|=floN^)CBOyw;vmR~Fj{Z7&4_)udY0JH
ztb}lWfd58*54RCFE-Ysb5eML_c4C5k;1Vgwz51#jTm7o~x@x}Y_qz(^Co}k_e^IGl
zr1Nq~(YXzTuOYnR)G0?#R6$O=1hw|srMu+GWrv9~-|29zPJX15(Hx@|qqk+$bzB#7
zQn%)Ms594h>!^*pu%!kUM}#e26ln|Y0znSp2s(Omm7)Dq4XC9dYqX>I<7%iT^RX|(
zY{4UceS5L{(aq~OJ}muy?WfMWa>%<M%n#ahr~2Nn$(k}(5zBI;MB2}bK`s5b@$YCf
z>YjS|+cI&qOq~W2AO$kO06AcR4$uYu?|N#PHCgz%(fn&e&K#14rMCc=Y^gmscuPH9
z+gyn~R^oz{m}(_9S&1V!j)|F8xd<zwBY%kAz_4hxv{U5cD%762FkxJcd}#CV?QrhP
zy2#)X=6~GBvTplM?L%Eo-H>^BP{ujsWHGKQS54NT5T+1{ET!tq@70fCpPuG7up`S2
zKV`Y%{doD2T>eFo;S;{xfNkJ^1D+W0#DFITJTc&j0Z$BgV!#svo|yBf*U&xn@ai&e
z^bv)PCW$gVB7VQgYIR7Yrt*I55$!41#tPS1tcmyBxqmSCpD@pO&}q})$2%=eo|9?2
zr4b`MDZT{J(&Lu)Pt(Un`pjpK-h)awf>8PlPgMHqnR1qm$NOqahV);l)_<l+S6j`O
zai)JoIU$Z*|1J>T0(l-=(1N~H(;neLl6s(~`m5s*^lYi+KTwNcLW21aa{&Y7fCV~0
z7dS_HdzVj0avWfiqVM-deqL9z>F0<r{5Fi&CKx--h;?Daox0{~dx7RnG4c}#MH;W$
zkb#F@6GMpK#W_YX3CW32Boj$La-j<@G>AO#q>hj384{2rA4x9%m4MEX-d<0<KUmw0
zL6{}s#6ZmQ)xwg<V?^ejwE7|>Q}6{5F&$+^#=ho*B3<w}6glK<?x#h9MhqsWNz*N3
z91-o$uuAv=LJ`8o>m<t+oMCg2x3(;IDtzXY@w+8vr*{2L2%hCN#NZi&Ok@|!te37Q
g_BhV8_T$OSEyn(qr1BsZOS?9){SDek?3?z|-$3uW1ONa4

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.8_run/04_for_no_jump_back.pyc b/test/bytecode_3.8_run/04_for_no_jump_back.pyc-notyet
similarity index 100%
rename from test/bytecode_3.8_run/04_for_no_jump_back.pyc
rename to test/bytecode_3.8_run/04_for_no_jump_back.pyc-notyet
diff --git a/uncompyle6/parsers/parse37.py b/uncompyle6/parsers/parse37.py
index 00239333..cf1d3a61 100644
--- a/uncompyle6/parsers/parse37.py
+++ b/uncompyle6/parsers/parse37.py
@@ -818,7 +818,7 @@ class Python37Parser(Python37BaseParser):
 
         # This handles the case where a "JUMP_ABSOLUTE" is part
         # of an inner if in c_stmts_opt
-        ifelsestmt ::= testexpr c_stmts_opt come_froms
+        ifelsestmt ::= testexpr c_stmts come_froms
                        else_suite come_froms
 
         # ifelsestmt ::= testexpr c_stmts_opt jump_forward_else
diff --git a/uncompyle6/parsers/parse38.py b/uncompyle6/parsers/parse38.py
index 7a481386..a8d7efad 100644
--- a/uncompyle6/parsers/parse38.py
+++ b/uncompyle6/parsers/parse38.py
@@ -88,6 +88,10 @@ class Python38Parser(Python37Parser):
         ifpoplaststmtl     ::= testexpr POP_TOP c_stmts_opt JUMP_BACK
         ifelsestmtl        ::= testexpr c_stmts_opt jb_cfs else_suitel JUMP_BACK come_froms
 
+        # Keep indices the same in ifelsestmtl
+        cf_pt              ::= COME_FROM POP_TOP
+        ifelsestmtl        ::= testexpr c_stmts cf_pt else_suite
+
         for38              ::= expr get_iter store for_block JUMP_BACK
         for38              ::= expr get_for_iter store for_block JUMP_BACK
         for38              ::= expr get_for_iter store for_block JUMP_BACK POP_BLOCK