Use strfromf for explicit float formats too

The default float format was using strfromf, but when a float format
was explicitly selected, sprintf was being used.

Signed-off-by: Keith Packard <keithp@keithp.com>

chips/atmega/snek-atmega.h

@@ -51,7 +51,8 @@
 		static const char PROGMEM __fmt__[] = (fmt);	\
 		sprintf_P(dst, __fmt__, ##args);		\
 	})
-#define strfromf(dst, len, fmt, val) sprintf_const(dst, fmt, val)
+#define strfromf_const(dst, len, fmt, val) sprintf_const(dst, fmt, val)
+#define strfromf(dst, len, fmt, val) sprintf(dst, fmt, val)
 
 #define SNEK_BUILTIN_NAMES_DECLARE(n) 	PROGMEM n
 #define SNEK_BUILTIN_NAMES(a)		((uint8_t) pgm_read_byte(&snek_builtin_names[a]))

chips/avr/snek-avr.h

@@ -64,7 +64,8 @@ sqrtf(float x) {
 		static const char PROGMEM __fmt__[] = (fmt);	\
 		sprintf_P(dst, __fmt__, ##args);		\
 	})
-#define strfromf(dst, len, fmt, val) sprintf_const(dst, fmt, val)
+#define strfromf_const(dst, len, fmt, val) sprintf_const(dst, fmt, val)
+#define strfromf(dst, len, fmt, val) sprintf(dst, fmt, val)
 
 #define SNEK_BUILTIN_NAMES_DECLARE(n) 	PROGMEM n
 #define SNEK_BUILTIN_NAMES(a)		((uint8_t) pgm_read_byte(&snek_builtin_names[a]))

snek-print.c

@@ -87,7 +87,7 @@ snek_poly_format(snek_buf_t *buf, snek_poly_t a, char format)
 	case 'G':
 		if (atype != snek_float)
 			break;
-		sprintf(tmp, format_string, printf_float(snek_poly_to_float(a)));
+		strfromf(tmp, sizeof(tmp), format_string, snek_poly_to_float(a));
 		buf->put_s(tmp, closure);
 		return;
 	case 'c':
@@ -114,7 +114,7 @@ snek_poly_format(snek_buf_t *buf, snek_poly_t a, char format)
 		buf->put_s("None", closure);
 	else switch (atype) {
 	case snek_float:
-		strfromf(tmp, sizeof(tmp), "%.9g", snek_poly_to_float(a));
+		strfromf_const(tmp, sizeof(tmp), "%.9g", snek_poly_to_float(a));
 		buf->put_s(tmp, closure);
 		break;
 	case snek_string:

snek.h

@@ -574,6 +574,10 @@ snek_panic(const char *message);
 #define sprintf_const sprintf
 #endif
 
+#ifndef strfromf_const
+#define strfromf_const strfromf
+#endif
+
 extern bool snek_abort;
 
 /* snek-frame.c */