X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fformat.h;h=16ffc4b5213d4ede6a476b26f6daebc5e3fa4743;hb=8d6ff8a6bd25b184474a117c8332275b5add2d2b;hp=36726542de9e40f5a65dbd131afb2187f527d0a8;hpb=377d05c1eb7b390e2cdb049469fe6b0cfcf52615;p=pspp diff --git a/src/data/format.h b/src/data/format.h index 36726542de..16ffc4b521 100644 --- a/src/data/format.h +++ b/src/data/format.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc. + 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 @@ -20,8 +20,15 @@ /* Display format types. */ #include -#include -#include +#include "data/val-type.h" +#include "libpspp/str.h" + +/* How a format is going to be used. */ +enum fmt_use + { + FMT_FOR_INPUT, /* For parsing data input, e.g. data_in(). */ + FMT_FOR_OUTPUT /* For formatting data output, e.g. data_out(). */ + }; /* Format type categories. @@ -66,7 +73,7 @@ struct fmt_spec { enum fmt_type type; /* One of FMT_*. */ int w; /* Width. */ - int d; /* Number of implied decimal places. */ + int d; /* Number of decimal places. */ }; /* Maximum width of any numeric format. */ @@ -79,7 +86,7 @@ struct fmt_spec fmt_for_output_from_input (const struct fmt_spec *); struct fmt_spec fmt_default_for_width (int width); /* Verifying formats. */ -bool fmt_check (const struct fmt_spec *, bool for_input); +bool fmt_check (const struct fmt_spec *, enum fmt_use); bool fmt_check_input (const struct fmt_spec *); bool fmt_check_output (const struct fmt_spec *); bool fmt_check_type_compat (const struct fmt_spec *, enum val_type); @@ -89,12 +96,15 @@ bool fmt_check_width_compat (const struct fmt_spec *, int var_width); int fmt_var_width (const struct fmt_spec *); char *fmt_to_string (const struct fmt_spec *, char s[FMT_STRING_LEN_MAX + 1]); bool fmt_equal (const struct fmt_spec *, const struct fmt_spec *); -void fmt_resize (struct fmt_spec *, int new_width); +bool fmt_resize (struct fmt_spec *, int new_width); -void fmt_fix (struct fmt_spec *, bool for_input); +void fmt_fix (struct fmt_spec *, enum fmt_use); void fmt_fix_input (struct fmt_spec *); void fmt_fix_output (struct fmt_spec *); +void fmt_change_width (struct fmt_spec *, int width, enum fmt_use); +void fmt_change_decimals (struct fmt_spec *, int decimals, enum fmt_use); + /* Format types. */ bool is_fmt_type (enum fmt_type); @@ -103,9 +113,9 @@ bool fmt_from_name (const char *name, enum fmt_type *); bool fmt_takes_decimals (enum fmt_type) PURE_FUNCTION; -int fmt_min_width (enum fmt_type, bool for_input) PURE_FUNCTION; -int fmt_max_width (enum fmt_type, bool for_input) PURE_FUNCTION; -int fmt_max_decimals (enum fmt_type, int width, bool for_input) PURE_FUNCTION; +int fmt_min_width (enum fmt_type, enum fmt_use) PURE_FUNCTION; +int fmt_max_width (enum fmt_type, enum fmt_use) PURE_FUNCTION; +int fmt_max_decimals (enum fmt_type, int width, enum fmt_use) PURE_FUNCTION; int fmt_min_input_width (enum fmt_type) PURE_FUNCTION; int fmt_max_input_width (enum fmt_type) PURE_FUNCTION; int fmt_max_input_decimals (enum fmt_type, int width) PURE_FUNCTION; @@ -124,7 +134,8 @@ bool fmt_usable_for_input (enum fmt_type) PURE_FUNCTION; int fmt_to_io (enum fmt_type) PURE_FUNCTION; bool fmt_from_io (int io, enum fmt_type *); -const char *fmt_date_template (enum fmt_type) PURE_FUNCTION; +const char *fmt_date_template (enum fmt_type, int width) PURE_FUNCTION; +const char *fmt_gui_name (enum fmt_type); /* Format settings. @@ -139,29 +150,40 @@ void fmt_settings_set_decimal (struct fmt_settings *, char); const struct fmt_number_style *fmt_settings_get_style ( const struct fmt_settings *, enum fmt_type); void fmt_settings_set_style (struct fmt_settings *, enum fmt_type, - const struct fmt_number_style *); + char decimal, char grouping, + const char *neg_prefix, const char *prefix, + const char *suffix, const char *neg_suffix); +/* A prefix or suffix for a numeric output format. */ +struct fmt_affix + { + char *s; /* String contents of affix, in UTF-8. */ + int width; /* Display width in columns (see wcwidth()). */ + }; + /* A numeric output style. */ struct fmt_number_style { - struct substring neg_prefix; /* Negative prefix. */ - struct substring prefix; /* Prefix. */ - struct substring suffix; /* Suffix. */ - struct substring neg_suffix; /* Negative suffix. */ - char decimal; /* Decimal point: '.' or ','. */ - char grouping; /* Grouping character: ',', '.', or 0. */ + struct fmt_affix neg_prefix; /* Negative prefix. */ + struct fmt_affix prefix; /* Prefix. */ + struct fmt_affix suffix; /* Suffix. */ + struct fmt_affix neg_suffix; /* Negative suffix. */ + char decimal; /* Decimal point: '.' or ','. */ + char grouping; /* Grouping character: ',', '.', or 0. */ + + /* A fmt_affix may require more bytes than its display width; for example, + U+00A5 (Â¥) is 3 bytes in UTF-8 but occupies only one display column. + This member is the sum of the number of bytes required by all of the + fmt_affix members in this struct, minus their display widths. Thus, it + can be used to size memory allocations: for example, the formatted + result of CCA20.5 requires no more than (20 + extra_bytes) bytes in + UTF-8. */ + int extra_bytes; }; -/* Maximum length of prefix or suffix string in - struct fmt_number_style. */ -#define FMT_STYLE_AFFIX_MAX 16 - int fmt_affix_width (const struct fmt_number_style *); int fmt_neg_affix_width (const struct fmt_number_style *); -void fmt_check_style (const struct fmt_number_style *style); - - extern const struct fmt_spec F_8_0 ; #endif /* data/format.h */