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

Use create only for non access objects

Browse Source
This commit is contained in:
Dave Halter
2017-11-28 21:15:55 +01:00
parent c1f31e0328
commit cce9a1cf6a
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
jedi/evaluate/compiled/__init__.py
View File

@@ -82,18 +82,18 @@ class CompiledObject(Context):
@CheckAttribute @CheckAttribute
def py__class__(self): def py__class__(self):
return create(self.evaluator, self.access.py__class__()) return create_from_access(self.evaluator, self.access.py__class__())
@CheckAttribute @CheckAttribute
def py__mro__(self): def py__mro__(self):
return (self,) + tuple( return (self,) + tuple(
_create_from_access(self.evaluator, access) for access in self.access.py__mro__accesses() create_from_access(self.evaluator, access) for access in self.access.py__mro__accesses()
) )
@CheckAttribute @CheckAttribute
def py__bases__(self): def py__bases__(self):
raise NotImplementedError raise NotImplementedError
return tuple(create(self.evaluator, cls) for cls in self.obj.__bases__) return tuple(create_from_access(self.evaluator, cls) for cls in self.obj.__bases__)
def py__bool__(self): def py__bool__(self):
return self.access.py__bool__() return self.access.py__bool__()
@@ -164,12 +164,12 @@ class CompiledObject(Context):
if access is None: if access is None:
return ContextSet() return ContextSet()
return ContextSet(_create_from_access(self.evaluator, access)) return ContextSet(create_from_access(self.evaluator, access))
@CheckAttribute @CheckAttribute
def py__iter__(self): def py__iter__(self):
for access in self.access.py__iter__list(): for access in self.access.py__iter__list():
yield LazyKnownContext(_create_from_access(self.evaluator, access)) yield LazyKnownContext(create_from_access(self.evaluator, access))
def py__name__(self): def py__name__(self):
return self.access.py__name__() return self.access.py__name__()
@@ -209,7 +209,7 @@ class CompiledObject(Context):
def dict_values(self): def dict_values(self):
return ContextSet.from_iterable( return ContextSet.from_iterable(
create(self.evaluator, access) for access in self.access.dict_values() create_from_access(self.evaluator, access) for access in self.access.dict_values()
) )
def get_safe_value(self, default=_sentinel): def get_safe_value(self, default=_sentinel):
@@ -221,13 +221,13 @@ class CompiledObject(Context):
return default return default
def execute_operation(self, other, operator): def execute_operation(self, other, operator):
return _create_from_access( return create_from_access(
self.evaluator, self.evaluator,
self.access.execute_operation(other.access, operator) self.access.execute_operation(other.access, operator)
) )
def negate(self): def negate(self):
return create(self.evaluator, self.access.negate()) return create_from_access(self.evaluator, self.access.negate())
def is_super_class(self, exception): def is_super_class(self, exception):
return self.access.is_super_class(exception) return self.access.is_super_class(exception)
@@ -272,10 +272,10 @@ class SignatureParamName(AbstractNameDefinition):
p = self._signature_param p = self._signature_param
evaluator = self.parent_context.evaluator evaluator = self.parent_context.evaluator
contexts = ContextSet() contexts = ContextSet()
if p.default is not p.empty: if p.has_default:
contexts = ContextSet(create(evaluator, p.default)) contexts = ContextSet(create_from_access(evaluator, p.default))
if p.annotation is not p.empty: if p.has_annotation:
annotation = create(evaluator, p.annotation) annotation = create_from_access(evaluator, p.annotation)
contexts |= annotation.execute_evaluated() contexts |= annotation.execute_evaluated()
return contexts return contexts
@@ -491,7 +491,7 @@ def _create_from_name(evaluator, compiled_object, name):
pass pass
access = compiled_object.access.getattr(name, default=None) access = compiled_object.access.getattr(name, default=None)
return create(evaluator, access, parent_context=compiled_object, faked=faked) return create_from_access(evaluator, access, parent_context=compiled_object, faked=faked)
def builtin_from_name(evaluator, string): def builtin_from_name(evaluator, string):
@@ -536,15 +536,12 @@ def create(evaluator, obj, parent_context=None, faked=None):
# Modules don't have parents, be careful with caching: recurse. # Modules don't have parents, be careful with caching: recurse.
return create(evaluator, obj) return create(evaluator, obj)
if isinstance(obj, DirectObjectAccess): return create_from_access(evaluator, create_access(evaluator, obj), parent_context, faked)
return _create_from_access(evaluator, obj, parent_context, faked)
else:
return _create_from_access(evaluator, create_access(evaluator, obj), parent_context, faked)
@_normalize_create_args @_normalize_create_args
@evaluator_function_cache() @evaluator_function_cache()
def _create_from_access(evaluator, access, parent_context=None, faked=None): def create_from_access(evaluator, access, parent_context=None, faked=None):
""" """
A very weird interface class to this module. The more options provided the A very weird interface class to this module. The more options provided the
more acurate loading compiled objects is. more acurate loading compiled objects is.
@@ -559,11 +556,13 @@ def _create_from_access(evaluator, access, parent_context=None, faked=None):
pass pass
else: else:
for access2, tree_node in zip(accesses, tree_nodes): for access2, tree_node in zip(accesses, tree_nodes):
parent_context = create(evaluator, access2, parent_context, faked=tree_node) parent_context = create_from_access(
evaluator, access2, parent_context, faked=tree_node
)
return parent_context return parent_context
# TODO wow this is a mess.... # TODO wow this is a mess....
if parent_context is None and not faked: if parent_context is None and not faked:
parent_context = create(evaluator, _builtins) parent_context = create(evaluator, _builtins)
return create(evaluator, access, parent_context) return create_from_access(evaluator, access, parent_context)
return CompiledObject(evaluator, access, parent_context, faked) return CompiledObject(evaluator, access, parent_context, faked)

9
jedi/evaluate/compiled/access.py
View File

@@ -73,7 +73,7 @@ _OPERATORS = {
_OPERATORS.update(COMPARISON_OPERATORS) _OPERATORS.update(COMPARISON_OPERATORS)
SignatureParam = namedtuple('SignatureParam', 'name default empty annotation') SignatureParam = namedtuple('SignatureParam', 'name has_default default has_annotation annotation')
def compiled_objects_cache(attribute_name): def compiled_objects_cache(attribute_name):
@@ -307,9 +307,10 @@ class DirectObjectAccess(object):
return [ return [
SignatureParam( SignatureParam(
name=p.name, name=p.name,
default=p.default, has_default=p.default is not p.empty,
empty=p.empty, default=self._create_access(p.default),
annotation=p.annotation, has_annotation=p.annotation is not p.empty,
annotation=self._create_access(p.annotation),
) for p in signature.parameters.values() ) for p in signature.parameters.values()
] ]

2
jedi/evaluate/compiled/mixed.py
View File

@@ -197,7 +197,7 @@ def _find_syntax_node_name(evaluator, access):
def _create(evaluator, access, parent_context=None, *args): def _create(evaluator, access, parent_context=None, *args):
tree_node, path = _find_syntax_node_name(evaluator, access) tree_node, path = _find_syntax_node_name(evaluator, access)
compiled_object = compiled.create( compiled_object = compiled.create_from_access(
evaluator, access, parent_context=parent_context.compiled_object) evaluator, access, parent_context=parent_context.compiled_object)
if tree_node is None: if tree_node is None:
return compiled_object return compiled_object