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

first version of too few params detection

Browse Source
This commit is contained in:
Dave Halter
2014-05-21 13:01:12 +02:00
parent 4ecc150d85
commit 9d4dc546ca
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jedi/evaluate/analysis.py
View File

@@ -12,7 +12,8 @@ CODES = {
'name-error': (2, NameError, 'Potential NameError.'), 'name-error': (2, NameError, 'Potential NameError.'),
'import-error': (3, ImportError, 'Potential ImportError.'), 'import-error': (3, ImportError, 'Potential ImportError.'),
'type-error-generator': (4, TypeError, "TypeError: 'generator' object is not subscriptable."), 'type-error-generator': (4, TypeError, "TypeError: 'generator' object is not subscriptable."),
'type-error-too-many-params': (4, TypeError, "TypeError: 'generator' object is not subscriptable."), 'type-error-too-many-arguments': (5, TypeError, None),
'type-error-too-few-arguments': (6, TypeError, None),
} }

18
jedi/evaluate/param.py
View File

@@ -55,6 +55,7 @@ def get_params(evaluator, func, var_args):
# There may be calls, which don't fit all the params, this just ignores it. # There may be calls, which don't fit all the params, this just ignores it.
var_arg_iterator = common.PushBackIterator(_var_args_iterator(evaluator, var_args)) var_arg_iterator = common.PushBackIterator(_var_args_iterator(evaluator, var_args))
non_matching_keys = [] non_matching_keys = []
keys_used = set() keys_used = set()
keys_only = False keys_only = False
@@ -112,7 +113,9 @@ def get_params(evaluator, func, var_args):
# returned. # returned.
values = [] values = []
if isinstance(var_args, pr.Array): if isinstance(var_args, pr.Array):
print var_args, var_args.start_pos m = get_error_message(func, len(var_args))
analysis.add(evaluator, 'type-error-too-few-arguments',
var_args, message=m)
# Just ignore all the params that are without a key, after one keyword # Just ignore all the params that are without a key, after one keyword
# argument was set. # argument was set.
@@ -129,11 +132,9 @@ def get_params(evaluator, func, var_args):
remaining_params = list(var_arg_iterator) remaining_params = list(var_arg_iterator)
if remaining_params: if remaining_params:
param_count = len(func.params) m = get_error_message(func, len(func.params) + len(remaining_params))
message = 'TypeError: %s() takes exactly %s arguments (%s given).' \ analysis.add(evaluator, 'type-error-too-many-arguments',
% (func.name, param_count, param_count + len(remaining_params)) remaining_params[0][1], message=m)
analysis.add(evaluator, 'type-error-too-many-params',
remaining_params[0][1], message=message)
return result return result
@@ -184,3 +185,8 @@ def _var_args_iterator(evaluator, var_args):
yield key_arr[0].name, stmt yield key_arr[0].name, stmt
else: else:
yield None, stmt yield None, stmt
def get_error_message(func, actual_count):
return ('TypeError: %s() takes exactly %s arguments (%%s given).'
% (func.name, len(func.params)))

7
test/static_analysis/arguments.py
View File

@@ -2,15 +2,18 @@ def simple(a):
return a return a
simple(1) simple(1)
#! 6 type-error-too-few-arguments
simple() simple()
#! 10 type-error-too-many-params #! 10 type-error-too-many-arguments
simple(1, 2) simple(1, 2)
def nested(*args): def nested(*args):
# TODO: shoult not be her but in line 17
#! 13 type-error-too-few-arguments
return simple(*args) return simple(*args)
nested(1) nested(1)
nested() nested()
#! 10 type-error-too-many-params #! 10 type-error-too-many-arguments
simple(1, 2, 3) simple(1, 2, 3)