--HG--
branch : pmacs2
This commit is contained in:
moculus 2007-06-28 21:25:43 +00:00
parent 8c09178d08
commit 5546b56fd6
2 changed files with 16 additions and 6 deletions

View File

@ -1341,7 +1341,7 @@ class CloseTag(Method):
return return
i += 1 i += 1
if i >= len(tokens[y]): if i >= len(tokens[y]):
app.set_error('none found: %d' % (i)) #app.set_error('none found: %d' % (i))
return return
tag_stack = [] tag_stack = []
@ -1365,7 +1365,7 @@ class CloseTag(Method):
i -= 1 i -= 1
y -= 1 y -= 1
i = len(tokens[y]) - 1 i = len(tokens[y]) - 1
app.set_error('tag mismatch: no tag found') #app.set_error('tag mismatch: no tag found')
class CloseParen(CloseTag): class CloseParen(CloseTag):
mytag = ')' mytag = ')'

View File

@ -125,10 +125,20 @@ class PerlTabber(tab2.StackTabber):
fqname = token.fqname() fqname = token.fqname()
if fqname == 'delimiter' and token.string == ';': if fqname == 'delimiter' and token.string == ';':
self._opt_pop('cont') self._opt_pop('cont')
elif fqname == 'heredoc.start': elif fqname == 'heredoc1.start':
self._opt_append('heredoc', None) self._opt_append('heredoc1', None)
elif fqname == 'heredoc.end': elif fqname == 'heredoc1.end':
self._opt_pop('heredoc') self._opt_pop('heredoc1')
self._opt_pop('cont')
elif fqname == 'heredoc2.start':
self._opt_append('heredoc2', None)
elif fqname == 'heredoc2.end':
self._opt_pop('heredoc2')
self._opt_pop('cont')
elif fqname == 'eval_heredoc.start':
self._opt_append('eval_heredoc', None)
elif fqname == 'eval_heredoc.end':
self._opt_pop('eval_heredoc')
self._opt_pop('cont') self._opt_pop('cont')
elif fqname == 'pod.start': elif fqname == 'pod.start':
self._opt_append('pod', None) self._opt_append('pod', None)