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

Trying to change the symbols in node. They are now strings.

Browse Source 
With this change we are finally able to get rid of parser/pytree.py
This commit is contained in:
Dave Halter
2014-11-24 01:51:14 +01:00
parent 9f45f18ad1
commit db76bbccc5
5 changed files with 28 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jedi/evaluate/__init__.py
View File

@@ -73,7 +73,6 @@ from itertools import tee, chain
from jedi._compatibility import next, hasattr, unicode
from jedi.parser import tree as pr
from jedi.parser.pytree import python_symbols
from jedi.parser.tokenize import Token
from jedi.parser import fast
from jedi import debug
@@ -178,7 +177,7 @@ class Evaluator(object):
elif isinstance(element, pr.Keyword):
# For False/True/None
return [compiled.builtin.get_by_name(element.value)]
elif element.type == python_symbols.power:
elif element.type == 'power':
types = self._eval_atom(element.children[0])
for trailer in element.children[1:]:
if trailer == '**': # has a power operation.
@@ -186,19 +185,19 @@ class Evaluator(object):
types = self.eval_trailer(types, trailer)
return types
elif pr.is_node(element, 'testlist_star_expr', 'testlist'):
elif element.type in ('testlist_star_expr', 'testlist',):
# The implicit tuple in statements.
return [iterable.ImplicitTuple(self, element)]
elif pr.is_node(element, 'not_test') or pr.is_node(element, 'factor'):
elif element.type in ('not_test', 'factor'):
types = self.eval_element(element.children[-1])
for operator in element.children[:-1]:
types = list(precedence.factor_calculate(self, types, operator))
return types
elif pr.is_node(element, 'test'):
elif element.type == 'test':
# `x if foo else y` case.
return (self.eval_element(element.children[0]) +
self.eval_element(element.children[-1]))
elif pr.is_node(element, 'dotted_name'):
elif element.type == 'dotted_name':
types = self._eval_atom(element.children[0])
for next_name in element.children[2::2]:
types = list(chain.from_iterable(self.find_types(typ, next_name)

3
jedi/evaluate/representation.py
View File

@@ -36,7 +36,6 @@ from itertools import chain
from jedi._compatibility import use_metaclass, unicode, Python3Method
from jedi.parser import tree as pr
from jedi.parser.tokenize import Token
from jedi.parser.pytree import python_symbols
from jedi import debug
from jedi import common
from jedi.cache import underscore_memoization
@@ -484,7 +483,7 @@ class Function(use_metaclass(CachedMetaClass, Wrapper)):
trailer = dec.children[2:-1]
if trailer:
# Create a trailer and evaluate it.
trailer = pr.Node(python_symbols.trailer, trailer)
trailer = pr.Node('trailer', trailer)
dec_results = self._evaluator.eval_trailer(dec_results, trailer)
if not len(dec_results):