Improve error messages for format specifiers.

[pspp] / src / data / format.h

diff --git a/src/data/format.h b/src/data/format.h
index 4cde16b17a0b1352356f6b522c602bc18150b70e..5b56e12201dc3ff2a07fb8481fe9b312da56dff9 100644 (file)
--- a/src/data/format.h
+++ b/src/data/format.h
@@ -25,6 +25,7 @@
 #include "libpspp/str.h"
 
 struct fmt_settings;
+struct msg_location;
 
 /* How a format is going to be used. */
 enum fmt_use
@@ -94,7 +95,15 @@ 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);
-bool fmt_check_width_compat (const struct fmt_spec *, int var_width);
+bool fmt_check_width_compat (const struct fmt_spec *, const char *varname,
+                             int var_width);
+
+char *fmt_check__ (const struct fmt_spec *, enum fmt_use);
+char *fmt_check_input__ (const struct fmt_spec *);
+char *fmt_check_output__ (const struct fmt_spec *);
+char *fmt_check_type_compat__ (const struct fmt_spec *, enum val_type);
+char *fmt_check_width_compat__ (const struct fmt_spec *, const char *varname,
+                                int var_width);
 
 /* Working with formats. */
 int fmt_var_width (const struct fmt_spec *);
@@ -159,6 +168,7 @@ struct fmt_number_style
     struct fmt_affix neg_suffix; /* Negative suffix. */
     char decimal;                /* Decimal point: '.' or ','. */
     char grouping;               /* Grouping character: ',', '.', or 0. */
+    bool include_leading_zero;   /* Format as ".5" or "0.5"? */
 
     /* A fmt_affix may require more bytes than its display width; for example,
        U+00A5 (¥) is 2 bytes in UTF-8 but occupies only one display column.
@@ -187,6 +197,11 @@ struct fmt_settings
   {
     int epoch;                               /* 0 for default epoch. */
     char decimal;                            /* '.' or ','. */
+
+    /* Format F, E, COMMA, and DOT with leading zero (e.g. "0.5" instead of
+       ".5")? */
+    bool include_leading_zero;
+
     struct fmt_number_style *ccs[FMT_N_CCS]; /* CCA through CCE. */
   };
 #define FMT_SETTINGS_INIT { .decimal = '.' }