Commit 003977a7 authored by Damien George's avatar Damien George
Browse files

Merge branch 'master' of github.com:micropython/micropython

parents 3eb8163b 26a99207
#include <stdlib.h> #include <stdlib.h>
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "runtime.h" #include "runtime.h"
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "parsenum.h" #include "parsenum.h"
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "mpz.h" #include "mpz.h"
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "parsenumbase.h" #include "parsenumbase.h"
#include "obj.h" #include "obj.h"
......
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "runtime0.h" #include "runtime0.h"
......
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "runtime.h" #include "runtime.h"
......
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "objmodule.h" #include "objmodule.h"
......
#include <string.h> #include <string.h>
#include "misc.h"
#include "mpconfig.h" #include "mpconfig.h"
#include "misc.h"
#include "nlr.h" #include "nlr.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
......
#include <stdlib.h> #include <stdlib.h>
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "runtime0.h" #include "runtime0.h"
......
#include <stdlib.h> #include <stdlib.h>
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "runtime0.h" #include "runtime0.h"
......
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "runtime.h" #include "runtime.h"
......
#include <stdlib.h> #include <stdlib.h>
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "runtime.h" #include "runtime.h"
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "runtime.h" #include "runtime.h"
......
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "runtime0.h" #include "runtime0.h"
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "runtime0.h" #include "runtime0.h"
......
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "runtime.h" #include "runtime.h"
......
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "runtime0.h" #include "runtime0.h"
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "runtime0.h" #include "runtime0.h"
...@@ -189,7 +189,7 @@ STATIC mp_obj_t class_make_new(mp_obj_t self_in, uint n_args, uint n_kw, const m ...@@ -189,7 +189,7 @@ STATIC mp_obj_t class_make_new(mp_obj_t self_in, uint n_args, uint n_kw, const m
// now call Python class __init__ function with all args // now call Python class __init__ function with all args
mp_obj_t init_ret; mp_obj_t init_ret;
if (n_args == 0 && n_kw == 0) { if (n_args == 0 && n_kw == 0) {
init_ret = mp_call_function_n_kw(init_fn[0], 1, 0, (mp_obj_t*)&o); init_ret = mp_call_function_n_kw(init_fn[0], 1, 0, (mp_obj_t*)(void*)&o);
} else { } else {
mp_obj_t *args2 = m_new(mp_obj_t, 1 + n_args + 2 * n_kw); mp_obj_t *args2 = m_new(mp_obj_t, 1 + n_args + 2 * n_kw);
args2[0] = o; args2[0] = o;
......
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include "misc.h"
#include "mpconfig.h" #include "mpconfig.h"
#include "misc.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "runtime.h" #include "runtime.h"
......
#include "mpconfig.h"
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "qstr.h" #include "qstr.h"
#include "obj.h" #include "obj.h"
#include "runtime.h" #include "runtime.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment