Evaluator -> InferState

jedi/inference/base_context.py

@@ -16,7 +16,7 @@ from jedi.parser_utils import clean_scope_docstring
 from jedi.common import BaseContextSet, BaseContext
 from jedi.inference.helpers import SimpleGetItemNotFound
 from jedi.inference.utils import safe_property
-from jedi.inference.cache import evaluator_as_method_param_cache
+from jedi.inference.cache import infer_state_as_method_param_cache
 from jedi.cache import memoize_method
 
 _sentinel = object()
@@ -31,17 +31,17 @@ class HelperContextMixin(object):
             context = context.parent_context
 
     @classmethod
-    @evaluator_as_method_param_cache()
+    @infer_state_as_method_param_cache()
     def create_cached(cls, *args, **kwargs):
         return cls(*args, **kwargs)
 
     def execute(self, arguments):
-        return self.evaluator.execute(self, arguments=arguments)
+        return self.infer_state.execute(self, arguments=arguments)
 
     def execute_with_values(self, *value_list):
         from jedi.inference.arguments import ValuesArguments
         arguments = ValuesArguments([ContextSet([value]) for value in value_list])
-        return self.evaluator.execute(self, arguments)
+        return self.infer_state.execute(self, arguments)
 
     def execute_annotation(self):
         return self.execute_with_values()
@@ -64,7 +64,7 @@ class HelperContextMixin(object):
         if name_context is None:
             name_context = self
         from jedi.inference import finder
-        f = finder.NameFinder(self.evaluator, self, name_context, name_or_str,
+        f = finder.NameFinder(self.infer_state, self, name_context, name_or_str,
                               position, analysis_errors=analysis_errors)
         filters = f.get_filters(search_global)
         if is_goto:
@@ -78,10 +78,10 @@ class HelperContextMixin(object):
         return await_context_set.execute_with_values()
 
     def infer_node(self, node):
-        return self.evaluator.infer_element(self, node)
+        return self.infer_state.infer_element(self, node)
 
     def create_context(self, node, node_is_context=False, node_is_object=False):
-        return self.evaluator.create_context(self, node, node_is_context, node_is_object)
+        return self.infer_state.create_context(self, node, node_is_context, node_is_object)
 
     def iterate(self, contextualized_node=None, is_async=False):
         debug.dbg('iterate %s', self)
@@ -236,8 +236,8 @@ class _ContextWrapperBase(HelperContextMixin):
             return CompiledContextName(self, wrapped_name.string_name)
 
     @classmethod
-    @evaluator_as_method_param_cache()
-    def create_cached(cls, evaluator, *args, **kwargs):
+    @infer_state_as_method_param_cache()
+    def create_cached(cls, infer_state, *args, **kwargs):
         return cls(*args, **kwargs)
 
     def __getattr__(self, name):
@@ -268,8 +268,8 @@ class ContextWrapper(_ContextWrapperBase):
 
 
 class TreeContext(Context):
-    def __init__(self, evaluator, parent_context, tree_node):
-        super(TreeContext, self).__init__(evaluator, parent_context)
+    def __init__(self, infer_state, parent_context, tree_node):
+        super(TreeContext, self).__init__(infer_state, parent_context)
         self.predefined_names = {}
         self.tree_node = tree_node
 
@@ -395,7 +395,7 @@ class ContextSet(BaseContextSet):
             )
 
     def execute(self, arguments):
-        return ContextSet.from_sets(c.evaluator.execute(c, arguments) for c in self._set)
+        return ContextSet.from_sets(c.infer_state.execute(c, arguments) for c in self._set)
 
     def execute_with_values(self, *args, **kwargs):
         return ContextSet.from_sets(c.execute_with_values(*args, **kwargs) for c in self._set)