X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fformat.c;h=d59ae6fee1d776867bdb2f82e25f242733be6ee8;hb=8b69708cde1b56b7abb5fe989863ad87f586a69c;hp=33a81ff30142366fc5c044ee1deadd86b8e10e1c;hpb=f9d47b5bba8416419cf3bcd3aa23c2d40a05fcac;p=pspp-builds.git diff --git a/src/format.c b/src/format.c index 33a81ff3..d59ae6fe 100644 --- a/src/format.c +++ b/src/format.c @@ -20,7 +20,7 @@ #include #include "format.h" #include -#include +#include "error.h" #include #include "error.h" #include "lexer.h" @@ -36,50 +36,65 @@ struct fmt_desc formats[FMT_NUMBER_OF_FORMATS + 1] = {"", -1, -1, -1, -1, -1, 0000, -1, -1}, }; -const int translate_fmt[40] = - { - -1, FMT_A, FMT_AHEX, FMT_COMMA, FMT_DOLLAR, FMT_F, FMT_IB, - FMT_PIBHEX, FMT_P, FMT_PIB, FMT_PK, FMT_RB, FMT_RBHEX, -1, - -1, FMT_Z, FMT_N, FMT_E, -1, -1, FMT_DATE, FMT_TIME, - FMT_DATETIME, FMT_ADATE, FMT_JDATE, FMT_DTIME, FMT_WKDAY, - FMT_MONTH, FMT_MOYR, FMT_QYR, FMT_WKYR, FMT_PCT, FMT_DOT, - FMT_CCA, FMT_CCB, FMT_CCC, FMT_CCD, FMT_CCE, FMT_EDATE, - FMT_SDATE, - }; - +/* Parses the alphabetic prefix of the current token as a format + specifier name. Returns the corresponding format specifier + type if successful, or -1 on failure. If ALLOW_XT is zero, + then X and T format specifiers are not allowed. If CP is + nonzero, then *CP is set to the first non-alphabetic character + in the current token on success or to a null pointer on + failure. */ int -parse_format_specifier_name (const char **cp, int allow_xt) +parse_format_specifier_name (const char **cp, enum fmt_parse_flags flags) { - struct fmt_desc *f; - char *ep; - int x; + char *sp, *ep; + int idx; - ep = ds_value (&tokstr); + sp = ep = ds_c_str (&tokstr); while (isalpha ((unsigned char) *ep)) ep++; - x = *ep; - *ep = 0; - - for (f = formats; f->name[0]; f++) - if (!strcmp (f->name, ds_value (&tokstr))) - { - int indx = f - formats; - *ep = x; - if (cp) - *cp = ep; + if (sp != ep) + { + /* Find format. */ + for (idx = 0; idx < FMT_NUMBER_OF_FORMATS; idx++) + if (strlen (formats[idx].name) == ep - sp + && !memcmp (formats[idx].name, sp, ep - sp)) + break; - if (!allow_xt && (indx == FMT_T || indx == FMT_X)) - { - msg (SE, _("X and T format specifiers not allowed here.")); - return -1; - } - return indx; - } + /* Check format. */ + if (idx < FMT_NUMBER_OF_FORMATS) + { + if (!(flags & FMTP_ALLOW_XT) && (idx == FMT_T || idx == FMT_X)) + { + if (!(flags & FMTP_SUPPRESS_ERRORS)) + msg (SE, _("X and T format specifiers not allowed here.")); + idx = -1; + } + } + else + { + /* No match. */ + if (!(flags & FMTP_SUPPRESS_ERRORS)) + msg (SE, _("%.*s is not a valid data format."), + (int) (ep - sp), ds_c_str (&tokstr)); + idx = -1; + } + } + else + { + lex_error ("expecting data format"); + idx = -1; + } + + if (cp != NULL) + { + if (idx != -1) + *cp = ep; + else + *cp = NULL; + } - msg (SE, _("%s is not a valid data format."), ds_value (&tokstr)); - *ep = x; - return -1; + return idx; } /* Converts F to its string representation (for instance, "F8.2") and @@ -96,8 +111,11 @@ fmt_to_string (const struct fmt_spec *f) return buf; } +/* Checks whether SPEC is valid as an input format and returns + nonzero if so. Otherwise, emits an error message (if + EMIT_ERROR is nonzero) and returns zero. */ int -check_input_specifier (const struct fmt_spec *spec) +check_input_specifier (const struct fmt_spec *spec, int emit_error) { struct fmt_desc *f; char *str; @@ -108,35 +126,42 @@ check_input_specifier (const struct fmt_spec *spec) return 1; if (f->cat & FCAT_OUTPUT_ONLY) { - msg (SE, _("Format %s may not be used as an input format."), f->name); + if (emit_error) + msg (SE, _("Format %s may not be used as an input format."), f->name); return 0; } if (spec->w < f->Imin_w || spec->w > f->Imax_w) { - msg (SE, _("Input format %s specifies a bad width %d. " - "Format %s requires a width between %d and %d."), - str, spec->w, f->name, f->Imin_w, f->Imax_w); + if (emit_error) + msg (SE, _("Input format %s specifies a bad width %d. " + "Format %s requires a width between %d and %d."), + str, spec->w, f->name, f->Imin_w, f->Imax_w); return 0; } if ((f->cat & FCAT_EVEN_WIDTH) && spec->w % 2) { - msg (SE, _("Input format %s specifies an odd width %d, but " - "format %s requires an even width between %d and " - "%d."), str, spec->w, f->name, f->Imin_w, f->Imax_w); + if (emit_error) + msg (SE, _("Input format %s specifies an odd width %d, but " + "format %s requires an even width between %d and " + "%d."), str, spec->w, f->name, f->Imin_w, f->Imax_w); return 0; } if (f->n_args > 1 && (spec->d < 0 || spec->d > 16)) { - msg (SE, _("Input format %s specifies a bad number of " - "implied decimal places %d. Input format %s allows " - "up to 16 implied decimal places."), str, spec->d, f->name); + if (emit_error) + msg (SE, _("Input format %s specifies a bad number of " + "implied decimal places %d. Input format %s allows " + "up to 16 implied decimal places."), str, spec->d, f->name); return 0; } return 1; } +/* Checks whether SPEC is valid as an output format and returns + nonzero if so. Otherwise, emits an error message (if + EMIT_ERROR is nonzero) and returns zero. */ int -check_output_specifier (const struct fmt_spec *spec) +check_output_specifier (const struct fmt_spec *spec, int emit_error) { struct fmt_desc *f; char *str; @@ -147,9 +172,10 @@ check_output_specifier (const struct fmt_spec *spec) return 1; if (spec->w < f->Omin_w || spec->w > f->Omax_w) { - msg (SE, _("Output format %s specifies a bad width %d. " - "Format %s requires a width between %d and %d."), - str, spec->w, f->name, f->Omin_w, f->Omax_w); + if (emit_error) + msg (SE, _("Output format %s specifies a bad width %d. " + "Format %s requires a width between %d and %d."), + str, spec->w, f->name, f->Omin_w, f->Omax_w); return 0; } if (spec->d > 1 @@ -157,25 +183,28 @@ check_output_specifier (const struct fmt_spec *spec) || spec->type == FMT_DOLLAR) && spec->w < f->Omin_w + 1 + spec->d) { - msg (SE, _("Output format %s requires minimum width %d to allow " - "%d decimal places. Try %s%d.%d instead of %s."), - f->name, f->Omin_w + 1 + spec->d, spec->d, f->name, - f->Omin_w + 1 + spec->d, spec->d, str); + if (emit_error) + msg (SE, _("Output format %s requires minimum width %d to allow " + "%d decimal places. Try %s%d.%d instead of %s."), + f->name, f->Omin_w + 1 + spec->d, spec->d, f->name, + f->Omin_w + 1 + spec->d, spec->d, str); return 0; } if ((f->cat & FCAT_EVEN_WIDTH) && spec->w % 2) { - msg (SE, _("Output format %s specifies an odd width %d, but " - "output format %s requires an even width between %d and " - "%d."), str, spec->w, f->name, f->Omin_w, f->Omax_w); + if (emit_error) + msg (SE, _("Output format %s specifies an odd width %d, but " + "output format %s requires an even width between %d and " + "%d."), str, spec->w, f->name, f->Omin_w, f->Omax_w); return 0; } if (f->n_args > 1 && (spec->d < 0 || spec->d > 16)) { - msg (SE, _("Output format %s specifies a bad number of " - "implied decimal places %d. Output format %s allows " - "a number of implied decimal places between 1 " - "and 16."), str, spec->d, f->name); + if (emit_error) + msg (SE, _("Output format %s specifies a bad number of " + "implied decimal places %d. Output format %s allows " + "a number of implied decimal places between 1 " + "and 16."), str, spec->d, f->name); return 0; } return 1; @@ -196,6 +225,8 @@ check_string_specifier (const struct fmt_spec *f, int min_len) return 1; } +/* Converts input format specifier INPUT into output format + specifier OUTPUT. */ void convert_fmt_ItoO (const struct fmt_spec *input, struct fmt_spec *output) { @@ -288,8 +319,14 @@ convert_fmt_ItoO (const struct fmt_spec *input, struct fmt_spec *output) } } +/* Parses a format specifier from the token stream and returns + nonzero only if successful. Emits an error message on + failure. Allows X and T format specifiers only if ALLOW_XT is + nonzero. The caller should call check_input_specifier() or + check_output_specifier() on the parsed format as + necessary. */ int -parse_format_specifier (struct fmt_spec *input, int allow_xt) +parse_format_specifier (struct fmt_spec *input, enum fmt_parse_flags flags) { struct fmt_spec spec; struct fmt_desc *f; @@ -299,10 +336,11 @@ parse_format_specifier (struct fmt_spec *input, int allow_xt) if (token != T_ID) { - msg (SE, _("Format specifier expected.")); + if (!(flags & FMTP_SUPPRESS_ERRORS)) + msg (SE, _("Format specifier expected.")); return 0; } - type = parse_format_specifier_name (&cp, allow_xt); + type = parse_format_specifier_name (&cp, flags); if (type == -1) return 0; f = &formats[type]; @@ -310,8 +348,9 @@ parse_format_specifier (struct fmt_spec *input, int allow_xt) w = strtol (cp, &cp2, 10); if (cp2 == cp && type != FMT_X) { - msg (SE, _("Data format %s does not specify a width."), - ds_value (&tokstr)); + if (!(flags & FMTP_SUPPRESS_ERRORS)) + msg (SE, _("Data format %s does not specify a width."), + ds_c_str (&tokstr)); return 0; } @@ -327,7 +366,8 @@ parse_format_specifier (struct fmt_spec *input, int allow_xt) if (*cp) { - msg (SE, _("Data format %s is not valid."), ds_value (&tokstr)); + if (!(flags & FMTP_SUPPRESS_ERRORS)) + msg (SE, _("Data format %s is not valid."), ds_c_str (&tokstr)); return 0; } lex_get (); @@ -340,6 +380,9 @@ parse_format_specifier (struct fmt_spec *input, int allow_xt) return 1; } +/* 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. */ int get_format_var_width (const struct fmt_spec *spec) { @@ -350,3 +393,16 @@ get_format_var_width (const struct fmt_spec *spec) else return 0; } + +/* Returns the PSPP format corresponding to the given SPSS + format. */ +int +translate_fmt (int spss) +{ + int type; + + for (type = 0; type < FMT_NUMBER_OF_FORMATS; type++) + if (formats[type].spss == spss) + return type; + return -1; +}