From f81a49e464c2899710b3ed1f402434f83d92d094 Mon Sep 17 00:00:00 2001
From: Dave Hylands
Date: Sat, 5 Apr 2014 08:21:45 -0700
Subject: Allow floating point arguments with %d,i,u,o,x,X formats

---
 py/objstr.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'py/objstr.c')

diff --git a/py/objstr.c b/py/objstr.c
index 74f993a0b..ad85b4b6c 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -528,6 +528,15 @@ static bool arg_looks_numeric(mp_obj_t arg) {
     ;
 }
 
+static machine_int_t arg_as_int(mp_obj_t arg) {
+#if MICROPY_ENABLE_FLOAT
+    if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) {
+        return mp_obj_get_float(arg);
+    }
+#endif
+    return mp_obj_get_int(arg);
+}
+
 mp_obj_t str_format(uint n_args, const mp_obj_t *args) {
     assert(MP_OBJ_IS_STR(args[0]));
 
@@ -991,7 +1000,7 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, uint n_args, const mp_obj_t
             case 'd':
             case 'i':
             case 'u':
-                pfenv_print_int(&pfenv_vstr, mp_obj_get_int(arg), 1, 10, 'a', flags, fill, width);
+                pfenv_print_int(&pfenv_vstr, arg_as_int(arg), 1, 10, 'a', flags, fill, width);
                 break;
 
 #if MICROPY_ENABLE_FLOAT
@@ -1009,7 +1018,7 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, uint n_args, const mp_obj_t
                 if (alt) {
                     flags |= PF_FLAG_SHOW_PREFIX;
                 }
-                pfenv_print_int(&pfenv_vstr, mp_obj_get_int(arg), 1, 8, 'a', flags, fill, width); 
+                pfenv_print_int(&pfenv_vstr, arg_as_int(arg), 1, 8, 'a', flags, fill, width); 
                 break;
 
             case 'r':
@@ -1034,14 +1043,14 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, uint n_args, const mp_obj_t
                 if (alt) {
                     flags |= PF_FLAG_SHOW_PREFIX;
                 }
-                pfenv_print_int(&pfenv_vstr, mp_obj_get_int(arg), 1, 16, 'a', flags, fill, width);
+                pfenv_print_int(&pfenv_vstr, arg_as_int(arg), 1, 16, 'a', flags, fill, width);
                 break;
 
             case 'X':
                 if (alt) {
                     flags |= PF_FLAG_SHOW_PREFIX;
                 }
-                pfenv_print_int(&pfenv_vstr, mp_obj_get_int(arg), 1, 16, 'A', flags, fill, width);
+                pfenv_print_int(&pfenv_vstr, arg_as_int(arg), 1, 16, 'A', flags, fill, width);
                 break;
             
             default:
-- 
cgit v1.2.3