VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

remove last_previous from NoErrorTokenizer

Browse Source
This commit is contained in:
Dave Halter
2014-02-23 12:51:05 +01:00
parent 8e847f4982
commit 553ff66c8b
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
jedi/parser/tokenize.py
View File

@@ -245,7 +245,7 @@ class NoErrorTokenizer(object):
# fast parser options # fast parser options
self.is_fast_parser = is_fast_parser self.is_fast_parser = is_fast_parser
self.current = self.previous = [None, None, (0, 0), (0, 0), ''] self.current = self.previous = TokenInfo(None, None, (0, 0), (0, 0))
self.in_flow = False self.in_flow = False
self.new_indent = False self.new_indent = False
self.parser_indent = self.old_parser_indent = 0 self.parser_indent = self.old_parser_indent = 0
@@ -260,16 +260,13 @@ class NoErrorTokenizer(object):
if self.closed: if self.closed:
raise common.MultiLevelStopIteration() raise common.MultiLevelStopIteration()
self.last_previous = self.previous current = next(self.gen)
self.previous = self.current if current[0] == ENDMARKER:
self.current = next(self.gen)
c = self.current
if c[0] == ENDMARKER:
self.current = self.previous
self.previous = self.last_previous
raise common.MultiLevelStopIteration() raise common.MultiLevelStopIteration()
self.previous = self.current
self.current = current
# this is exactly the same check as in fast_parser, but this time with # this is exactly the same check as in fast_parser, but this time with
# tokenize and therefore precise. # tokenize and therefore precise.
breaks = ['def', 'class', '@'] breaks = ['def', 'class', '@']
@@ -281,11 +278,11 @@ class NoErrorTokenizer(object):
# ignore comments/ newlines # ignore comments/ newlines
if self.is_fast_parser \ if self.is_fast_parser \
and self.previous[0] in (None, NEWLINE) \ and self.previous[0] in (None, NEWLINE) \
and c[0] not in (COMMENT, NEWLINE): and current[0] not in (COMMENT, NEWLINE):
# print c, tok_name[c[0]] # print c, tok_name[c[0]]
tok = c[1] tok = current[1]
indent = c[2][1] indent = current[2][1]
if indent < self.parser_indent: # -> dedent if indent < self.parser_indent: # -> dedent
self.parser_indent = indent self.parser_indent = indent
self.new_indent = False self.new_indent = False
@@ -311,4 +308,4 @@ class NoErrorTokenizer(object):
if self.first_stmt and not self.new_indent: if self.first_stmt and not self.new_indent:
self.parser_indent = indent self.parser_indent = indent
self.first_stmt = False self.first_stmt = False
return c return current