VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-08 14:54:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

generalized param array creation

Browse Source
This commit is contained in:
David Halter
2012-08-07 10:41:15 +02:00
parent 11808d8fa3
commit a0fad34503
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
evaluate.py
View File

@@ -14,11 +14,12 @@ TODO class decorators
TODO annotations ? how ? type evaluation and return? TODO annotations ? how ? type evaluation and return?
TODO nonlocal statement TODO nonlocal statement
TODO __ instance attributes should not be visible outside of the class.
TODO getattr / __getattr__ / __getattribute__ ? TODO getattr / __getattr__ / __getattribute__ ?
""" """
from _compatibility import next, property, hasattr from _compatibility import next, property, hasattr
import sys
import sys
import itertools import itertools
import copy import copy
@@ -194,7 +195,9 @@ class Instance(Executable):
return InstanceElement(self, sub) return InstanceElement(self, sub)
raise KeyError("Couldn't find subscope.") raise KeyError("Couldn't find subscope.")
def execute_subscope_by_name(self, name, args): def execute_subscope_by_name(self, name, args=None):
if args is None:
args = helpers.generate_param_array([])
method = self.get_subscope_by_name(name) method = self.get_subscope_by_name(name)
if args.parent_stmt is None: if args.parent_stmt is None:
args.parent_stmt = method args.parent_stmt = method
@@ -204,8 +207,8 @@ class Instance(Executable):
""" Throws a KeyError if there's no method. """ """ Throws a KeyError if there's no method. """
# Arguments in __get__ descriptors are obj, class. # Arguments in __get__ descriptors are obj, class.
# `method` is the new parent of the array, don't know if that's good. # `method` is the new parent of the array, don't know if that's good.
v = [[obj], [obj.base]] if isinstance(obj, Instance) else [[], [obj]] v = [obj, obj.base] if isinstance(obj, Instance) else [None, obj]
args = parsing.Array(parsing.Array.TUPLE, None, values=v) args = helpers.generate_param_array(v)
return self.execute_subscope_by_name('__get__', args) return self.execute_subscope_by_name('__get__', args)
def get_defined_names(self): def get_defined_names(self):
@@ -221,8 +224,7 @@ class Instance(Executable):
return names return names
def get_index_types(self, index=None): def get_index_types(self, index=None):
v = [[index]] if index is not None else [] args = helpers.generate_param_array([] if index is None else [index])
args = parsing.Array(parsing.Array.NOARRAY, None, values=v)
try: try:
return self.execute_subscope_by_name('__getitem__', args) return self.execute_subscope_by_name('__getitem__', args)
except KeyError: except KeyError:
@@ -379,8 +381,7 @@ class Function(parsing.Base):
decorator = dec_results.pop() decorator = dec_results.pop()
# Create param array. # Create param array.
old_func = Function(f, is_decorated=True) old_func = Function(f, is_decorated=True)
params = parsing.Array(parsing.Array.NOARRAY, old_func) params = helpers.generate_param_array([old_func], old_func)
params.values = [[old_func]]
wrappers = Execution(decorator, params).get_return_types() wrappers = Execution(decorator, params).get_return_types()
if not len(wrappers): if not len(wrappers):
@@ -730,7 +731,7 @@ class Array(parsing.Base):
self._array = array self._array = array
def get_index_types(self, index_call_list=None): def get_index_types(self, index_call_list=None):
""" Tries to get the only element (key) of a TODO doc""" """ Get the types of a specific index or all, if not given """
# array slicing # array slicing
if index_call_list is not None: if index_call_list is not None:
if index_call_list and [x for x in index_call_list if ':' in x]: if index_call_list and [x for x in index_call_list if ':' in x]:
@@ -936,10 +937,7 @@ def get_scopes_for_name(scope, name_str, position=None, search_global=False):
generators.append(it) generators.append(it)
else: else:
try: try:
# TODO remove generators += it.execute_subscope_by_name('__iter__')
args = parsing.Array(parsing.Array.TUPLE, None, values=[])
generators += \
it.execute_subscope_by_name('__iter__', args)
except KeyError: except KeyError:
pass pass

5
helpers.py
View File

@@ -82,5 +82,8 @@ def generate_param_array(args_tuple, parent_stmt=None):
""" This generates an array, that can be used as a param """ """ This generates an array, that can be used as a param """
values = [] values = []
for arg in args_tuple: for arg in args_tuple:
values.append([arg]) if arg is None:
values.append([])
else:
values.append([arg])
return parsing.Array(parsing.Array.TUPLE, parent_stmt, values=values) return parsing.Array(parsing.Array.TUPLE, parent_stmt, values=values)