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 /unix/file.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 'unix/file.c')
| -rw-r--r-- | unix/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/file.c b/unix/file.c index 4e8fba54c8..444a05d491 100644 --- a/unix/file.c +++ b/unix/file.c @@ -99,7 +99,7 @@ static mp_obj_t fdfile_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const int fd = open(fname, mode, 0644); if (fd == -1) { - nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_OSError, "[Errno %d]", errno)); + nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_OSError, "[Errno %d]", errno)); } return fdfile_new(fd); } @@ -115,7 +115,7 @@ static const mp_method_t rawfile_type_methods[] = { }; static const mp_obj_type_t rawfile_type = { - { &mp_const_type }, + { &mp_type_type }, .name = MP_QSTR_io_dot_FileIO, .print = fdfile_print, .make_new = fdfile_make_new, |