#include "libpspp/str.h"
struct fmt_settings;
+struct msg_location;
/* How a format is going to be used. */
enum fmt_use
};
/* Format type. */
-enum fmt_type
+enum ATTRIBUTE ((packed)) fmt_type
{
#define FMT(NAME, METHOD, IMIN, OMIN, IO, CATEGORY) FMT_##NAME,
#include "format.def"
struct fmt_spec
{
enum fmt_type type; /* One of FMT_*. */
- int w; /* Width. */
- int d; /* Number of decimal places. */
+ uint8_t d; /* Number of decimal places. */
+ uint16_t w; /* Width. */
};
/* Maximum width of any numeric format. */
bool fmt_check_type_compat (const struct fmt_spec *, enum val_type);
bool fmt_check_width_compat (const struct fmt_spec *, int var_width);
+char *fmt_check__ (const struct fmt_spec *, enum fmt_use);
+char *fmt_check_type_compat__ (const struct fmt_spec *, enum val_type);
+char *fmt_check_width_compat__ (const struct fmt_spec *, int var_width);
+
/* Working with formats. */
int fmt_var_width (const struct fmt_spec *);
char *fmt_to_string (const struct fmt_spec *, char s[FMT_STRING_LEN_MAX + 1]);
struct fmt_affix neg_suffix; /* Negative suffix. */
char decimal; /* Decimal point: '.' or ','. */
char grouping; /* Grouping character: ',', '.', or 0. */
+ bool include_leading_zero; /* Format as ".5" or "0.5"? */
/* A fmt_affix may require more bytes than its display width; for example,
U+00A5 (¥) is 2 bytes in UTF-8 but occupies only one display column.
const struct fmt_number_style *);
void fmt_number_style_destroy (struct fmt_number_style *);
+char *fmt_number_style_to_string (const struct fmt_number_style *);
+
int fmt_affix_width (const struct fmt_number_style *);
int fmt_neg_affix_width (const struct fmt_number_style *);
\f
{
int epoch; /* 0 for default epoch. */
char decimal; /* '.' or ','. */
+
+ /* Format F, E, COMMA, and DOT with leading zero (e.g. "0.5" instead of
+ ".5")? */
+ bool include_leading_zero;
+
struct fmt_number_style *ccs[FMT_N_CCS]; /* CCA through CCE. */
};
#define FMT_SETTINGS_INIT { .decimal = '.' }
void fmt_settings_init (struct fmt_settings *);
void fmt_settings_uninit (struct fmt_settings *);
-void fmt_settings_copy (struct fmt_settings *, const struct fmt_settings *);
+struct fmt_settings fmt_settings_copy (const struct fmt_settings *);
const struct fmt_number_style *fmt_settings_get_style (
const struct fmt_settings *, enum fmt_type);