Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r269:daeee59179bd
Date: 2012-06-07 21:24 +0200
http://bitbucket.org/cffi/cffi/changeset/daeee59179bd/
Log: Fix for the special case of setting 1. Test and fix the exact error
message on Python 2.6.
diff --git a/c/_ffi_backend.c b/c/_ffi_backend.c
--- a/c/_ffi_backend.c
+++ b/c/_ffi_backend.c
@@ -808,16 +808,39 @@
if (ct->ct_flags & CT_PRIMITIVE_SIGNED) {
fmin = -(1LL << (cf->cf_bitsize-1));
fmax = (1LL << (cf->cf_bitsize-1)) - 1LL;
+ if (fmax == 0)
+ fmax = 1; /* special case to let "int x:1" receive "1" */
}
else {
fmin = 0LL;
fmax = (PY_LONG_LONG)((1ULL << cf->cf_bitsize) - 1ULL);
}
- if ((value < fmin || value > fmax) && value != 1) {
+ if (value < fmin || value > fmax) {
+ /* phew, PyErr_Format does not support "%lld" in Python 2.6 */
+ PyObject *svalue = NULL, *sfmin = NULL, *sfmax = NULL;
+ PyObject *lfmin = NULL, *lfmax = NULL;
+ svalue = PyObject_Str(init);
+ if (svalue == NULL) goto skip;
+ lfmin = PyLong_FromLongLong(fmin);
+ if (lfmin == NULL) goto skip;
+ sfmin = PyObject_Str(lfmin);
+ if (sfmin == NULL) goto skip;
+ lfmax = PyLong_FromLongLong(fmax);
+ if (lfmax == NULL) goto skip;
+ sfmax = PyObject_Str(lfmax);
+ if (sfmax == NULL) goto skip;
PyErr_Format(PyExc_OverflowError,
- "value %lld outside the range allowed by the "
- "bit field width: %lld <= x <= %llx",
- value, fmin, fmax);
+ "value %s outside the range allowed by the "
+ "bit field width: %s <= x <= %s",
+ PyString_AS_STRING(svalue),
+ PyString_AS_STRING(sfmin),
+ PyString_AS_STRING(sfmax));
+ skip:
+ Py_XDECREF(svalue);
+ Py_XDECREF(sfmin);
+ Py_XDECREF(sfmax);
+ Py_XDECREF(lfmin);
+ Py_XDECREF(lfmax);
return -1;
}
diff --git a/c/test_c.py b/c/test_c.py
--- a/c/test_c.py
+++ b/c/test_c.py
@@ -697,13 +697,18 @@
p.a2 = 3
p.a3 = -4
py.test.raises(OverflowError, "p.a3 = 4")
- py.test.raises(OverflowError, "p.a3 = -5")
+ e = py.test.raises(OverflowError, "p.a3 = -5")
+ assert str(e.value) == ("value -5 outside the range allowed by the "
+ "bit field width: -4 <= x <= 3")
assert p.a1 == -1 and p.a2 == 3 and p.a3 == -4
#
# special case for convenience: "int x:1", while normally signed,
# allows also setting the value "1" (it still gets read back as -1)
p.a1 = 1
assert p.a1 == -1
+ e = py.test.raises(OverflowError, "p.a1 = -2")
+ assert str(e.value) == ("value -2 outside the range allowed by the "
+ "bit field width: -1 <= x <= 1")
def test_bitfield_instance_init():
BInt = new_primitive_type("int")
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
