Author: Greg Price <pr...@mit.edu>
Branch: signatures
Changeset: r59310:6c90ebcd3282
Date: 2012-12-02 16:36 -0800
http://bitbucket.org/pypy/pypy/changeset/6c90ebcd3282/
Log: (price, arigato) On signature return-type mismatch, give halfway-
decent message
diff --git a/pypy/annotation/annrpython.py b/pypy/annotation/annrpython.py
--- a/pypy/annotation/annrpython.py
+++ b/pypy/annotation/annrpython.py
@@ -375,7 +375,12 @@
# Merge the new 'cells' with each of the block's existing input
# variables.
oldcells = [self.binding(a) for a in block.inputargs]
- unions = [annmodel.unionof(c1,c2) for c1, c2 in
zip(oldcells,inputcells)]
+ try:
+ unions = [annmodel.unionof(c1,c2) for c1, c2 in
zip(oldcells,inputcells)]
+ except annmodel.UnionError, e:
+ e.args = e.args + (
+ ErrorWrapper(gather_error(self, graph, block, None)),)
+ raise
# if the merged cells changed, we must redo the analysis
if unions != oldcells:
self.bindinputargs(graph, block, unions)
diff --git a/pypy/rlib/test/test_objectmodel.py
b/pypy/rlib/test/test_objectmodel.py
--- a/pypy/rlib/test/test_objectmodel.py
+++ b/pypy/rlib/test/test_objectmodel.py
@@ -505,12 +505,30 @@
g = a.annotate_helper(f, [model.s_ImpossibleValue]*f.func_code.co_argcount)
return [a.bindings[v] for v in g.startblock.inputargs] +
[a.bindings[g.getreturnvar()]]
+def check_annotator_fails(caller):
+ t = TranslationContext()
+ a = t.buildannotator()
+ exc = py.test.raises(Exception, a.annotate_helper, caller,
+
[model.s_ImpossibleValue]*caller.func_code.co_argcount).value
+ assert caller.func_name in repr(exc.args)
+
def test_signature_basic():
@signature(types.int(), types.str(), returns=types.int())
def f(a, b):
return a + len(b)
assert getsig(f) == [model.SomeInteger(), model.SomeString(),
model.SomeInteger()]
+def test_signature_arg_errors():
+ @signature(types.int(), types.str(), returns=types.int())
+ def f(a, b):
+ return a + len(b)
+ @check_annotator_fails
+ def ok_for_body(): # would give no error without signature
+ f(2.0, 'b')
+ @check_annotator_fails
+ def bad_for_body(): # would give error inside 'f' body, instead errors at
call
+ f('a', 'b')
+
def test_signature_return():
@signature(returns=types.str())
def f():
@@ -528,24 +546,15 @@
assert a.bindings[graphof(t, f).startblock.inputargs[0]] ==
model.SomeString()
assert a.bindings[graphof(t, f).getreturnvar()] == model.SomeString()
-
-def test_signature_errors():
- @signature(types.int(), types.str(), returns=types.int())
- def f(a, b):
- return a + len(b)
- def ok_for_body(): # would give no error without signature
- f(2.0, 'b')
- def bad_for_body(): # would give error inside 'f' body, instead errors at
call
- f('a', 'b')
-
- def check_fails(caller):
- t = TranslationContext()
- a = t.buildannotator()
- exc = py.test.raises(Exception, a.annotate_helper, caller, []).value
- assert caller.func_name in repr(exc.args)
-
- check_fails(ok_for_body)
- check_fails(bad_for_body)
+def test_signature_return_errors():
+ @check_annotator_fails
+ @signature(returns=types.int())
+ def int_not_char():
+ return 'a'
+ @check_annotator_fails
+ @signature(types.str(), returns=types.int())
+ def str_to_int(s):
+ return s
def getgraph(f, argtypes):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
