From d332bde104a2df85fb4709a81ff50f5032ffbf44 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Wed, 5 Jul 2017 06:12:14 -0400
Subject: [PATCH] Loops in Python 2.4-2.6 loop come_from

Looks like Python 2.4-2.6 may have a COME_FROM(_LOOP)
before the jump_back.

Fixes Issue #123
---
 test/bytecode_2.6/03_loop_if_cf.pyc       | Bin 0 -> 603 bytes
 test/simple_source/bug26/03_loop_if_cf.py |  19 +++++++++++++++++++
 uncompyle6/parsers/parse26.py             |   9 ++++++++-
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 test/bytecode_2.6/03_loop_if_cf.pyc
 create mode 100644 test/simple_source/bug26/03_loop_if_cf.py

diff --git a/test/bytecode_2.6/03_loop_if_cf.pyc b/test/bytecode_2.6/03_loop_if_cf.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..880855af2cb813960ed5fa5cf4a4256957df3bd9
GIT binary patch
literal 603
zcmb7Au};G<5Iwt1C=~&9K=1(!nOX!A6GBLIt`Hq65Xf>9r?{lG(>S!1(h0tTAApS=
zzJg!j3pgij8JLKC=eu|J?)mcd?bSa&Zm$DaegyAxwA4cv0z3oUU_hYjQ$&I)Iv35}
z7ij4_y4f4#01^*@_T39Cs*vL$FmypBKroTi=1&9@u*D$-bq-{9SuiU|Yr?{T+yPky
z)xb84kV6Yj(q03V70^pwi(yt48&Se3OWq$iM-l~+c+kU@y1req<J&cigN_aONSJMm
zcwpqCU^?b=F-eVGG8N;{Y}&3VH^IGycWf5$F-wJDp)g#=WvdKDIkhClk=eplrNwwX
zvbF;HS!8T7op8-;vVjRNm5Tyj>iLL6;nD+)QaRGGV5!O`foS!!!O=<U@R-F)X(l5U
zL`^+6b~P=7hfEhQ*|#Hz2QKx9hgJud)JcQx(mmQK{>GJk=&#a0<!VSi9jP#j#aSU}
G^?m?m)_cGJ

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug26/03_loop_if_cf.py b/test/simple_source/bug26/03_loop_if_cf.py
new file mode 100644
index 00000000..b4f85870
--- /dev/null
+++ b/test/simple_source/bug26/03_loop_if_cf.py
@@ -0,0 +1,19 @@
+# Bug in < 2.6 is having a COME_FROM_LOOP (but we
+# don't tag that so it is just COME_FROM *before*
+# a jump back to the loop.
+def pickup(self, open_players, open_buf, wrap_buf):
+   for aplayer in self._game.active_players:
+
+      if aplayer in open_players:
+         aplayer.send(open_players)
+
+         if self == aplayer:
+            for awatcher in self._watchers:
+               if awatcher._can_see_detail:
+                  awatcher.send(open_buf)
+               else:
+                  awatcher.send(wrap_buf)
+         else:
+            self._game.send(aplayer.side)
+      else:
+         self._game.send(aplayer.side, wrap_buf)
diff --git a/uncompyle6/parsers/parse26.py b/uncompyle6/parsers/parse26.py
index 70611f0d..c8561d59 100644
--- a/uncompyle6/parsers/parse26.py
+++ b/uncompyle6/parsers/parse26.py
@@ -84,6 +84,12 @@ class Python26Parser(Python2Parser):
         ja_cf_pop ::= JUMP_ABSOLUTE come_froms POP_TOP
         jf_cf_pop ::= JUMP_FORWARD come_froms POP_TOP
 
+        # The first optional COME_FROM when it appears is really
+        # COME_FROM_LOOP, but in <= 2.6 we don't distinguish
+        # this
+
+        cf_jb_cf_pop ::= _come_from JUMP_BACK come_froms POP_TOP
+
         bp_come_from    ::= POP_BLOCK COME_FROM
         jb_bp_come_from ::= JUMP_BACK bp_come_from
 
@@ -111,7 +117,8 @@ class Python26Parser(Python2Parser):
         break_stmt ::= BREAK_LOOP JUMP_BACK
 
         # Semantic actions want else_suitel to be at index 3
-        ifelsestmtl ::= testexpr c_stmts_opt jb_cf_pop else_suitel
+        ifelsestmtl ::= testexpr c_stmts_opt cf_jb_cf_pop else_suitel
+
         ifelsestmtc ::= testexpr c_stmts_opt ja_cf_pop else_suitec
 
         # Semantic actions want suite_stmts_opt to be at index 3