Make the expression code a little nicer and fix bugs found

[pspp] / src / format.h

diff --git a/src/format.h b/src/format.h
index 97fe0c99fd8814e15acd8895e09da476196141e0..375b639f762c891184833556a78ef3ca3be12202 100644 (file)
--- a/src/format.h
+++ b/src/format.h
@@ -71,9 +71,6 @@ struct fmt_spec
 /* Descriptions of all the display formats above. */
 extern struct fmt_desc formats[];
 
-/* Translates SPSS formats to PSPP formats. */
-extern const int translate_fmt[40];
-
 union value;
 
 /* Maximum length of formatted value, in character. */
@@ -85,8 +82,10 @@ int check_input_specifier (const struct fmt_spec *spec);
 int check_output_specifier (const struct fmt_spec *spec);
 int check_string_specifier (const struct fmt_spec *spec, int min_len);
 void convert_fmt_ItoO (const struct fmt_spec *input, struct fmt_spec *output);
+int get_format_var_width (const struct fmt_spec *);
 int parse_string_as_format (const char *s, int len, const struct fmt_spec *fp,
                            int fc, union value *v);
+int translate_fmt (int spss);
 void data_out (char *s, const struct fmt_spec *fp, const union value *v);
 char *fmt_to_string (const struct fmt_spec *);
 void num_to_string (double v, char *s, int w, int d);