expressions: Major work to improve error messages.

[pspp] / src / data / format.h

diff --git a/src/data/format.h b/src/data/format.h
index 1cb7bc6b7feb027573c82c5468b951942d01b6b0..d6779d4b3f5f6dccab20e952d55006cf835eaf0e 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
@@ -75,8 +76,8 @@ enum ATTRIBUTE ((packed)) fmt_type
 struct fmt_spec
   {
     enum fmt_type type;                /* One of FMT_*. */
-    uint16_t w;                        /* Width. */
     uint8_t d;                 /* Number of decimal places. */
+    uint16_t w;                        /* Width. */
   };
 
 /* Maximum width of any numeric format. */
@@ -96,6 +97,10 @@ 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);
 
+char *fmt_check__ (const struct fmt_spec *, enum fmt_use);
+char *fmt_check_type_compat__ (const struct fmt_spec *, enum val_type);
+char *fmt_check_width_compat__ (const struct fmt_spec *, int var_width);
+
 /* Working with formats. */
 int fmt_var_width (const struct fmt_spec *);
 char *fmt_to_string (const struct fmt_spec *, char s[FMT_STRING_LEN_MAX + 1]);