1
0
forked from VimPlug/jedi

eval_element -> eval_node

This commit is contained in:
Dave Halter
2018-03-07 20:10:48 +01:00
parent a85f2d1049
commit 23e7c5bd2a
3 changed files with 4 additions and 4 deletions

View File

@@ -135,7 +135,7 @@ class TreeArguments(AbstractArguments):
[v for v in values if v is not None] [v for v in values if v is not None]
) )
elif star_count == 2: elif star_count == 2:
arrays = self._evaluator.eval_element(self.context, el) arrays = self.context.eval_node(el)
for dct in arrays: for dct in arrays:
for key, values in _star_star_dict(self.context, dct, el, funcdef): for key, values in _star_star_dict(self.context, dct, el, funcdef):
yield key, values yield key, values

View File

@@ -135,7 +135,7 @@ class FunctionExecutionContext(TreeContext):
def get_return_values(self, check_yields=False): def get_return_values(self, check_yields=False):
funcdef = self.tree_node funcdef = self.tree_node
if funcdef.type == 'lambdef': if funcdef.type == 'lambdef':
return self.evaluator.eval_element(self, funcdef.children[-1]) return self.eval_node(funcdef.children[-1])
if check_yields: if check_yields:
context_set = NO_CONTEXTS context_set = NO_CONTEXTS

View File

@@ -65,7 +65,7 @@ def _py__stop_iteration_returns(generators):
@debug.increase_indent @debug.increase_indent
@_limit_context_infers @_limit_context_infers
def eval_node(context, element): def eval_node(context, element):
debug.dbg('eval_element %s@%s', element, element.start_pos) debug.dbg('eval_node %s@%s', element, element.start_pos)
evaluator = context.evaluator evaluator = context.evaluator
typ = element.type typ = element.type
if typ in ('name', 'number', 'string', 'atom'): if typ in ('name', 'number', 'string', 'atom'):
@@ -91,7 +91,7 @@ def eval_node(context, element):
context_set = eval_atom(context, first_child) context_set = eval_atom(context, first_child)
for trailer in children: for trailer in children:
if trailer == '**': # has a power operation. if trailer == '**': # has a power operation.
right = evaluator.eval_element(context, children[1]) right = context.eval_node(children[1])
context_set = _eval_comparison( context_set = _eval_comparison(
evaluator, evaluator,
context, context,