switch(fmt) {
case XTYPE_FMT_RAW:
- return mp_printf(pool, "%.10lf", *(double *)src);
+ return mp_printf(pool, "%.15lg", *(double *)src);
case XTYPE_FMT_PRETTY:
return mp_printf(pool, "%.2lf", *(double *)src);
case XTYPE_FMT_DEFAULT:
default:
- return mp_printf(pool, "%.5lf", *(double *)src);
+ return mp_printf(pool, "%.6lg", *(double *)src);
}
}
char *endptr = NULL;
errno = 0;
double result = strtod(str, &endptr);
- if(*endptr != 0 || endptr == str) return "Could not parse double.";
- if(errno == ERANGE) return "Could not parse double: overflow happend during parsing.";
+ if(*endptr != 0 || endptr == str) return "Could not parse floating point number.";
+ if(errno == ERANGE) return "Could not parse floating point number.";
*((double *) dest) = result;
return NULL;
}
+static const char * xt_double_fmt_parse(const char *str, u32 *dest, struct mempool *pool)
+{
+ uint precision = 0;
+ const char *tmp_err = str_to_uint(&precision, str, NULL, 0);
+ if(tmp_err) {
+ return mp_printf(pool, "An error occured while parsing precision: %s.", tmp_err);
+ }
+
+ *dest = XTYPE_FMT_DBL_FIXED_PREC(precision);
+
+ return NULL;
+}
+
const struct xtype xt_double = {
.size = sizeof(double),
.name = "double",
.parse = xt_double_parse,
.format = xt_double_format,
+ .parse_fmt = xt_double_fmt_parse
};
/* bool */
static const char *xt_bool_format(void *src, u32 fmt UNUSED, struct mempool *pool)
{
switch(fmt) {
- case XTYPE_FMT_DEFAULT:
case XTYPE_FMT_PRETTY:
return mp_printf(pool, "%s", *((bool *)src) ? "true" : "false");
+ case XTYPE_FMT_DEFAULT:
case XTYPE_FMT_RAW:
return mp_printf(pool, "%s", *((bool *)src) ? "1" : "0");
default:
if(!str) return "Cannot parse bool: string is NULL.";
if(str[1] == 0) {
- if(str[0] == '1') {
+ if(str[0] == '0') {
*((bool *)dest) = false;
return NULL;
}
return "Could not parse bool.";
}
-const struct xtype xt_bool = {
- .size = sizeof(bool),
- .name = "bool",
- .parse = xt_bool_parse,
- .format = xt_bool_format,
-};
+XTYPE_NUM_STRUCT(bool, bool)
/* str */
static const char *xt_str_format(void *src, u32 fmt UNUSED, struct mempool *pool)
{
- return mp_strdup(pool, (const char *) src);
+ return mp_strdup(pool, *((const char **) src));
}
static const char *xt_str_parse(const char *str, void *dest, struct mempool *pool UNUSED)
return NULL;
}
-const struct xtype xt_str = {
- .size = sizeof(char *),
- .name = "str",
- .parse = xt_str_parse,
- .format = xt_str_format,
-};
+XTYPE_NUM_STRUCT(char *, str)