srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

transforms.Inferencer: narrow range() element type.

This commit is contained in:
whitequark 2015-09-02 17:46:54 -06:00
parent b971cc8cdf
commit 867a0689ad
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
artiq/compiler/transforms/inferencer.py
View File

@ -656,33 +656,21 @@ class Inferencer(algorithm.Visitor):
diagnose(valid_forms()) diagnose(valid_forms())
elif types.is_builtin(typ, "range"): elif types.is_builtin(typ, "range"):
valid_forms = lambda: [ valid_forms = lambda: [
valid_form("range(max:'a) -> range(elt='a)"), valid_form("range(max:int(width='a)) -> range(elt=int(width='a))"),
valid_form("range(min:'a, max:'a) -> range(elt='a)"), valid_form("range(min:int(width='a), max:int(width='a)) "
valid_form("range(min:'a, max:'a, step:'a) -> range(elt='a)"), "-> range(elt=int(width='a))"),
valid_form("range(min:int(width='a), max:int(width='a), "
"step:int(width='a)) -> range(elt=int(width='a))"),
] ]
range_tvar = types.TVar() range_elt = builtins.TInt(types.TVar())
self._unify(node.type, builtins.TRange(range_tvar), self._unify(node.type, builtins.TRange(range_elt),
node.loc, None) node.loc, None)
if len(node.args) in (1, 2, 3) and len(node.keywords) == 0: if len(node.args) in (1, 2, 3) and len(node.keywords) == 0:
for arg in node.args: for arg in node.args:
self._unify(arg.type, range_tvar, self._unify(arg.type, range_elt,
arg.loc, None) arg.loc, None)
if builtins.is_int(arg.type):
pass
elif types.is_var(arg.type):
pass # undetermined yet
else:
note = diagnostic.Diagnostic("note",
"this expression has type {type}",
{"type": types.TypePrinter().name(arg.type)},
arg.loc)
diag = diagnostic.Diagnostic("error",
"an argument of range() must be of an integer type", {},
node.func.loc, notes=[note])
self.engine.process(diag)
else: else:
diagnose(valid_forms()) diagnose(valid_forms())
elif types.is_builtin(typ, "len"): elif types.is_builtin(typ, "len"):

3
lit-test/test/inferencer/error_builtin_calls.py
View File

@ -10,6 +10,3 @@ len(1)
# CHECK-L: ${LINE:+1}: error: the argument of list() must be of an iterable type # CHECK-L: ${LINE:+1}: error: the argument of list() must be of an iterable type
list(1) list(1)
# CHECK-L: ${LINE:+1}: error: an argument of range() must be of an integer type
range([])