* UCW Library -- Basic Extended Types
*
* (c) 2014 Martin Mares <mj@ucw.cz>
+ * (c) 2014 Robert Kessl <robert.kessl@economia.cz>
*
* This software may be freely distributed and used according to the terms
* of the GNU Lesser General Public License.
#include <ucw/strtonum.h>
#include <ucw/xtypes.h>
#include <errno.h>
-#include <stdlib.h>
#include <inttypes.h>
+#include <stdlib.h>
#define XTYPE_NUM_FORMAT(_type, _fmt, _typename) static const char *xt_##_typename##_format(void *src, u32 fmt UNUSED, struct mempool *pool) \
{\
static const char *xt_double_format(void *src, u32 fmt, struct mempool *pool)
{
- switch(fmt) {
- case XTYPE_FMT_RAW:
- return mp_printf(pool, "%.2lf", *(double *)src);
- case XTYPE_FMT_PRETTY:
- return mp_printf(pool, "%.2lf", *(double *)src);
-
- case XTYPE_FMT_DEFAULT:
- default:
- return mp_printf(pool, "%.2lf", *(double *)src);
- }
+ double val = *((double *)src);
+
+ if (fmt & XT_DOUBLE_FMT_PREC_FLAG)
+ {
+ uint prec = fmt & ~XT_DOUBLE_FMT_PREC_FLAG;
+ return mp_printf(pool, "%.*lf", prec, val);
+ }
+
+ switch(fmt)
+ {
+ case XTYPE_FMT_RAW:
+ return mp_printf(pool, "%.15lg", val);
+ case XTYPE_FMT_PRETTY:
+ return mp_printf(pool, "%.2lf", val);
+ case XTYPE_FMT_DEFAULT:
+ default:
+ return mp_printf(pool, "%.6lg", val);
+ }
}
static const char *xt_double_parse(const char *str, void *dest, struct mempool *pool UNUSED)
{
char *endptr = NULL;
- size_t sz = strlen(str);
errno = 0;
double result = strtod(str, &endptr);
- if(endptr != str + sz) return "Could not parse double.";
- if(errno == ERANGE) return "Could not parse double: overflow happend during parsing";
+ if (*endptr != 0 || endptr == str ||
+ 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, "Could not parse floating point number precision: %s", tmp_err);
+ *dest = XT_DOUBLE_FMT_PREC(precision);
return NULL;
}
.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) // (struct table *tbl, int col, enum xtype_fmt fmt, bool val)
+static const char *xt_bool_format(void *src, u32 fmt UNUSED, struct mempool *pool UNUSED)
{
- switch(fmt) {
- case XTYPE_FMT_DEFAULT:
+ bool val = *((bool *)src);
+ switch (fmt)
+ {
case XTYPE_FMT_PRETTY:
- return mp_printf(pool, "%s", *((bool *)src) ? "true" : "false");
+ return val ? "true" : "false";
+ case XTYPE_FMT_DEFAULT:
case XTYPE_FMT_RAW:
- return mp_printf(pool, "%s", *((bool *)src) ? "1" : "0");
default:
- die("Unsupported output type.");
- }
+ return val ? "1" : "0";
+ }
}
static const char *xt_bool_parse(const char *str, void *dest, struct mempool *pool UNUSED)
{
- if(str[1] == 0) {
- if(str[0] == '1') {
+ if (!strcmp(str, "0") || !strcmp(str, "false") || !strcmp(str, "no"))
+ {
*((bool *)dest) = false;
return NULL;
}
- if(str[0] == '1') {
+ else if (!strcmp(str, "1") || !strcmp(str, "true") || !strcmp(str, "yes"))
+ {
*((bool *)dest) = true;
return NULL;
}
- }
-
- if(strcasecmp(str, "false") == 0) {
- *((bool *)dest) = false;
- return NULL;
- }
-
- if(strcasecmp(str, "true") == 0) {
- *((bool *)dest) = true;
- return NULL;
- }
- return "Could not parse bool.";
+ return "Could not parse a boolean value.";
}
-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_printf(pool, "%s", *((char **) src));
+ return mp_strdup(pool, *((const char **) src));
}
-static const char *xt_str_parse(const char *str, void *dest, struct mempool *pool UNUSED)
+static const char *xt_str_parse(const char *str, void *dest, struct mempool *pool)
{
- *((const char **) dest) = str;
+ *((const char **) dest) = mp_strdup(pool, str);
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)