From 195075ac016e9bfd1f25a33877c2b244b469ed65 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Mon, 26 Feb 2018 01:27:00 -0500
Subject: [PATCH] 3.6 while-if-while bug

---
 test/bytecode_3.6/09_while_if_while.pyc       | Bin 0 -> 317 bytes
 test/simple_source/bug36/09_while_if_while.py |   9 +++++++++
 uncompyle6/parsers/parse36.py                 |   2 ++
 3 files changed, 11 insertions(+)
 create mode 100644 test/bytecode_3.6/09_while_if_while.pyc
 create mode 100644 test/simple_source/bug36/09_while_if_while.py

diff --git a/test/bytecode_3.6/09_while_if_while.pyc b/test/bytecode_3.6/09_while_if_while.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..bef73d4747d68d8a0fb9d46069db85d95c02b8d7
GIT binary patch
literal 317
zcmXr!<>m5RF*)i90|UcjAcg}bAj<)Wi+O-V3PTEG3quq`3R5tHCUY_iPzVG-G)SE@
z5Eokji3+0{<|3mSh9agK#uP?#hFZo7nHt6#=4^%{y&9mHB#4H}6pDm16f%WF&GdW8
z2-N@bKM<^B&}6yAn0$*dD~i1+u{<TQB=HtwUJ)};9!&hwD9+3+$VrVa&Mz%WPSsB;
zO*b~vH?WK^&&ULdW~M<HdIgoYMB@t*i;7d@Q}UBbDhq%*N|TCHOF$-py~V)D#>m3R
n!6?Kiz*xiq6!p`D&<M*QEOwyWEe@O9{FKt1R6DSKpa=s1mfuFC

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug36/09_while_if_while.py b/test/simple_source/bug36/09_while_if_while.py
new file mode 100644
index 00000000..8e74d01d
--- /dev/null
+++ b/test/simple_source/bug36/09_while_if_while.py
@@ -0,0 +1,9 @@
+# From 3.6 _markupbase.py
+# Bug was parsing the inner while
+def _parse_doctype_subset(c, j, rawdata, n):
+    while n:
+        if c:
+            j += 1
+            while j < n and rawdata[j]:
+                j += 1
+    return -1
diff --git a/uncompyle6/parsers/parse36.py b/uncompyle6/parsers/parse36.py
index 9e809b4b..ba81bab5 100644
--- a/uncompyle6/parsers/parse36.py
+++ b/uncompyle6/parsers/parse36.py
@@ -30,6 +30,8 @@ class Python36Parser(Python35Parser):
         for_block       ::= l_stmts_opt come_from_loops JUMP_BACK
         come_from_loops ::= COME_FROM_LOOP*
 
+        whilestmt       ::= SETUP_LOOP testexpr l_stmts_opt
+                            JUMP_BACK COME_FROM POP_BLOCK COME_FROM_LOOP
 
         # This might be valid in < 3.6
         and  ::= expr jmp_false expr