py: Fix up so that it can compile without float.

dpgeorge · dpgeorge · commit 70f33cde4852 · 2014-04-02T17:06:05.000+01:00
diff --git a/py/gc.c b/py/gc.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "mpconfig.h"
diff --git a/py/malloc.c b/py/malloc.c
@@ -1,4 +1,3 @@
-#include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/py/objstr.c b/py/objstr.c
@@ -788,9 +788,9 @@ mp_obj_t str_format(uint n_args, const mp_obj_t *args) {
                     nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
                         "Unknown format code '%c' for object of type '%s'", type, mp_obj_get_type_str(arg)));
             }
-        }
+
 #if MICROPY_ENABLE_FLOAT
-        if (arg_looks_numeric(arg)) {
+        } else if (arg_looks_numeric(arg)) {
             if (!type) {
 
                 // Even though the docs say that an unspecified type is the same
@@ -848,10 +848,14 @@ mp_obj_t str_format(uint n_args, const mp_obj_t *args) {
                         type, mp_obj_get_type_str(arg)));
             }
 #endif
+
         } else {
+            // arg doesn't look like a number
+
             if (align == '=') {
                 nlr_jump(mp_obj_new_exception_msg(&mp_type_ValueError, "'=' alignment not allowed in string format specifier"));
             }
+
             switch (type) {
                 case '\0':
                     mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, arg, PRINT_STR);
diff --git a/py/runtime.c b/py/runtime.c
@@ -346,8 +346,7 @@ mp_obj_t mp_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) {
                 case MP_BINARY_OP_TRUE_DIVIDE:
                 case MP_BINARY_OP_INPLACE_TRUE_DIVIDE:
                     if (rhs_val == 0) {
-zero_division:
-                        nlr_jump(mp_obj_new_exception_msg(&mp_type_ZeroDivisionError, "division by zero"));
+                        goto zero_division;
                     }
                     return mp_obj_new_float((mp_float_t)lhs_val / (mp_float_t)rhs_val);
                 #endif
@@ -451,6 +450,9 @@ mp_obj_t mp_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) {
         "unsupported operand types for binary operator: '%s', '%s'",
         mp_obj_get_type_str(lhs), mp_obj_get_type_str(rhs)));
     return mp_const_none;
+
+zero_division:
+    nlr_jump(mp_obj_new_exception_msg(&mp_type_ZeroDivisionError, "division by zero"));
 }
 
 mp_obj_t mp_call_function_0(mp_obj_t fun) {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include <stdio.h>`
`2`		`-#include <stdlib.h>`
`3`	`2`	`#include <string.h>`
`4`	`3`
`5`	`4`	`#include "mpconfig.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#include <unistd.h>`
`2`	`1`	`#include <stdio.h>`
`3`	`2`	`#include <stdlib.h>`
`4`	`3`	`#include <string.h>`