X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fformat.c;h=54c6281716b5025d0c23ebd47a9ed9cf1e203bfb;hb=a1d8ce0ad176357cf250ec065e0bf1a4520a19e3;hp=06042d0e7009d67f9cc1f61d307521b524eb9905;hpb=8acca2de53c1852f38726f70fc6516b34732a79f;p=pspp-builds.git diff --git a/src/data/format.c b/src/data/format.c index 06042d0e..54c62817 100644 --- a/src/data/format.c +++ b/src/data/format.c @@ -1,21 +1,18 @@ -/* PSPP - computes sample statistics. +/* PSPP - a program for statistical analysis. Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. - Written by Ben Pfaff . - 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 @@ -26,6 +23,7 @@ #include #include +#include #include #include #include @@ -60,10 +58,15 @@ fmt_init (void) } } +static struct fmt_number_style *styles[FMT_NUMBER_OF_FORMATS]; + /* Deinitialize the format module. */ void fmt_done (void) { + int t; + for (t = 0 ; t < FMT_NUMBER_OF_FORMATS ; ++t ) + fmt_number_style_destroy (styles[t]); } /* Returns an input format specification with type TYPE, width W, @@ -204,6 +207,16 @@ fmt_for_output_from_input (const struct fmt_spec *input) return output; } +/* 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 as an input format (if FOR_INPUT) or an output format (otherwise) and returns nonzero if so. Otherwise, emits an error message and returns zero. */ @@ -295,15 +308,15 @@ fmt_check_output (const struct fmt_spec *spec) 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 var_type var_type) { - assert (var_type == NUMERIC || var_type == ALPHA); - if ((var_type == ALPHA) != (fmt_is_string (format->type) != 0)) + assert (var_type_is_valid (var_type)); + if ((var_type == VAR_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 == VAR_STRING ? _("String") : _("Numeric"), + var_type == VAR_STRING ? _("numeric") : _("string"), fmt_to_string (format, str)); return false; } @@ -316,7 +329,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, var_type_from_width (width))) return false; if (fmt_var_width (format) != width) { @@ -357,6 +370,36 @@ 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. */ + } +} /* Describes a display format. */ struct fmt_desc @@ -481,7 +524,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 +534,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; @@ -560,19 +603,49 @@ fmt_date_template (enum fmt_type type) case FMT_QYR: return "q Q yy"; case FMT_MOYR: - return "mmm yy"; + return "mmmXyy"; case FMT_WKYR: return "ww WK yy"; case FMT_DATETIME: return "dd-mmm-yyyy HH:MM"; case FMT_TIME: - return "h:MM"; + return "H:MM"; case FMT_DTIME: return "D HH:MM"; default: NOT_REACHED (); } } + +/* Returns a string of the form "$#,###.##" according to FMT, + which must be of type FMT_DOLLAR. The caller must free the + string. */ +char * +fmt_dollar_template (const struct fmt_spec *fmt) +{ + struct string s = DS_EMPTY_INITIALIZER; + int c; + + assert (fmt->type == FMT_DOLLAR); + + ds_put_char (&s, '$'); + for (c = MAX (fmt->w - fmt->d - 1, 0); c > 0; ) + { + ds_put_char (&s, '#'); + if (--c % 4 == 0 && c > 0) + { + ds_put_char (&s, fmt_grouping_char (fmt->type)); + --c; + } + } + if (fmt->d > 0) + { + ds_put_char (&s, fmt_decimal_char (fmt->type)); + ds_put_char_multiple (&s, '#', fmt->d); + } + + return ds_cstr (&s); +} /* Returns true if TYPE is a valid format type, false otherwise. */ @@ -745,7 +818,6 @@ max_digits_for_bytes (int bytes) 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. */ @@ -895,22 +967,6 @@ fmt_set_decimal (char decimal) 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) -{ - return m > 0 && m < n_MEASURES; -} - -/* Returns true if A is a valid alignment, - false otherwise. */ -bool -alignment_is_valid (enum alignment a) -{ - return a < n_ALIGN; -} - /* Returns the struct fmt_desc for the given format TYPE. */ static const struct fmt_desc * get_fmt_desc (enum fmt_type type)