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

deleted a big part of the generate_tokens code that doesn't seem to be needed anymore

Browse Source
This commit is contained in:
Dave Halter
2014-02-21 16:38:15 +01:00
parent 73057d4176
commit efba0cd80c
1 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
jedi/parser/tokenize.py
View File

@@ -179,35 +179,8 @@ def generate_tokens(readline, line_offset=0):
contstr = contstr + line contstr = contstr + line
contline = contline + line contline = contline + line
continue continue
elif pos == max:
elif not continued: # new statement break # Don't really understand why this must be here.
column = 0
while pos < max: # measure leading whitespace
if line[pos] == ' ':
column += 1
elif line[pos] == '\t':
column = (column // tabsize + 1) * tabsize
elif line[pos] == '\f':
column = 0
else:
break
pos += 1
if pos == max:
break
if line[pos] in '#\r\n': # skip comments or blank lines
if line[pos] == '#':
comment_token = line[pos:].rstrip('\r\n')
nl_pos = pos + len(comment_token)
yield TokenInfo(COMMENT, comment_token, (lnum, pos),
(lnum, pos + len(comment_token)))
yield TokenInfo(NEWLINE, line[nl_pos:], (lnum, nl_pos),
(lnum, len(line)))
else:
yield TokenInfo(NEWLINE, line[pos:], (lnum, pos), (lnum, len(line)))
continue
else: # continued statement
continued = False
while pos < max: while pos < max:
pseudomatch = pseudoprog.match(line, pos) pseudomatch = pseudoprog.match(line, pos)
@@ -250,8 +223,8 @@ def generate_tokens(readline, line_offset=0):
yield TokenInfo(STRING, token, spos, epos) yield TokenInfo(STRING, token, spos, epos)
elif initial in namechars: # ordinary name elif initial in namechars: # ordinary name
yield TokenInfo(NAME, token, spos, epos) yield TokenInfo(NAME, token, spos, epos)
elif initial == '\\': # continued stmt elif initial == '\\' and line[start:] == '\\\n': # continued stmt
continued = True continue
else: else:
yield TokenInfo(OP, token, spos, epos) yield TokenInfo(OP, token, spos, epos)
else: else: