diff options
| author | Damien George <damien.p.george@gmail.com> | 2017-03-14 11:30:05 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2017-03-14 11:52:05 +1100 |
| commit | 52f8f5666a496e17306c7cc6f53c0c14cf003a57 (patch) | |
| tree | abfb0237819d4ef778afb5e8c0b28fd1e392d78b /esp8266 | |
| parent | 180045bce9282c4a658284e01348f57841e39cdd (diff) | |
| download | micropython-52f8f5666a496e17306c7cc6f53c0c14cf003a57.tar.gz micropython-52f8f5666a496e17306c7cc6f53c0c14cf003a57.zip | |
esp8266: Update lexer constructors so they can raise exceptions.
Diffstat (limited to 'esp8266')
| -rw-r--r-- | esp8266/lexerstr32.c | 5 | ||||
| -rw-r--r-- | esp8266/main.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/esp8266/lexerstr32.c b/esp8266/lexerstr32.c index 3fc62399e7..6fb84bb74e 100644 --- a/esp8266/lexerstr32.c +++ b/esp8266/lexerstr32.c @@ -58,10 +58,7 @@ STATIC void str32_buf_free(void *sb_in) { } mp_lexer_t *mp_lexer_new_from_str32(qstr src_name, const char *str, mp_uint_t len, mp_uint_t free_len) { - mp_lexer_str32_buf_t *sb = m_new_obj_maybe(mp_lexer_str32_buf_t); - if (sb == NULL) { - return NULL; - } + mp_lexer_str32_buf_t *sb = m_new_obj(mp_lexer_str32_buf_t); sb->byte_off = (uint32_t)str & 3; sb->src_cur = (uint32_t*)(str - sb->byte_off); sb->val = *sb->src_cur++ >> sb->byte_off * 8; diff --git a/esp8266/main.c b/esp8266/main.c index 0099486750..fd07efcbf2 100644 --- a/esp8266/main.c +++ b/esp8266/main.c @@ -32,6 +32,7 @@ #include "py/runtime0.h" #include "py/runtime.h" #include "py/stackctrl.h" +#include "py/mperrno.h" #include "py/mphal.h" #include "py/gc.h" #include "lib/mp-readline/readline.h" @@ -111,7 +112,7 @@ void user_init(void) { #if !MICROPY_VFS mp_lexer_t *mp_lexer_new_from_file(const char *filename) { - return NULL; + mp_raise_OSError(MP_ENOENT); } mp_import_stat_t mp_import_stat(const char *path) { |