summaryrefslogtreecommitdiff
path: root/pygments/lexer.py
diff options
context:
space:
mode:
Diffstat (limited to 'pygments/lexer.py')
-rw-r--r--pygments/lexer.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/pygments/lexer.py b/pygments/lexer.py
index 20096677..0850650e 100644
--- a/pygments/lexer.py
+++ b/pygments/lexer.py
@@ -403,10 +403,15 @@ class RegexLexerMeta(LexerMeta):
new_state = (new_state,)
elif isinstance(tdef2, tuple):
# push more than one state
+ new_state = []
for state in tdef2:
- assert state in unprocessed, \
- 'unknown new state ' + state
- new_state = tdef2
+ if state == '#pop':
+ new_state.append(-1)
+ else:
+ assert state in unprocessed, \
+ 'unknown new state ' + state
+ new_state.append(state)
+ new_state = tuple(new_state)
else:
assert False, 'unknown new state def %r' % tdef2
tokens.append((rex, tdef[1], new_state))