From 406dd3a157e72d3f37e80661cebc65cc544a321f Mon Sep 17 00:00:00 2001
From: David Winegar <david.s.winegar@gmail.com>
Date: Thu, 17 Jul 2014 16:07:43 -0700
Subject: [PATCH] All tokenizer end methods return a stack

For C compatability, switch table cell end to return the stack.
Now context is kept by using `keep_context` when calling `self._pop()`.
---
 mwparserfromhell/parser/contexts.py  |  4 ++--
 mwparserfromhell/parser/tokenizer.py | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/mwparserfromhell/parser/contexts.py b/mwparserfromhell/parser/contexts.py
index 3827708..6dd5319 100644
--- a/mwparserfromhell/parser/contexts.py
+++ b/mwparserfromhell/parser/contexts.py
@@ -94,7 +94,7 @@ Local (stack-specific) contexts:
 
     * :const:`TABLE_OPEN`
     * :const:`TABLE_CELL_OPEN`
-    * :const:`TABLE_CELL_STYLE_POSSIBLE`
+    * :const:`TABLE_CELL_STYLE`
     * :const:`TABLE_TD_LINE`
     * :const:`TABLE_TH_LINE`
     * :const:`TABLE_CELL_LINE_CONTEXTS`
@@ -180,7 +180,7 @@ GL_HEADING = 1 << 0
 # Aggregate contexts:
 
 FAIL = (TEMPLATE + ARGUMENT + WIKILINK + EXT_LINK_TITLE + HEADING + TAG +
-        STYLE + TABLE_OPEN)
+        STYLE + TABLE)
 UNSAFE = (TEMPLATE_NAME + WIKILINK_TITLE + EXT_LINK_TITLE +
           TEMPLATE_PARAM_KEY + ARGUMENT_NAME + TAG_CLOSE)
 DOUBLE = TEMPLATE_PARAM_KEY + TAG_CLOSE
diff --git a/mwparserfromhell/parser/tokenizer.py b/mwparserfromhell/parser/tokenizer.py
index 7fda2d5..9e22b28 100644
--- a/mwparserfromhell/parser/tokenizer.py
+++ b/mwparserfromhell/parser/tokenizer.py
@@ -1098,13 +1098,14 @@ class Tokenizer(object):
             self._head += len(markup) - 1
             return
 
-        table_context = contexts.TABLE_OPEN | contexts.TABLE_CELL_OPEN | line_context
+        old_context = self._context
         reset = self._head
         self._head += len(markup)
         reset_for_style, padding = False, ""
         try:
-            cell_context = self._parse(table_context | contexts.TABLE_CELL_STYLE)
-            cell = self._pop()
+            cell = self._parse(contexts.TABLE_OPEN | contexts.TABLE_CELL_OPEN | line_context | contexts.TABLE_CELL_STYLE)
+            cell_context = self._context
+            self._context = old_context
             reset_for_style = cell_context & contexts.TABLE_CELL_STYLE
         except BadRoute:
             self._head = reset
@@ -1112,13 +1113,14 @@ class Tokenizer(object):
         if reset_for_style:
             self._head = reset + len(markup)
             try:
-                self._push(table_context)
+                self._push(contexts.TABLE_OPEN | contexts.TABLE_CELL_OPEN | line_context)
                 padding = self._parse_as_table_style("|")
                 style = self._pop()
                 # Don't parse the style separator
                 self._head += 1
-                cell_context = self._parse(table_context)
-                cell = self._pop()
+                cell = self._parse(contexts.TABLE_OPEN | contexts.TABLE_CELL_OPEN | line_context)
+                cell_context = self._context
+                self._context = old_context
             except BadRoute:
                 self._head = reset
                 raise
@@ -1139,8 +1141,10 @@ class Tokenizer(object):
         """Returns the current context, with the TABLE_CELL_STYLE flag set if
         it is necessary to reset and parse style attributes."""
         if reset_for_style:
-            return self._context | contexts.TABLE_CELL_STYLE
-        return self._context & ~contexts.TABLE_CELL_STYLE
+            self._context |= contexts.TABLE_CELL_STYLE
+        else:
+            self._context &= ~contexts.TABLE_CELL_STYLE
+        return self._pop(keep_context=True)
 
     def _verify_safe(self, this):
         """Make sure we are not trying to write an invalid character."""