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

Better error message for List inference.

This commit is contained in:
whitequark 2015-06-04 14:42:45 +03:00
parent 995d84d4ee
commit 10a269d77e
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
artiq/py2llvm/typing.py
View File

@ -131,18 +131,26 @@ class Inferencer(algorithm.Transformer):
self.engine = engine self.engine = engine
self.env_stack = [{}] self.env_stack = [{}]
def _unify(self, typea, typeb, loca, locb): def _unify(self, typea, typeb, loca, locb, kind):
try: try:
typea.unify(typeb) typea.unify(typeb)
except types.UnificationError as e: except types.UnificationError as e:
note1 = diagnostic.Diagnostic('note', if kind == 'generic':
"expression of type {typea}", note1 = diagnostic.Diagnostic('note',
{"typea": types.TypePrinter().name(typea)}, "expression of type {typea}",
loca) {"typea": types.TypePrinter().name(typea)},
loca)
elif kind == 'expects':
note1 = diagnostic.Diagnostic('note',
"expression expecting an operand of type {typea}",
{"typea": types.TypePrinter().name(typea)},
loca)
note2 = diagnostic.Diagnostic('note', note2 = diagnostic.Diagnostic('note',
"expression of type {typeb}", "expression of type {typeb}",
{"typeb": types.TypePrinter().name(typeb)}, {"typeb": types.TypePrinter().name(typeb)},
locb) locb)
if e.typea.find() == typea.find() and e.typeb.find() == typeb.find(): if e.typea.find() == typea.find() and e.typeb.find() == typeb.find():
diag = diagnostic.Diagnostic('fatal', diag = diagnostic.Diagnostic('fatal',
"cannot unify {typea} with {typeb}", "cannot unify {typea} with {typeb}",
@ -198,7 +206,7 @@ class Inferencer(algorithm.Transformer):
typ = types.TFloat() typ = types.TFloat()
else: else:
diag = diagnostic.Diagnostic('fatal', diag = diagnostic.Diagnostic('fatal',
"numeric type {type} is not supported", node.n.__class__.__name__, "numeric type {type} is not supported", {"type": node.n.__class__.__name__},
node.loc) node.loc)
self.engine.process(diag) self.engine.process(diag)
return asttyped.NumT(type=typ, return asttyped.NumT(type=typ,
@ -219,7 +227,7 @@ class Inferencer(algorithm.Transformer):
elts=node.elts, ctx=node.ctx, loc=node.loc) elts=node.elts, ctx=node.ctx, loc=node.loc)
for elt in node.elts: for elt in node.elts:
self._unify(node.type['elt'], elt.type, self._unify(node.type['elt'], elt.type,
node.loc, elt.loc) node.loc, elt.loc, kind='expects')
return node return node
# Visitors that just unify types # Visitors that just unify types
@ -257,7 +265,8 @@ class Printer(algorithm.Visitor):
def generic_visit(self, node): def generic_visit(self, node):
if hasattr(node, 'type'): if hasattr(node, 'type'):
self.rewriter.insert_after(node.loc, ":%s" % self.type_printer.name(node.type)) self.rewriter.insert_after(node.loc,
":%s" % self.type_printer.name(node.type))
super().generic_visit(node) super().generic_visit(node)