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

reduce loops for finding sub parser

Browse Source
This commit is contained in:
Akinori Hattori
2014-07-06 11:29:24 +09:00
parent aab4891c4e
commit 1650f65507
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
jedi/parser/fast.py
View File

@@ -363,25 +363,23 @@ class FastParser(use_metaclass(CachedFastParser)):
def _get_parser(self, code, parser_code, line_offset, nodes, no_docstr): def _get_parser(self, code, parser_code, line_offset, nodes, no_docstr):
h = hash(code) h = hash(code)
hashes = [n.hash for n in nodes] for index, node in enumerate(nodes):
node = None if node.hash != h or node.code != code:
try: continue
index = hashes.index(h)
if nodes[index].code != code: if node != self.current_node:
raise ValueError() offset = int(nodes[0] == self.current_node)
except ValueError: self.current_node.old_children.pop(index - offset)
p = node.parser
m = p.module
m.line_offset += line_offset + 1 - m.start_pos[0]
break
else:
tokenizer = FastTokenizer(parser_code, line_offset) tokenizer = FastTokenizer(parser_code, line_offset)
p = Parser(parser_code, self.module_path, tokenizer=tokenizer, p = Parser(parser_code, self.module_path, tokenizer=tokenizer,
top_module=self.module, no_docstr=no_docstr) top_module=self.module, no_docstr=no_docstr)
p.module.parent = self.module p.module.parent = self.module
else: node = None
if nodes[index] != self.current_node:
offset = int(nodes[0] == self.current_node)
self.current_node.old_children.pop(index - offset)
node = nodes.pop(index)
p = node.parser
m = p.module
m.line_offset += line_offset + 1 - m.start_pos[0]
return p, node return p, node