summaryrefslogtreecommitdiffstatshomepage
path: root/py/runtime.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-06-07 22:02:35 +0100
committerDamien George <damien.p.george@gmail.com>2014-06-07 22:02:35 +0100
commitd31a093f9c2bdc3c94917c928fb2cc8c26b39959 (patch)
tree8d45798562c303ebfdf889e3babdfbb0b2abc210 /py/runtime.c
parentf0778a7ccbbdd1d7bf116a6939c7eb05173e1987 (diff)
parent5473f743f37e12921f4acb11fa84fe0d2b9d0650 (diff)
downloadmicropython-d31a093f9c2bdc3c94917c928fb2cc8c26b39959.tar.gz
micropython-d31a093f9c2bdc3c94917c928fb2cc8c26b39959.zip
Merge branch 'master' of github.com:micropython/micropython
Conflicts: py/emitglue.c
Diffstat (limited to 'py/runtime.c')
-rw-r--r--py/runtime.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/py/runtime.c b/py/runtime.c
index cdbf99d4a5..179b48d327 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1150,6 +1150,10 @@ void *m_malloc_fail(int num_bytes) {
nlr_raise((mp_obj_t)&mp_const_MemoryError_obj);
}
+NORETURN void mp_not_implemented(const char *msg) {
+ nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError, msg));
+}
+
// these must correspond to the respective enum
void *const mp_fun_table[MP_F_NUMBER_OF] = {
mp_load_const_int,