M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

Allow also passing iterables to lists.

This commit is contained in:
whitequark 2015-06-26 19:14:24 +03:00
parent e07057c224
commit ea0d11b8be
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
artiq/py2llvm/typing.py
View File

@ -804,8 +804,7 @@ class Inferencer(algorithm.Visitor):
elif builtins.is_builtin(typ, "class list"): elif builtins.is_builtin(typ, "class list"):
valid_forms = lambda: [ valid_forms = lambda: [
valid_form("list() -> list(elt='a)"), valid_form("list() -> list(elt='a)"),
# TODO: add this form when adding iterators valid_form("list(x:'a) -> list(elt='b) where 'a is iterable")
# valid_form("list(x) -> list(elt='a)")
] ]
self._unify(node.type, builtins.TList(), self._unify(node.type, builtins.TList(),
@ -813,6 +812,20 @@ class Inferencer(algorithm.Visitor):
if len(node.args) == 0 and len(node.keywords) == 0: if len(node.args) == 0 and len(node.keywords) == 0:
pass # [] pass # []
elif len(node.args) == 1 and len(node.keywords) == 0:
arg, = node.args
if builtins.is_iterable(arg.type):
pass
else:
note = diagnostic.Diagnostic("note",
"this expression has type {type}",
{"type": types.TypePrinter().name(arg.type)},
arg.loc)
diag = diagnostic.Diagnostic("error",
"the argument of list() must be of an iterable type", {},
node.func.loc, notes=[note])
self.engine.process(diag)
else: else:
diagnose(valid_forms()) diagnose(valid_forms())
elif builtins.is_builtin(typ, "function range"): elif builtins.is_builtin(typ, "function range"):
@ -854,7 +867,7 @@ class Inferencer(algorithm.Visitor):
if len(node.args) == 1 and len(node.keywords) == 0: if len(node.args) == 1 and len(node.keywords) == 0:
arg, = node.args arg, = node.args
if builtins.is_list(arg.type) or builtins.is_range(arg.type): if builtins.is_iterable(arg.type):
pass pass
else: else:
note = diagnostic.Diagnostic("note", note = diagnostic.Diagnostic("note",

3
lit-test/py2llvm/typing/error_builtin_calls.py
View File

@ -8,5 +8,8 @@ int(1.0, width=a)
# CHECK-L: ${LINE:+1}: error: the argument of len() must be of an iterable type # CHECK-L: ${LINE:+1}: error: the argument of len() must be of an iterable type
len(1) len(1)
# CHECK-L: ${LINE:+1}: error: the argument of list() must be of an iterable type
list(1)
# CHECK-L: ${LINE:+1}: error: an argument of range() must be of a numeric type # CHECK-L: ${LINE:+1}: error: an argument of range() must be of a numeric type
range([]) range([])