X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fformat.c;h=21162a05ae4f4ab21aff8012def2fdcd83d30123;hb=c81025c3b79323fcec83fa848b682c551158c3f0;hp=06042d0e7009d67f9cc1f61d307521b524eb9905;hpb=8acca2de53c1852f38726f70fc6516b34732a79f;p=pspp diff --git a/src/data/format.c b/src/data/format.c index 06042d0e70..21162a05ae 100644 --- a/src/data/format.c +++ b/src/data/format.c @@ -1,21 +1,18 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. - Written by Ben Pfaff . +/* PSPP - a program for statistical analysis. + Copyright (C) 1997-9, 2000, 2006, 2010, 2011, 2012 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include @@ -23,47 +20,148 @@ #include #include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "minmax.h" -#include "xalloc.h" +#include + +#include "data/identifier.h" +#include "data/settings.h" +#include "data/value.h" +#include "data/variable.h" +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "libpspp/compiler.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" + +#include "gl/c-strcase.h" +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) -static bool is_fmt_type (enum fmt_type); +struct fmt_settings + { + struct fmt_number_style styles[FMT_NUMBER_OF_FORMATS]; + }; + +bool is_fmt_type (enum fmt_type); -static int min_width (enum fmt_type, bool for_input); -static int max_width (enum fmt_type); -static bool valid_width (enum fmt_type, int width, bool for_input); -static int max_decimals (enum fmt_type, int width, bool for_input); +static bool valid_width (enum fmt_type, int width, enum fmt_use); static int max_digits_for_bytes (int bytes); +static void fmt_clamp_width (struct fmt_spec *, enum fmt_use); +static void fmt_clamp_decimals (struct fmt_spec *, enum fmt_use); + +static void fmt_affix_set (struct fmt_affix *, const char *); +static void fmt_affix_free (struct fmt_affix *); -/* Initialize the format module. */ +static void fmt_number_style_init (struct fmt_number_style *); +static void fmt_number_style_clone (struct fmt_number_style *, + const struct fmt_number_style *); +static void fmt_number_style_destroy (struct fmt_number_style *); + +/* Creates and returns a new struct fmt_settings with default format styles. */ +struct fmt_settings * +fmt_settings_create (void) +{ + struct fmt_settings *settings; + int t; + + settings = xzalloc (sizeof *settings); + for (t = 0 ; t < FMT_NUMBER_OF_FORMATS ; ++t ) + fmt_number_style_init (&settings->styles[t]); + fmt_settings_set_decimal (settings, '.'); + + return settings; +} + +/* Destroys SETTINGS. */ void -fmt_init (void) +fmt_settings_destroy (struct fmt_settings *settings) { - static bool inited = false; - if (!inited) + if (settings != NULL) { - inited = true; - fmt_set_decimal ('.'); + int t; + + for (t = 0 ; t < FMT_NUMBER_OF_FORMATS ; ++t ) + fmt_number_style_destroy (&settings->styles[t]); + + free (settings->styles); } } -/* Deinitialize the format module. */ +/* Returns a copy of SETTINGS. */ +struct fmt_settings * +fmt_settings_clone (const struct fmt_settings *old) +{ + struct fmt_settings *new; + int t; + + new = xmalloc (sizeof *new); + for (t = 0 ; t < FMT_NUMBER_OF_FORMATS ; ++t ) + fmt_number_style_clone (&new->styles[t], &old->styles[t]); + + return new; +} + +/* Returns the number formatting style associated with the given + format TYPE. */ +const struct fmt_number_style * +fmt_settings_get_style (const struct fmt_settings *settings, + enum fmt_type type) +{ + assert (is_fmt_type (type)); + return &settings->styles[type]; +} + +/* Sets the number style for TYPE to have the given DECIMAL and GROUPING + characters, negative prefix NEG_PREFIX, prefix PREFIX, suffix SUFFIX, and + negative suffix NEG_SUFFIX. All of the strings are UTF-8 encoded. */ +void +fmt_settings_set_style (struct fmt_settings *settings, enum fmt_type type, + char decimal, char grouping, + const char *neg_prefix, const char *prefix, + const char *suffix, const char *neg_suffix) +{ + struct fmt_number_style *style = &settings->styles[type]; + int total_bytes, total_width; + + assert (grouping == '.' || grouping == ',' || grouping == 0); + assert (decimal == '.' || decimal == ','); + assert (decimal != grouping); + + fmt_number_style_destroy (style); + + fmt_affix_set (&style->neg_prefix, neg_prefix); + fmt_affix_set (&style->prefix, prefix); + fmt_affix_set (&style->suffix, suffix); + fmt_affix_set (&style->neg_suffix, neg_suffix); + style->decimal = decimal; + style->grouping = grouping; + + total_bytes = (strlen (neg_prefix) + strlen (prefix) + + strlen (suffix) + strlen (neg_suffix)); + total_width = (style->neg_prefix.width + style->prefix.width + + style->suffix.width + style->neg_suffix.width); + style->extra_bytes = MAX (0, total_bytes - total_width); +} + +/* Sets the decimal point character for the settings in S to DECIMAL. + + This has no effect on custom currency formats. */ void -fmt_done (void) +fmt_settings_set_decimal (struct fmt_settings *s, char decimal) { + int grouping = decimal == '.' ? ',' : '.'; + assert (decimal == '.' || decimal == ','); + + fmt_settings_set_style (s, FMT_F, decimal, 0, "-", "", "", ""); + fmt_settings_set_style (s, FMT_E, decimal, 0, "-", "", "", ""); + fmt_settings_set_style (s, FMT_COMMA, decimal, grouping, "-", "", "", ""); + fmt_settings_set_style (s, FMT_DOT, grouping, decimal, "-", "", "", ""); + fmt_settings_set_style (s, FMT_DOLLAR, decimal, grouping, "-", "$", "", ""); + fmt_settings_set_style (s, FMT_PCT, decimal, 0, "-", "", "%", ""); } /* Returns an input format specification with type TYPE, width W, @@ -123,7 +221,9 @@ fmt_for_output_from_input (const struct fmt_spec *input) case FMT_DOLLAR: case FMT_PCT: { - const struct fmt_number_style *style = fmt_get_style (input->type); + const struct fmt_number_style *style = + settings_get_style (input->type); + output.w += fmt_affix_width (style); if (style->grouping != 0 && input->w - input->d >= 3) output.w += (input->w - input->d - 1) / 3; @@ -204,20 +304,30 @@ fmt_for_output_from_input (const struct fmt_spec *input) return output; } -/* Checks whether SPEC is valid as an input format (if FOR_INPUT) - or an output format (otherwise) and returns nonzero if so. +/* Returns the default format for the given WIDTH: F8.2 format + for a numeric value, A format for a string value. */ +struct fmt_spec +fmt_default_for_width (int width) +{ + return (width == 0 + ? fmt_for_output (FMT_F, 8, 2) + : fmt_for_output (FMT_A, width, 0)); +} + +/* Checks whether SPEC is valid for USE and returns nonzero if so. Otherwise, emits an error message and returns zero. */ bool -fmt_check (const struct fmt_spec *spec, bool for_input) +fmt_check (const struct fmt_spec *spec, enum fmt_use use) { - const char *io_fmt = for_input ? _("Input format") : _("Output format"); + const char *io_fmt; char str[FMT_STRING_LEN_MAX + 1]; int min_w, max_w, max_d; assert (is_fmt_type (spec->type)); fmt_to_string (spec, str); - if (for_input && !fmt_usable_for_input (spec->type)) + io_fmt = use == FMT_FOR_INPUT ? _("Input format") : _("Output format"); + if (use == FMT_FOR_INPUT && !fmt_usable_for_input (spec->type)) { msg (SE, _("Format %s may not be used for input."), str); return false; @@ -231,8 +341,8 @@ fmt_check (const struct fmt_spec *spec, bool for_input) return false; } - min_w = min_width (spec->type, for_input); - max_w = max_width (spec->type); + min_w = fmt_min_width (spec->type, use); + max_w = fmt_max_width (spec->type, use); if (spec->w < min_w || spec->w > max_w) { msg (SE, _("%s %s specifies width %d, but " @@ -241,7 +351,7 @@ fmt_check (const struct fmt_spec *spec, bool for_input) return false; } - max_d = max_decimals (spec->type, spec->w, for_input); + max_d = fmt_max_decimals (spec->type, spec->w, use); if (!fmt_takes_decimals (spec->type) && spec->d != 0) { msg (SE, ngettext ("%s %s specifies %d decimal place, but " @@ -280,7 +390,7 @@ fmt_check (const struct fmt_spec *spec, bool for_input) bool fmt_check_input (const struct fmt_spec *spec) { - return fmt_check (spec, true); + return fmt_check (spec, FMT_FOR_INPUT); } /* Checks whether SPEC is valid as an output format and returns @@ -288,22 +398,22 @@ fmt_check_input (const struct fmt_spec *spec) bool fmt_check_output (const struct fmt_spec *spec) { - return fmt_check (spec, false); + return fmt_check (spec, FMT_FOR_OUTPUT); } /* Checks that FORMAT is appropriate for a variable of the given - TYPE and returns true if so. Otherwise returns false and + VAR_TYPE and returns true if so. Otherwise returns false and emits an error message. */ bool -fmt_check_type_compat (const struct fmt_spec *format, int var_type) +fmt_check_type_compat (const struct fmt_spec *format, enum val_type var_type) { - assert (var_type == NUMERIC || var_type == ALPHA); - if ((var_type == ALPHA) != (fmt_is_string (format->type) != 0)) + assert (val_type_is_valid (var_type)); + if ((var_type == VAL_STRING) != (fmt_is_string (format->type) != 0)) { char str[FMT_STRING_LEN_MAX + 1]; msg (SE, _("%s variables are not compatible with %s format %s."), - var_type == ALPHA ? _("String") : _("Numeric"), - var_type == ALPHA ? _("numeric") : _("string"), + var_type == VAL_STRING ? _("String") : _("Numeric"), + var_type == VAL_STRING ? _("numeric") : _("string"), fmt_to_string (format, str)); return false; } @@ -316,7 +426,7 @@ fmt_check_type_compat (const struct fmt_spec *format, int var_type) bool fmt_check_width_compat (const struct fmt_spec *format, int width) { - if (!fmt_check_type_compat (format, width != 0 ? ALPHA : NUMERIC)) + if (!fmt_check_type_compat (format, val_type_from_width (width))) return false; if (fmt_var_width (format) != width) { @@ -329,14 +439,13 @@ fmt_check_width_compat (const struct fmt_spec *format, int width) return true; } -/* Returns the width corresponding to the format specifier. The - return value is the value of the `width' member of a `struct - variable' for such an input format. */ +/* Returns the width corresponding to FORMAT. The return value + is the width of the `union value's required by FORMAT. */ int -fmt_var_width (const struct fmt_spec *spec) +fmt_var_width (const struct fmt_spec *format) { - return (spec->type == FMT_AHEX ? spec->w / 2 - : spec->type == FMT_A ? spec->w + return (format->type == FMT_AHEX ? format->w / 2 + : format->type == FMT_A ? format->w : 0); } @@ -357,6 +466,94 @@ fmt_to_string (const struct fmt_spec *f, char buffer[FMT_STRING_LEN_MAX + 1]) "%s%d", fmt_name (f->type), f->w); return buffer; } + +/* Returns true if A and B are identical formats, + false otherwise. */ +bool +fmt_equal (const struct fmt_spec *a, const struct fmt_spec *b) +{ + return a->type == b->type && a->w == b->w && a->d == b->d; +} + +/* Adjusts FMT to be valid for a value of the given WIDTH. */ +void +fmt_resize (struct fmt_spec *fmt, int width) +{ + if ((width > 0) != fmt_is_string (fmt->type)) + { + /* Changed from numeric to string or vice versa. Set to + default format for new width. */ + *fmt = fmt_default_for_width (width); + } + else if (width > 0) + { + /* Changed width of string. Preserve format type, adjust + width. */ + fmt->w = fmt->type == FMT_AHEX ? width * 2 : width; + } + else + { + /* Still numeric. */ + } +} + +/* Adjusts FMT's width and decimal places to be valid for USE. */ +void +fmt_fix (struct fmt_spec *fmt, enum fmt_use use) +{ + /* Clamp width to those allowed by format. */ + fmt_clamp_width (fmt, use); + + /* If FMT has more decimal places than allowed, attempt to increase FMT's + width until that number of decimal places can be achieved. */ + if (fmt->d > fmt_max_decimals (fmt->type, fmt->w, use) + && fmt_takes_decimals (fmt->type)) + { + int max_w = fmt_max_width (fmt->type, use); + for (; fmt->w < max_w; fmt->w++) + if (fmt->d <= fmt_max_decimals (fmt->type, fmt->w, use)) + break; + } + + /* Clamp decimals to those allowed by format and width. */ + fmt_clamp_decimals (fmt, use); +} + +/* Adjusts FMT's width and decimal places to be valid for an + input format. */ +void +fmt_fix_input (struct fmt_spec *fmt) +{ + fmt_fix (fmt, FMT_FOR_INPUT); +} + +/* Adjusts FMT's width and decimal places to be valid for an + output format. */ +void +fmt_fix_output (struct fmt_spec *fmt) +{ + fmt_fix (fmt, FMT_FOR_OUTPUT); +} + +/* Sets FMT's width to WIDTH (or the nearest width allowed by FMT's type) and + reduces its decimal places as necessary (if necessary) for that width. */ +void +fmt_change_width (struct fmt_spec *fmt, int width, enum fmt_use use) +{ + fmt->w = width; + fmt_clamp_width (fmt, use); + fmt_clamp_decimals (fmt, use); +} + +/* Sets FMT's decimal places to DECIMALS (or the nearest number of decimal + places allowed by FMT's type) and increases its width as necessary (if + necessary) for that number of decimal places. */ +void +fmt_change_decimals (struct fmt_spec *fmt, int decimals, enum fmt_use use) +{ + fmt->d = decimals; + fmt_fix (fmt, use); +} /* Describes a display format. */ struct fmt_desc @@ -385,7 +582,7 @@ fmt_from_name (const char *name, enum fmt_type *type) int i; for (i = 0; i < FMT_NUMBER_OF_FORMATS; i++) - if (!strcasecmp (name, get_fmt_desc (i)->name)) + if (!c_strcasecmp (name, get_fmt_desc (i)->name)) { *type = i; return true; @@ -401,6 +598,149 @@ fmt_takes_decimals (enum fmt_type type) return fmt_max_output_decimals (type, fmt_max_output_width (type)) > 0; } +/* Returns the minimum width of the given format TYPE for the given USE. */ +int +fmt_min_width (enum fmt_type type, enum fmt_use use) +{ + return (use == FMT_FOR_INPUT + ? fmt_min_input_width (type) + : fmt_min_output_width (type)); +} + +/* Returns the maximum width of the given format TYPE, + for input if FOR_INPUT is true, + for output otherwise. */ +int +fmt_max_width (enum fmt_type type, enum fmt_use use UNUSED) +{ + /* Maximum width is actually invariant of whether the format is + for input or output, so FOR_INPUT is unused. */ + assert (is_fmt_type (type)); + switch (type) + { + case FMT_P: + case FMT_PK: + case FMT_PIBHEX: + case FMT_RBHEX: + return 16; + + case FMT_IB: + case FMT_PIB: + case FMT_RB: + return 8; + + case FMT_A: + return MAX_STRING; + + case FMT_AHEX: + return 2 * MAX_STRING; + + default: + return 40; + } +} + +/* Returns the maximum number of decimal places allowed for the + given format TYPE with a width of WIDTH places, for the given USE. */ +int +fmt_max_decimals (enum fmt_type type, int width, enum fmt_use use) +{ + int max_d; + + switch (type) + { + case FMT_F: + case FMT_COMMA: + case FMT_DOT: + max_d = use == FMT_FOR_INPUT ? width : width - 1; + break; + + case FMT_DOLLAR: + case FMT_PCT: + max_d = use == FMT_FOR_INPUT ? width : width - 2; + break; + + case FMT_E: + max_d = use == FMT_FOR_INPUT ? width : width - 7; + break; + + case FMT_CCA: + case FMT_CCB: + case FMT_CCC: + case FMT_CCD: + case FMT_CCE: + assert (use == FMT_FOR_OUTPUT); + max_d = width - 1; + break; + + case FMT_N: + case FMT_Z: + max_d = width; + break; + + case FMT_P: + max_d = width * 2 - 1; + break; + + case FMT_PK: + max_d = width * 2; + break; + + case FMT_IB: + case FMT_PIB: + max_d = max_digits_for_bytes (width); + break; + + case FMT_PIBHEX: + max_d = 0; + break; + + case FMT_RB: + case FMT_RBHEX: + max_d = 16; + break; + + case FMT_DATE: + case FMT_ADATE: + case FMT_EDATE: + case FMT_JDATE: + case FMT_SDATE: + case FMT_QYR: + case FMT_MOYR: + case FMT_WKYR: + max_d = 0; + break; + + case FMT_DATETIME: + max_d = width - 21; + break; + + case FMT_TIME: + max_d = width - 9; + break; + + case FMT_DTIME: + max_d = width - 12; + break; + + case FMT_WKDAY: + case FMT_MONTH: + case FMT_A: + case FMT_AHEX: + max_d = 0; + break; + + default: + NOT_REACHED (); + } + + if (max_d < 0) + max_d = 0; + else if (max_d > 16) + max_d = 16; + return max_d; +} + /* Returns the minimum acceptable width for an input field formatted with the given TYPE. */ int @@ -414,7 +754,7 @@ fmt_min_input_width (enum fmt_type type) int fmt_max_input_width (enum fmt_type type) { - return max_width (type); + return fmt_max_width (type, FMT_FOR_INPUT); } /* Returns the maximum number of decimal places allowed in an @@ -423,7 +763,7 @@ int fmt_max_input_decimals (enum fmt_type type, int width) { assert (valid_width (type, width, true)); - return max_decimals (type, width, true); + return fmt_max_decimals (type, width, FMT_FOR_INPUT); } /* Returns the minimum acceptable width for an output field @@ -439,7 +779,7 @@ fmt_min_output_width (enum fmt_type type) int fmt_max_output_width (enum fmt_type type) { - return max_width (type); + return fmt_max_width (type, FMT_FOR_OUTPUT); } /* Returns the maximum number of decimal places allowed in an @@ -448,7 +788,7 @@ int fmt_max_output_decimals (enum fmt_type type, int width) { assert (valid_width (type, width, false)); - return max_decimals (type, width, false); + return fmt_max_decimals (type, width, FMT_FOR_OUTPUT); } /* Returns the width step for a field formatted with the given @@ -456,7 +796,8 @@ fmt_max_output_decimals (enum fmt_type type, int width) int fmt_step_width (enum fmt_type type) { - return fmt_get_category (type) == FMT_CAT_HEXADECIMAL ? 2 : 1; + return (fmt_get_category (type) == FMT_CAT_HEXADECIMAL || type == FMT_AHEX + ? 2 : 1); } /* Returns true if TYPE is used for string fields, @@ -481,7 +822,7 @@ fmt_is_numeric (enum fmt_type type) category. Thus, the return value may be tested for equality or compared bitwise against a mask of FMT_CAT_* values. */ enum fmt_category -fmt_get_category (enum fmt_type type) +fmt_get_category (enum fmt_type type) { return get_fmt_desc (type)->category; } @@ -491,7 +832,7 @@ fmt_get_category (enum fmt_type type) enum fmt_type fmt_input_to_output (enum fmt_type type) { - switch (fmt_get_category (type)) + switch (fmt_get_category (type)) { case FMT_CAT_STRING: return FMT_A; @@ -520,15 +861,16 @@ fmt_to_io (enum fmt_type type) bool fmt_from_io (int io, enum fmt_type *fmt_type) { - enum fmt_type type; - - for (type = 0; type < FMT_NUMBER_OF_FORMATS; type++) - if (get_fmt_desc (type)->io == io) - { - *fmt_type = type; - return true; - } - return false; + switch (io) + { +#define FMT(NAME, METHOD, IMIN, OMIN, IO, CATEGORY) \ + case IO: \ + *fmt_type = FMT_##NAME; \ + return true; +#include "format.def" + default: + return false; + } } /* Returns true if TYPE may be used as an input format, @@ -540,199 +882,149 @@ fmt_usable_for_input (enum fmt_type type) return fmt_get_category (type) != FMT_CAT_CUSTOM; } -/* For time and date formats, returns a template used for input - and output. */ +/* For time and date formats, returns a template used for input and output in a + field of the given WIDTH. + + WIDTH only affects whether a 2-digit year or a 4-digit year is used, that + is, whether the returned string contains "yy" or "yyyy", and whether seconds + are include, that is, whether the returned string contains ":SS". A caller + that doesn't care whether the returned string contains "yy" or "yyyy" or + ":SS" can just specify 0 to omit them. */ const char * -fmt_date_template (enum fmt_type type) +fmt_date_template (enum fmt_type type, int width) { + const char *s1, *s2; + switch (type) { case FMT_DATE: - return "dd-mmm-yy"; + s1 = "dd-mmm-yy"; + s2 = "dd-mmm-yyyy"; + break; + case FMT_ADATE: - return "mm/dd/yy"; + s1 = "mm/dd/yy"; + s2 = "mm/dd/yyyy"; + break; + case FMT_EDATE: - return "dd.mm.yy"; + s1 = "dd.mm.yy"; + s2 = "dd.mm.yyyy"; + break; + case FMT_JDATE: - return "yyddd"; + s1 = "yyddd"; + s2 = "yyyyddd"; + break; + case FMT_SDATE: - return "yy/mm/dd"; + s1 = "yy/mm/dd"; + s2 = "yyyy/mm/dd"; + break; + case FMT_QYR: - return "q Q yy"; - case FMT_MOYR: - return "mmm yy"; - case FMT_WKYR: - return "ww WK yy"; - case FMT_DATETIME: - return "dd-mmm-yyyy HH:MM"; - case FMT_TIME: - return "h:MM"; - case FMT_DTIME: - return "D HH:MM"; - default: - NOT_REACHED (); - } -} - -/* Returns true if TYPE is a valid format type, - false otherwise. */ -static bool -is_fmt_type (enum fmt_type type) -{ - return type < FMT_NUMBER_OF_FORMATS; -} + s1 = "q Q yy"; + s2 = "q Q yyyy"; + break; -/* Returns the minimum width of the given format TYPE, - for input if FOR_INPUT is true, - for output otherwise. */ -static int -min_width (enum fmt_type type, bool for_input) -{ - return for_input ? fmt_min_input_width (type) : fmt_min_output_width (type); -} + case FMT_MOYR: + s1 = "mmm yy"; + s2 = "mmm yyyy"; + break; -/* Returns the maximum width of the given format TYPE, - which is invariant between input and output. */ -static int -max_width (enum fmt_type type) -{ - assert (is_fmt_type (type)); - switch (type) - { - case FMT_P: - case FMT_PK: - case FMT_PIBHEX: - case FMT_RBHEX: - return 16; + case FMT_WKYR: + s1 = "ww WK yy"; + s2 = "ww WK yyyy"; + break; - case FMT_IB: - case FMT_PIB: - case FMT_RB: - return 8; + case FMT_DATETIME: + s1 = "dd-mmm-yyyy HH:MM"; + s2 = "dd-mmm-yyyy HH:MM:SS"; + break; - case FMT_A: - return MAX_STRING; + case FMT_TIME: + s1 = "H:MM"; + s2 = "H:MM:SS"; + break; - case FMT_AHEX: - return 2 * MAX_STRING; + case FMT_DTIME: + s1 = "D HH:MM"; + s2 = "D HH:MM:SS"; + break; default: - return 40; + NOT_REACHED (); } -} -/* Returns true if WIDTH is a valid width for the given format - TYPE, - for input if FOR_INPUT is true, - for output otherwise. */ -static bool -valid_width (enum fmt_type type, int width, bool for_input) -{ - return (width >= min_width (type, for_input) - && width <= max_width (type)); + return width >= strlen (s2) ? s2 : s1; } -/* Returns the maximum number of decimal places allowed for the - given format TYPE with a width of WIDTH places, - for input if FOR_INPUT is true, - for output otherwise. */ -static int -max_decimals (enum fmt_type type, int width, bool for_input) +/* Returns a string representing the format TYPE for use in a GUI dialog. */ +const char * +fmt_gui_name (enum fmt_type type) { - int max_d; - switch (type) { case FMT_F: + return _("Numeric"); + case FMT_COMMA: - case FMT_DOT: - max_d = for_input ? width : width - 1; - break; + return _("Comma"); - case FMT_DOLLAR: - case FMT_PCT: - max_d = for_input ? width : width - 2; - break; + case FMT_DOT: + return _("Dot"); case FMT_E: - max_d = for_input ? width : width - 7; - break; - - case FMT_CCA: - case FMT_CCB: - case FMT_CCC: - case FMT_CCD: - case FMT_CCE: - assert (!for_input); - max_d = width - 1; - break; - - case FMT_N: - case FMT_Z: - max_d = width; - break; - - case FMT_P: - max_d = width * 2 - 1; - break; - - case FMT_PK: - max_d = width * 2; - break; - - case FMT_IB: - case FMT_PIB: - max_d = max_digits_for_bytes (width); - break; - - case FMT_PIBHEX: - max_d = 0; - break; - - case FMT_RB: - case FMT_RBHEX: - max_d = 16; - break; + return _("Scientific"); case FMT_DATE: - case FMT_ADATE: case FMT_EDATE: - case FMT_JDATE: case FMT_SDATE: + case FMT_ADATE: + case FMT_JDATE: case FMT_QYR: case FMT_MOYR: case FMT_WKYR: - max_d = 0; - break; - case FMT_DATETIME: - max_d = width - 21; - break; - case FMT_TIME: - max_d = width - 9; - break; - case FMT_DTIME: - max_d = width - 12; - break; - case FMT_WKDAY: case FMT_MONTH: + return _("Date"); + + case FMT_DOLLAR: + return _("Dollar"); + + case FMT_CCA: + case FMT_CCB: + case FMT_CCC: + case FMT_CCD: + case FMT_CCE: + return _("Custom"); + case FMT_A: - case FMT_AHEX: - max_d = 0; - break; + return _("String"); default: - NOT_REACHED (); + return fmt_name (type); } +} + +/* Returns true if TYPE is a valid format type, + false otherwise. */ +bool +is_fmt_type (enum fmt_type type) +{ + return type < FMT_NUMBER_OF_FORMATS; +} - if (max_d < 0) - max_d = 0; - else if (max_d > 16) - max_d = 16; - return max_d; +/* Returns true if WIDTH is a valid width for the given format + TYPE, for the given USE. */ +static bool +valid_width (enum fmt_type type, int width, enum fmt_use use) +{ + return (width >= fmt_min_width (type, use) + && width <= fmt_max_width (type, use)); } /* Returns the maximum number of decimal digits in an unsigned @@ -744,173 +1036,108 @@ max_digits_for_bytes (int bytes) assert (bytes > 0 && bytes <= sizeof map / sizeof *map); return map[bytes - 1]; } - -static struct fmt_number_style *styles[FMT_NUMBER_OF_FORMATS]; - -/* Creates and returns a new struct fmt_number_style, - initializing all affixes to empty strings. */ -struct fmt_number_style * -fmt_number_style_create (void) -{ - struct fmt_number_style *style = xmalloc (sizeof *style); - style->neg_prefix = ss_empty (); - style->prefix = ss_empty (); - style->suffix = ss_empty (); - style->neg_suffix = ss_empty (); - style->decimal = '.'; - style->grouping = 0; - return style; -} -/* Destroys a struct fmt_number_style. */ -void -fmt_number_style_destroy (struct fmt_number_style *style) -{ - if (style != NULL) - { - ss_dealloc (&style->neg_prefix); - ss_dealloc (&style->prefix); - ss_dealloc (&style->suffix); - ss_dealloc (&style->neg_suffix); - free (style); - } -} - -/* Returns the number formatting style associated with the given - format TYPE. */ -const struct fmt_number_style * -fmt_get_style (enum fmt_type type) +/* Clamp FMT's width to the range and values allowed by FMT's type. */ +static void +fmt_clamp_width (struct fmt_spec *fmt, enum fmt_use use) { - assert (is_fmt_type (type)); - assert (styles[type] != NULL); - return styles[type]; + unsigned int step; + int min_w, max_w; + + min_w = fmt_min_width (fmt->type, use); + max_w = fmt_max_width (fmt->type, use); + if (fmt->w < min_w) + fmt->w = min_w; + else if (fmt->w > max_w) + fmt->w = max_w; + + /* Round width to step. */ + step = fmt_step_width (fmt->type); + fmt->w = ROUND_DOWN (fmt->w, step); } -/* Sets STYLE as the number formatting style associated with the - given format TYPE, transferring ownership of STYLE. */ -void -fmt_set_style (enum fmt_type type, struct fmt_number_style *style) +/* Clamp FMT's decimal places to the range allowed by FMT's type and width. */ +static void +fmt_clamp_decimals (struct fmt_spec *fmt, enum fmt_use use) { - assert (ss_length (style->neg_prefix) <= FMT_STYLE_AFFIX_MAX); - assert (ss_length (style->prefix) <= FMT_STYLE_AFFIX_MAX); - assert (ss_length (style->suffix) <= FMT_STYLE_AFFIX_MAX); - assert (ss_length (style->neg_suffix) <= FMT_STYLE_AFFIX_MAX); - assert (style->decimal == '.' || style->decimal == ','); - assert (style->grouping != style->decimal - && (style->grouping == '.' || style->grouping == ',' - || style->grouping == 0)); - - assert (fmt_get_category (type) == FMT_CAT_CUSTOM); - assert (styles[type] != NULL); - - fmt_number_style_destroy (styles[type]); - styles[type] = style; -} + int max_d; -/* Returns the total width of the standard prefix and suffix for - STYLE. */ -int -fmt_affix_width (const struct fmt_number_style *style) -{ - return ss_length (style->prefix) + ss_length (style->suffix); + max_d = fmt_max_decimals (fmt->type, fmt->w, use); + if (fmt->d < 0) + fmt->d = 0; + else if (fmt->d > max_d) + fmt->d = max_d; } - -/* Returns the total width of the negative prefix and suffix for - STYLE. */ -int -fmt_neg_affix_width (const struct fmt_number_style *style) + +/* Sets AFFIX's string value to S, a UTF-8 encoded string. */ +static void +fmt_affix_set (struct fmt_affix *affix, const char *s) { - return ss_length (style->neg_prefix) + ss_length (style->neg_suffix); + affix->s = s[0] == '\0' ? CONST_CAST (char *, "") : xstrdup (s); + affix->width = u8_strwidth (CHAR_CAST (const uint8_t *, s), "UTF-8"); } -/* Returns the decimal point character for the given format - TYPE. */ -int -fmt_decimal_char (enum fmt_type type) +/* Frees data in AFFIX. */ +static void +fmt_affix_free (struct fmt_affix *affix) { - return fmt_get_style (type)->decimal; + if (affix->s[0]) + free (affix->s); } -/* Returns the grouping character for the given format TYPE, or 0 - if the format type does not group digits. */ -int -fmt_grouping_char (enum fmt_type type) +static void +fmt_number_style_init (struct fmt_number_style *style) { - return fmt_get_style (type)->grouping; + fmt_affix_set (&style->neg_prefix, ""); + fmt_affix_set (&style->prefix, ""); + fmt_affix_set (&style->suffix, ""); + fmt_affix_set (&style->neg_suffix, ""); + style->decimal = '.'; + style->grouping = 0; } -/* Sets the number style for TYPE to have the given standard - PREFIX and SUFFIX, "-" as prefix suffix, an empty negative - suffix, DECIMAL as the decimal point character, and GROUPING - as the grouping character. */ static void -set_style (enum fmt_type type, - const char *prefix, const char *suffix, - char decimal, char grouping) +fmt_number_style_clone (struct fmt_number_style *new, + const struct fmt_number_style *old) { - struct fmt_number_style *style; - - assert (is_fmt_type (type)); - - fmt_number_style_destroy (styles[type]); - - style = styles[type] = fmt_number_style_create (); - ss_alloc_substring (&style->neg_prefix, ss_cstr ("-")); - ss_alloc_substring (&style->prefix, ss_cstr (prefix)); - ss_alloc_substring (&style->suffix, ss_cstr (suffix)); - style->decimal = decimal; - style->grouping = grouping; + fmt_affix_set (&new->neg_prefix, old->neg_prefix.s); + fmt_affix_set (&new->prefix, old->prefix.s); + fmt_affix_set (&new->suffix, old->suffix.s); + fmt_affix_set (&new->neg_suffix, old->neg_suffix.s); + new->decimal = old->decimal; + new->grouping = old->grouping; + new->extra_bytes = old->extra_bytes; } -/* Sets the number style for TYPE as with set_style, but only if - TYPE has not already been initialized. */ +/* Destroys a struct fmt_number_style. */ static void -init_style (enum fmt_type type, - const char *prefix, const char *suffix, - char decimal, char grouping) +fmt_number_style_destroy (struct fmt_number_style *style) { - assert (is_fmt_type (type)); - if (styles[type] == NULL) - set_style (type, prefix, suffix, decimal, grouping); + if (style != NULL) + { + fmt_affix_free (&style->neg_prefix); + fmt_affix_free (&style->prefix); + fmt_affix_free (&style->suffix); + fmt_affix_free (&style->neg_suffix); + } } -/* Sets the decimal point character to DECIMAL. */ -void -fmt_set_decimal (char decimal) -{ - int grouping = decimal == '.' ? ',' : '.'; - assert (decimal == '.' || decimal == ','); - - set_style (FMT_F, "", "", decimal, 0); - set_style (FMT_E, "", "", decimal, 0); - set_style (FMT_COMMA, "", "", decimal, grouping); - set_style (FMT_DOT, "", "", grouping, decimal); - set_style (FMT_DOLLAR, "$", "", decimal, grouping); - set_style (FMT_PCT, "", "%", decimal, 0); - - init_style (FMT_CCA, "", "", decimal, grouping); - init_style (FMT_CCB, "", "", decimal, grouping); - init_style (FMT_CCC, "", "", decimal, grouping); - init_style (FMT_CCD, "", "", decimal, grouping); - init_style (FMT_CCE, "", "", decimal, grouping); -} - -/* Returns true if M is a valid variable measurement level, - false otherwise. */ -bool -measure_is_valid (enum measure m) +/* Returns the total width of the standard prefix and suffix for STYLE, in + display columns (e.g. as returned by u8_strwidth()). */ +int +fmt_affix_width (const struct fmt_number_style *style) { - return m > 0 && m < n_MEASURES; + return style->prefix.width + style->suffix.width; } -/* Returns true if A is a valid alignment, - false otherwise. */ -bool -alignment_is_valid (enum alignment a) +/* Returns the total width of the negative prefix and suffix for STYLE, in + display columns (e.g. as returned by u8_strwidth()). */ +int +fmt_neg_affix_width (const struct fmt_number_style *style) { - return a < n_ALIGN; + return style->neg_prefix.width + style->neg_suffix.width; } - + /* Returns the struct fmt_desc for the given format TYPE. */ static const struct fmt_desc * get_fmt_desc (enum fmt_type type) @@ -925,3 +1152,5 @@ get_fmt_desc (enum fmt_type type) assert (is_fmt_type (type)); return &formats[type]; } + +const struct fmt_spec F_8_0 = {FMT_F, 8, 0};