{"", -1, -1, -1, -1, -1, 0000, -1, -1},
};
+/* Common formats. */
+const struct fmt_spec f8_2 = {FMT_F, 8, 2};
+
/* 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,
/* Find format. */
for (idx = 0; idx < FMT_NUMBER_OF_FORMATS; idx++)
if (strlen (formats[idx].name) == ep - sp
- && !mm_case_compare (formats[idx].name, sp, ep - sp))
+ && !buf_compare_case (formats[idx].name, sp, ep - sp))
break;
/* Check format. */
{
if (emit_error)
msg (SE, _("Format %s specifies an odd width %d, but "
- "format %s requires an even width."),
- str, spec->w, f->name, f->Imin_w, f->Imax_w);
+ "an even width is required."),
+ str, spec->w);
return false;
}
if (f->n_args > 1 && (spec->d < 0 || spec->d > 16))
if (f->cat & FCAT_OUTPUT_ONLY)
{
if (emit_error)
- msg (SE, _("Format %s may not be used as an input format."), f->name);
+ msg (SE, _("Format %s may not be used for input."), f->name);
return 0;
}
if (spec->w < f->Imin_w || spec->w > f->Imax_w)
str, spec->w, f->name, f->Imin_w, f->Imax_w);
return 0;
}
+ if ((spec->type == FMT_F || spec->type == FMT_COMMA
+ || spec->type == FMT_DOLLAR)
+ && spec->d > spec->w)
+ {
+ if (emit_error)
+ msg (SE, _("Input format %s is invalid because it specifies more "
+ "decimal places than the field width."), str);
+ return 0;
+ }
return 1;
}
str, spec->w, f->name, f->Omin_w, f->Omax_w);
return 0;
}
- if (spec->d > 1
- && (spec->type == FMT_F || spec->type == FMT_COMMA
+ if ((spec->type == FMT_F || spec->type == FMT_COMMA
|| spec->type == FMT_DOLLAR)
- && spec->w < f->Omin_w + 1 + spec->d)
+ && spec->d >= spec->w)
{
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);
+ msg (SE, _("Output format %s is invalid because it specifies as "
+ "many decimal places as the field width, which "
+ "fails to allow space for a decimal point. "
+ "Try %s%d.%d instead."),
+ str, f->name, spec->d + 1, spec->d);
return 0;
}
return 1;
void
convert_fmt_ItoO (const struct fmt_spec *input, struct fmt_spec *output)
{
+ assert (check_input_specifier (input, 0));
+
output->type = formats[input->type].output;
output->w = input->w;
if (output->w > formats[output->type].Omax_w)
{
case FMT_F:
case FMT_N:
- if (output->d > 1 && output->w < 2 + output->d)
- output->w = 2 + output->d;
+ if (output->d > 0)
+ output->w++;
break;
case FMT_E:
output->w = max (max (input->w, input->d+7), 10);
default:
assert (0);
}
+
+ assert (check_output_specifier (output, 0));
}
/* Parses a format specifier from the token stream and returns
return type;
return -1;
}
+
+/* Returns an input format specification with type TYPE, width W,
+ and D decimals. */
+struct fmt_spec
+make_input_format (int type, int w, int d)
+{
+ struct fmt_spec f;
+ f.type = type;
+ f.w = w;
+ f.d = d;
+ assert (check_input_specifier (&f, 0));
+ return f;
+}
+
+/* Returns an output format specification with type TYPE, width
+ W, and D decimals. */
+struct fmt_spec
+make_output_format (int type, int w, int d)
+{
+ struct fmt_spec f;
+ f.type = type;
+ f.w = w;
+ f.d = d;
+ assert (check_output_specifier (&f, 0));
+ return f;
+}