diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-02-15 16:10:44 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-02-15 16:10:44 +0000 |
| commit | c5966128c7c8a768f6726f299d85d5daef6bed48 (patch) | |
| tree | fea6913ae43d722078a837d8c7fd9a1e459f3891 /py/strtonum.c | |
| parent | a71c83a1d1aeca1d81d7c673929f8e836dec131e (diff) | |
| download | micropython-c5966128c7c8a768f6726f299d85d5daef6bed48.tar.gz micropython-c5966128c7c8a768f6726f299d85d5daef6bed48.zip | |
Implement proper exception type hierarchy.
Each built-in exception is now a type, with base type BaseException.
C exceptions are created by passing a pointer to the exception type to
make an instance of. When raising an exception from the VM, an
instance is created automatically if an exception type is raised (as
opposed to an exception instance).
Exception matching (RT_BINARY_OP_EXCEPTION_MATCH) is now proper.
Handling of parse error changed to match new exceptions.
mp_const_type renamed to mp_type_type for consistency.
Diffstat (limited to 'py/strtonum.c')
| -rw-r--r-- | py/strtonum.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/py/strtonum.c b/py/strtonum.c index 74fa3d6759..e83b9751dc 100644 --- a/py/strtonum.c +++ b/py/strtonum.c @@ -18,7 +18,7 @@ long strtonum(const char *restrict s, int base) { // check radix base if ((base != 0 && base < 2) || base > 36) { - nlr_jump(mp_obj_new_exception_msg(MP_QSTR_ValueError, "ValueError: int() arg 2 must be >=2 and <= 36")); + nlr_jump(mp_obj_new_exception_msg(&mp_type_ValueError, "ValueError: int() arg 2 must be >=2 and <= 36")); } // skip surrounded whitespace while (isspace((c = *(p++)))); @@ -84,7 +84,7 @@ done: return (found ^ neg) - neg; value_error: - nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_ValueError, "invalid literal for int() with base %d: '%s'", base, s)); + nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "invalid literal for int() with base %d: '%s'", base, s)); } #else /* defined(UNIX) */ |