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

check not only - but also + for numbers.

Browse Source
This commit is contained in:
Dave Halter
2014-07-22 16:18:57 +02:00
parent 96ca596cc2
commit f7c8c43fbc
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jedi/evaluate/precedence.py
View File

@@ -262,6 +262,8 @@ def _is_list(obj):
def _element_calculate(evaluator, left, operator, right): def _element_calculate(evaluator, left, operator, right):
from jedi.evaluate import iterable from jedi.evaluate import iterable
l_is_num = _is_number(left)
r_is_num = _is_number(right)
if operator == '*': if operator == '*':
# for iterables, ignore * operations # for iterables, ignore * operations
if isinstance(left, iterable.Array) or _is_string(left): if isinstance(left, iterable.Array) or _is_string(left):
@@ -269,22 +271,22 @@ def _element_calculate(evaluator, left, operator, right):
elif isinstance(right, iterable.Array) or _is_string(right): elif isinstance(right, iterable.Array) or _is_string(right):
return [right] return [right]
elif operator == '+': elif operator == '+':
l_is_num = _is_number(left)
r_is_num = _is_number(right)
if l_is_num and r_is_num or _is_string(left) and _is_string(right): if l_is_num and r_is_num or _is_string(left) and _is_string(right):
return [create(evaluator, left.obj + right.obj)] return [create(evaluator, left.obj + right.obj)]
elif _is_tuple(left) and _is_tuple(right) or _is_list(left) and _is_list(right): elif _is_tuple(left) and _is_tuple(right) or _is_list(left) and _is_list(right):
return [iterable.MergedArray(evaluator, (left, right))] return [iterable.MergedArray(evaluator, (left, right))]
# Static analysis, one is a number, the other one is not.
elif l_is_num != r_is_num:
message = "TypeError: unsupported operand type(s) for +: %s and %s"
analysis.add(evaluator, 'type-error-operation', operator,
message % (left, right))
elif operator == '-': elif operator == '-':
if _is_number(left) and _is_number(right): if l_is_num and r_is_num:
return [create(evaluator, left.obj - right.obj)] return [create(evaluator, left.obj - right.obj)]
elif operator == '%': elif operator == '%':
# With strings and numbers the left type typically remains. Except for # With strings and numbers the left type typically remains. Except for
# `int() % float()`. # `int() % float()`.
return [left] return [left]
# Static analysis, one is a number, the other one is not.
if operator in ['+', '-'] and l_is_num != r_is_num:
message = "TypeError: unsupported operand type(s) for +: %s and %s"
analysis.add(evaluator, 'type-error-operation', operator,
message % (left, right))
return [left, right] return [left, right]

4
test/static_analysis/operations.py
View File

@@ -2,3 +2,7 @@
1 + 1.0 1 + 1.0
#! 2 type-error-operation #! 2 type-error-operation
1 + '1' 1 + '1'
#! 2 type-error-operation
1 - '1'
-1 - - 1