More tests for totals and subtotals, with fixes.

[pspp] / src / language / expressions / public.h

diff --git a/src/language/expressions/public.h b/src/language/expressions/public.h
index 105971306511e8eaef9a097f49e168364f008479..6eb539166b9237278dd7d843f75d26d74aeb1c04 100644 (file)
--- a/src/language/expressions/public.h
+++ b/src/language/expressions/public.h
@@ -29,12 +29,9 @@ struct lexer;
 struct pool;
 union value;
 
-struct expression *expr_parse (struct lexer *lexer, struct pool *,
-                               struct dataset *, enum val_type);
-struct expression *expr_parse_bool (struct lexer *lexer, struct pool *,
-                                    struct dataset *);
-struct expression *expr_parse_new_variable (struct lexer *lexer, struct pool *,
-                                            struct dataset *,
+struct expression *expr_parse (struct lexer *, struct dataset *, enum val_type);
+struct expression *expr_parse_bool (struct lexer *, struct dataset *);
+struct expression *expr_parse_new_variable (struct lexer *, struct dataset *,
                                             const char *new_var_name);
 void expr_free (struct expression *);
 
@@ -45,9 +42,9 @@ void expr_evaluate_str (struct expression *, const struct ccase *,
                         int case_idx, char *dst, size_t dst_size);
 
 const struct operation *expr_get_function (size_t idx);
-size_t expr_get_function_cnt (void);
+size_t expr_get_n_functions (void);
 const char *expr_operation_get_name (const struct operation *);
 const char *expr_operation_get_prototype (const struct operation *);
-int expr_operation_get_arg_cnt (const struct operation *);
+int expr_operation_get_n_args (const struct operation *);
 
 #endif /* expr.h */