CORRELATIONS: Improve error messages and coding style.

[pspp] / src / language / stats / ctables.c

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 325eb242de2758b0903bc4a1e8d0478aff732c90..5359c4cabd3d010a8dd2c6ef55eeb44c31108ee7 100644 (file)
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -1293,7 +1293,7 @@ parse_ctables_format_specifier (struct lexer *lexer, struct fmt_spec *format,
 
       char *error = fmt_check_output__ (format);
       if (!error)
-        error = fmt_check_type_compat__ (format, VAL_NUMERIC);
+        error = fmt_check_type_compat__ (format, NULL, VAL_NUMERIC);
       if (error)
         {
           lex_next_error (lexer, -1, -1, "%s", error);
@@ -5710,9 +5710,7 @@ ctables_parse_pcompute (struct lexer *lexer, struct dictionary *dict,
   char *name = ss_xstrdup (lex_tokss (lexer));
 
   lex_get (lexer);
-  if (!lex_force_match (lexer, T_EQUALS)
-      || !lex_force_match_id (lexer, "EXPR")
-      || !lex_force_match (lexer, T_LPAREN))
+  if (!lex_force_match_phrase (lexer, "=EXPR("))
     {
       free (name);
       return false;