py/objint_longlong: Instead of assert, throw OverflowError.

pfalcon · pfalcon · commit 50f56227c651 · 2015-11-09T01:34:56.000+02:00
diff --git a/py/objint_longlong.c b/py/objint_longlong.c
@@ -231,7 +231,9 @@ mp_obj_t mp_obj_new_int_from_ll(long long val) {
 
 mp_obj_t mp_obj_new_int_from_ull(unsigned long long val) {
     // TODO raise an exception if the unsigned long long won't fit
-    assert(val >> (sizeof(unsigned long long) * 8 - 1) == 0);
+    if (val >> (sizeof(unsigned long long) * 8 - 1) != 0) {
+        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OverflowError, "ulonglong too large"));
+    }
     mp_obj_int_t *o = m_new_obj(mp_obj_int_t);
     o->base.type = &mp_type_int;
     o->val = val;

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,9 @@ mp_obj_t mp_obj_new_int_from_ll(long long val) {`
`231`	`231`
`232`	`232`	`mp_obj_t mp_obj_new_int_from_ull(unsigned long long val) {`
`233`	`233`	`// TODO raise an exception if the unsigned long long won't fit`
`234`		`- assert(val >> (sizeof(unsigned long long) * 8 - 1) == 0);`
	`234`	`+ if (val >> (sizeof(unsigned long long) * 8 - 1) != 0) {`
	`235`	`+ nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OverflowError, "ulonglong too large"));`
	`236`	`+ }`
`235`	`237`	`mp_obj_int_t *o = m_new_obj(mp_obj_int_t);`
`236`	`238`	`o->base.type = &mp_type_int;`
`237`	`239`	`o->val = val;`