From 027c9a7dc09d56f4ce69e618361c73cb7ff5c3d5 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Fri, 17 Jan 2020 04:29:47 -0500
Subject: [PATCH] Fix "for ... if" bug introduced since 3.6.2...

However we've isolated and documented the 3.x grammar a little bit better
---
 test/bytecode_3.2/10_for_if_loopback.pyc        | Bin 513 -> 0 bytes
 test/bytecode_3.2_run/10_for_if_loopback.pyc    | Bin 0 -> 925 bytes
 test/bytecode_3.7_run/10_for_if_loopback.pyc    | Bin 0 -> 644 bytes
 .../simple_source/looping/10_for_if_loopback.py |  16 ++++++++++++++++
 uncompyle6/parsers/parse3.py                    |  12 +++++++++---
 uncompyle6/parsers/parse37.py                   |   2 ++
 uncompyle6/semantics/consts.py                  |   9 ++++-----
 7 files changed, 31 insertions(+), 8 deletions(-)
 delete mode 100644 test/bytecode_3.2/10_for_if_loopback.pyc
 create mode 100644 test/bytecode_3.2_run/10_for_if_loopback.pyc
 create mode 100644 test/bytecode_3.7_run/10_for_if_loopback.pyc

diff --git a/test/bytecode_3.2/10_for_if_loopback.pyc b/test/bytecode_3.2/10_for_if_loopback.pyc
deleted file mode 100644
index 4852bf41cb5ef0a7f20a9efe549f97fb2c7bb005..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 513
zcmbVHQA@)x5dM<YI>)Ac^#=$A!OcfOM9}BK7%~(j*0dY#+NEn2n9x4y5BDwz${tN}
zU+%uU+?Okdqrr1JUTFMTg8X|jJ0eJdFW`k7fq5*6(VXXXL>7=eklBi01#|-YH?%+j
zJib1mll-uiC<N9an&`(T^1SO|KSA50!V7c(+5oA<TB4a@d&8#{C?xZr0)pbjHUgam
zeQF-}NO9^;2$iy>*;%Dr-$!Y#cS`vJckG#}F$Y-}QX;AAY?H=3h~sv;w2p&KQf1ch
zoZ82}z2jLq6VnY3?vgy4S9O^wYh0tVacNAQZ&u^$iCUUQ<x9oPd!pA@^@kf!z5lFN
pIOW$70YoSwaVAEzha!~In6(e8e`Wut-KUnfl}TNh-Fame{suisXnOzv

diff --git a/test/bytecode_3.2_run/10_for_if_loopback.pyc b/test/bytecode_3.2_run/10_for_if_loopback.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a7670f204a51810339af7252bc33ed3f4ac24844
GIT binary patch
literal 925
zcmbtRQESvd5S~e{xw~@p@>nTUd=L&qTlGm0saT6o1-VK=sB27e$KEB`+-??5$i3J;
z_^)+lQnl7M-Rw?g=G#oZ`KB1{Y(LxF|Cqv!6_S5M$9*G{0bBumAP2=k$Pwlg_TVyr
zYzvkFxJS^0@bwoI3Dg(p?QbXxV2+S==s?ifUuai05cKLA%|e(?hD0VsGQ76v^ys{%
z<4Q8bXoIl+1TDY<;P~P_Y=|C08^8i#8G((jeM;Wlgs?t@Hl&LWVAF%P2gHtAvF~8@
zoOg?`2snR<fE1svVxWCadQ2y*(5YueO1Z)`PANZ-DAQ@9lw9zA$&}XILVZL)QrCHv
zO}G)y<<i1=4yvTgo##GNiKV>fUKyFt8^rjB<T+i|MXsFjHq8$TV`^Q^51t&VnXyXG
z6lXps>GE;?#c$JnAuE3v^VcyMzzAa;;|@I|jDj@aBrPVzzDRtJob@h?dwdbIvLuh~
zvz@N`Buem86wS=_cUm1)t|GrKbd|d%u}#-pA}#9w=x0Qgi^MhhDVMIyKE-Z82B?z=
z2Pjld&xFj0*p8P-{-+xLb}<qB%=+Blp@OfR%Wb1g^~PFbWh^I2;ciUh-$uf0Uz8^E
TMgCF-!mNhlVYG*PxQ{;o0<*=|

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.7_run/10_for_if_loopback.pyc b/test/bytecode_3.7_run/10_for_if_loopback.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7e5217e0ab982c2db91a8b0307143ed9b6146b70
GIT binary patch
literal 644
zcmYjOOKTKC5U%QZ>|~ua5^^yI!Q5sAqtTND@fkcVLWDq2+i`lbOm=p9rh5V_^jy>*
zqDTKyUj-q5!HZV+CXgEXtD3L6p8aAn83W0q;qJ#jA;53<b0q;8&*<n+1OfzphZ7J?
z1f;RVIf(EZ6VZa{-JX42Gw~(!c+H5>9K{v)<{IZBM-=(qaUwZ_Y@<Lb<0QH~FG=gS
z1ala0b!gxWUcrZhfeAG13>UFVofdc-hG4a80`l$*p$P?BF!iLHc2k2tm<fL(LN`5z
zE<L6>s8%qu8=UJ}_L_5>a4xE%=R6DSi1VeAoGV6kZJf7l*@!H%K~ZZPHTkmC77H8s
zSQ|Rx7bv&GzxQ;tZ0nM1d9I3bua>f{n)%+t2mDkjUY&Bse9nu-{q~C;`|3X5rW^AX
z0bqzJj{TQl$W%&P;Tmz`Uc=dbD?4PYwvF3IIxvGOHh2VGO!JY>*zDpTiSH{5PR4cB
zl)BGVPtE5REALpt4a#KGI@f)*@2)lS4lz0*0O};f1eI&<oth9HUbsh^Wr6R_JM7Kp
nT9>M?Wb;}nsjlUAYf-*Ha<G)*ye^;mVI7}rCh-<-;WqvU_N0-)

literal 0
HcmV?d00001

diff --git a/test/simple_source/looping/10_for_if_loopback.py b/test/simple_source/looping/10_for_if_loopback.py
index 4c738c7a..9f9b4cf4 100644
--- a/test/simple_source/looping/10_for_if_loopback.py
+++ b/test/simple_source/looping/10_for_if_loopback.py
@@ -11,6 +11,7 @@
 #       101_0	COME_FROM         '50' statement: if name == ...to fictional "end if"
 #         101	JUMP_BACK         '16' jump as before to loop head
 
+# RUNNABLE!
 def _slotnames(cls):
     names = []
     for c in cls.__mro__:
@@ -21,3 +22,18 @@ def _slotnames(cls):
                     continue
                 else:
                     names.append(name) # 3.2 bug here jumping to outer for
+
+# From 3.2.6 pdb.py
+# There is no "come_from" after the "if" since the
+# if jumps back to the loop. For this we use
+# grammar rule "ifstmtl"
+def lasti2lineno(linestarts, a):
+    for i in linestarts:
+        if a:
+            return a
+    return -1
+
+assert lasti2lineno([], True) == -1
+assert lasti2lineno([], False) == -1
+assert lasti2lineno([1], False) == -1
+assert lasti2lineno([1], True) == 1
diff --git a/uncompyle6/parsers/parse3.py b/uncompyle6/parsers/parse3.py
index 73e48984..552f45a5 100644
--- a/uncompyle6/parsers/parse3.py
+++ b/uncompyle6/parsers/parse3.py
@@ -141,18 +141,20 @@ class Python3Parser(PythonParser):
         assert_expr_or ::= assert_expr jmp_true expr
         assert_expr_and ::= assert_expr jmp_false expr
 
-        ifstmt ::= testexpr _ifstmts_jump
+        ifstmt  ::= testexpr _ifstmts_jump
 
         testexpr ::= testfalse
         testexpr ::= testtrue
         testfalse ::= expr jmp_false
         testtrue ::= expr jmp_true
 
-        _ifstmts_jump ::= return_if_stmts
-        _ifstmts_jump ::= c_stmts_opt come_froms
+        _ifstmts_jump  ::= return_if_stmts
+        _ifstmts_jump  ::= c_stmts_opt come_froms
+        _ifstmts_jumpl ::= return_if_stmts
 
         iflaststmt  ::= testexpr c_stmts_opt JUMP_ABSOLUTE
         iflaststmtl ::= testexpr c_stmts_opt JUMP_BACK
+        iflaststmtl ::= testexpr _ifstmts_jumpl
 
         # These are used to keep parse tree indices the same
         jump_forward_else  ::= JUMP_FORWARD ELSE
@@ -330,6 +332,10 @@ class Python3Parser(PythonParser):
     def p_stmt3(self, args):
         """
         stmt               ::= if_expr_lambda
+
+        # If statement inside a loop:
+        lastl_stmt         ::= ifstmtl
+
         stmt               ::= conditional_not_lambda
         if_expr_lambda     ::= expr jmp_false expr return_if_lambda
                                return_stmt_lambda LAMBDA_MARKER
diff --git a/uncompyle6/parsers/parse37.py b/uncompyle6/parsers/parse37.py
index 26934a09..a044d81f 100644
--- a/uncompyle6/parsers/parse37.py
+++ b/uncompyle6/parsers/parse37.py
@@ -952,6 +952,8 @@ class Python37Parser(Python37BaseParser):
         """
         stmt               ::= if_expr_lambda
         stmt               ::= conditional_not_lambda
+
+        # If statement inside a loop:
         stmt               ::= ifstmtl
 
         if_expr_lambda     ::= expr jmp_false expr return_if_lambda
diff --git a/uncompyle6/semantics/consts.py b/uncompyle6/semantics/consts.py
index 933a842d..71003f31 100644
--- a/uncompyle6/semantics/consts.py
+++ b/uncompyle6/semantics/consts.py
@@ -371,14 +371,13 @@ TABLE_DIRECT = {
 #    'return':	        ( '%|return %c\n', 0),
     'return_if_stmt':	( 'return %c\n', 0),
 
-    'ifstmt':		( '%|if %c:\n%+%c%-',
+    "ifstmt":		( "%|if %c:\n%+%c%-",
                             0, # "testexpr" or "testexpr_then"
                             1, # "_ifstmts_jump" or "return_stmts"
                         ),
-
-    'iflaststmt':	( '%|if %c:\n%+%c%-', 0, 1 ),
-    'iflaststmtl':		( '%|if %c:\n%+%c%-', 0, 1 ),
-    'testtrue':         ( 'not %p',
+    'iflaststmt':	( "%|if %c:\n%+%c%-", 0, 1 ),
+    'iflaststmtl':	( "%|if %c:\n%+%c%-", 0, 1 ),
+    'testtrue':         ( "not %p",
                           (0, PRECEDENCE['unary_not']) ),
 
     # Generally the args here are 0: (some sort of) "testexpr",