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

bare-arm/main.c

@@ -2,9 +2,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"

py/argcheck.c

@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

py/builtin.c

@@ -1,9 +1,9 @@
 #include <stdio.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "objstr.h"

py/builtinevex.c

@@ -1,8 +1,8 @@
 #include <stdint.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "lexerunix.h"

py/builtinimport.c

@@ -8,9 +8,9 @@
 #include <malloc.h>
 #endif
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "lexerunix.h"

py/nlr.h

@@ -3,7 +3,6 @@
 
 #include <limits.h>
 #include <setjmp.h>
-#include "mpconfig.h"
 
 typedef struct _nlr_buf_t nlr_buf_t;
 struct _nlr_buf_t {

py/nlrsetjmp.c

@@ -1,5 +1,6 @@
 #include <setjmp.h>
 #include <stdio.h>
+#include "mpconfig.h"
 #include "nlr.h"
 
 #if MICROPY_NLR_SETJMP

py/obj.c

@@ -2,9 +2,9 @@
 #include <stdarg.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"

py/objarray.c

@@ -1,9 +1,9 @@
 #include <string.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"

py/objbool.c

@@ -1,8 +1,8 @@
 #include <stdlib.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"

py/objboundmeth.c

@@ -1,8 +1,8 @@
 #include <string.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

py/objcell.c

@@ -1,6 +1,6 @@
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

py/objclosure.c

@@ -1,8 +1,8 @@
 #include <string.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "objtuple.h"

py/objcomplex.c

@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "parsenum.h"

py/objdict.c

@@ -2,9 +2,9 @@
 #include <string.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "objtuple.h"

py/objexcept.c

@@ -2,9 +2,9 @@
 #include <stdarg.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "objtuple.h"

py/objfilter.c

@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

py/objfloat.c

@@ -4,9 +4,9 @@
 #include <assert.h>
 #include <math.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "parsenum.h"

py/objfun.c

@@ -7,9 +7,9 @@
 #include <malloc.h>
 #endif
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "objtuple.h"

py/objgenerator.c

@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

py/objgetitemiter.c

@@ -1,8 +1,8 @@
 #include <stdlib.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

py/objint.c

@@ -3,9 +3,9 @@
 #include <assert.h>
 #include <string.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "parsenum.h"

py/objint_longlong.c

@@ -2,9 +2,9 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "mpz.h"

py/objint_mpz.c

@@ -3,9 +3,9 @@
 #include <stdio.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "parsenumbase.h"
 #include "obj.h"

py/objlist.c

@@ -1,9 +1,9 @@
 #include <string.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"

py/objmap.c

@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

py/objmodule.c

@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "objmodule.h"

py/objnamedtuple.c

@@ -1,7 +1,7 @@
 #include <string.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "nlr.h"
 #include "qstr.h"
 #include "obj.h"

py/objnone.c

@@ -1,8 +1,8 @@
 #include <stdlib.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"

py/objobject.c

@@ -1,8 +1,8 @@
 #include <stdlib.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"

py/objproperty.c

@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

py/objrange.c

@@ -1,8 +1,8 @@
 #include <stdlib.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

py/objset.c

@@ -2,9 +2,9 @@
 #include <string.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

py/objslice.c

@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"

py/objstr.c

@@ -2,9 +2,9 @@
 #include <string.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"

py/objstringio.c

@@ -1,9 +1,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

py/objtuple.c

@@ -1,9 +1,9 @@
 #include <string.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"

py/objtype.c

@@ -3,9 +3,9 @@
 #include <string.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.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
         // now call Python class __init__ function with all args
         mp_obj_t init_ret;
         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 {
             mp_obj_t *args2 = m_new(mp_obj_t, 1 + n_args + 2 * n_kw);
             args2[0] = o;

py/objzip.c

@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

py/opmethods.c

@@ -1,6 +1,6 @@
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

py/runtime.c

@@ -2,9 +2,9 @@
 #include <string.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "objtuple.h"

py/sequence.c

@@ -2,9 +2,9 @@
 #include <stdbool.h>
 #include <string.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime0.h"

py/showbc.c

@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "misc.h"
 #include "mpconfig.h"
+#include "misc.h"
 #include "qstr.h"
 #include "bc0.h"
 

py/stream.c

@@ -1,8 +1,8 @@
 #include <string.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "stream.h"

py/vm.c

@@ -2,9 +2,9 @@
 #include <string.h>
 #include <assert.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "emitglue.h"

qemu-arm/main.c

@@ -2,9 +2,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "parse.h"

stmhal/accel.c

@@ -3,9 +3,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

stmhal/adc.c

@@ -2,9 +2,9 @@
 #include <stm32f4xx_hal.h>
 #include <string.h>
 
+#include "mpconfig.h"
 #include "misc.h"
 #include "nlr.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

stmhal/cc3k/pybcc3k.c

@@ -2,9 +2,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

stmhal/dac.c

@@ -3,9 +3,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "parse.h"
 #include "obj.h"

stmhal/extint.c

@@ -4,9 +4,9 @@
 
 #include <stm32f4xx_hal.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "gc.h"
 #include "obj.h"

stmhal/help.c

@@ -1,8 +1,8 @@
 #include <stdio.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 

stmhal/i2c.c

@@ -3,9 +3,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

stmhal/input.c

@@ -1,6 +1,6 @@
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "readline.h"

stmhal/lcd.c

@@ -2,9 +2,9 @@
 #include <string.h>
 #include <stm32f4xx_hal.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 
 #if MICROPY_HW_HAS_LCD
 

stmhal/led.c

@@ -1,9 +1,9 @@
 #include <stdio.h>
 #include <stm32f4xx_hal.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

stmhal/modos.c

@@ -1,8 +1,8 @@
 #include <string.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "systick.h"

stmhal/modstm.c

@@ -3,9 +3,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "modstm.h"

stmhal/modtime.c

@@ -1,8 +1,8 @@
 #include <stm32f4xx_hal.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "modtime.h"

stmhal/pin.c

@@ -4,9 +4,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

stmhal/pybwlan.c

@@ -5,9 +5,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

stmhal/pyexec.c

@@ -3,9 +3,9 @@
 
 #include <stm32f4xx_hal.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "misc.h"
 #include "lexer.h"

stmhal/servo.c

@@ -2,9 +2,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

stmhal/spi.c

@@ -3,9 +3,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

stmhal/uart.c

@@ -3,9 +3,9 @@
 
 #include "stm32f4xx_hal.h"
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

unix/file.c

@@ -5,9 +5,9 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

unix/main.c

@@ -8,9 +8,9 @@
 #include <sys/types.h>
 #include <errno.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "lexer.h"
 #include "lexerunix.h"

unix/modffi.c

@@ -4,9 +4,9 @@
 #include <dlfcn.h>
 #include <ffi.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "runtime.h"

unix/modsocket.c

@@ -11,9 +11,9 @@
 #include <netdb.h>
 #include <errno.h>
 
+#include "mpconfig.h"
 #include "nlr.h"
 #include "misc.h"
-#include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
 #include "objtuple.h"