X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fformat.c;h=c90ff95b6f5fc51a486b58cd1f10c6ce2ce07220;hb=43a916e8e177a54a6d6a8565aa92a4239f3383bb;hp=e2b163a5097549625637954087e1688a740f56ca;hpb=5bacd5c053e285ccfba287d2b28079f1d1c49cc9;p=pspp-builds.git diff --git a/src/data/format.c b/src/data/format.c index e2b163a5..c90ff95b 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 @@ -69,7 +66,7 @@ fmt_done (void) { int t; for (t = 0 ; t < FMT_NUMBER_OF_FORMATS ; ++t ) - fmt_number_style_destroy (styles[t]); + fmt_number_style_destroy (styles[t]); } /* Returns an input format specification with type TYPE, width W, @@ -210,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. */ @@ -298,18 +305,18 @@ fmt_check_output (const struct fmt_spec *spec) } /* 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, enum var_type var_type) +fmt_check_type_compat (const struct fmt_spec *format, enum val_type var_type) { - assert (var_type_is_valid (var_type)); - if ((var_type == VAR_STRING) != (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 == VAR_STRING ? _("String") : _("Numeric"), - var_type == VAR_STRING ? _("numeric") : _("string"), + var_type == VAL_STRING ? _("String") : _("Numeric"), + var_type == VAL_STRING ? _("numeric") : _("string"), fmt_to_string (format, str)); return false; } @@ -322,7 +329,7 @@ fmt_check_type_compat (const struct fmt_spec *format, enum var_type var_type) bool fmt_check_width_compat (const struct fmt_spec *format, int width) { - if (!fmt_check_type_compat (format, var_type_from_width (width))) + if (!fmt_check_type_compat (format, val_type_from_width (width))) return false; if (fmt_var_width (format) != width) { @@ -335,14 +342,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); } @@ -367,10 +373,32 @@ fmt_to_string (const struct fmt_spec *f, char buffer[FMT_STRING_LEN_MAX + 1]) /* Returns true if A and B are identical formats, false otherwise. */ bool -fmt_equal (const struct fmt_spec *a, const struct fmt_spec *b) +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 @@ -470,7 +498,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, @@ -495,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; } @@ -505,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; @@ -597,19 +626,21 @@ 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) + if (--c % 4 == 0 && c > 0) { ds_put_char (&s, fmt_grouping_char (fmt->type)); --c; } } - if (fmt->d > 0) + if (fmt->d > 0) { - ds_put_char (&s, '.'); + ds_put_char (&s, fmt_decimal_char (fmt->type)); ds_put_char_multiple (&s, '#', fmt->d); } @@ -837,9 +868,9 @@ fmt_set_style (enum fmt_type type, struct fmt_number_style *style) 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 (style->grouping == '.' || style->grouping == ',' + || style->grouping == 0); + assert (style->grouping != style->decimal); assert (fmt_get_category (type) == FMT_CAT_CUSTOM); assert (styles[type] != NULL);