#include <stddef.h>
-/* Expression parsing flags. */
-enum expr_type
- {
- EXPR_NUMBER = 0xf000, /* Number. */
- EXPR_STRING, /* String. */
- EXPR_BOOLEAN, /* Boolean (number limited to 0, 1, SYSMIS). */
- };
+#include "data/val-type.h"
+struct ccase;
+struct dataset;
struct dictionary;
struct expression;
-struct ccase;
+struct lexer;
struct pool;
union value;
-struct dataset ;
-struct lexer ;
-
-struct expression *expr_parse (struct lexer *lexer, struct dataset *, enum expr_type);
-struct expression *expr_parse_pool (struct lexer *,
- struct pool *,
- struct dataset *,
- enum expr_type);
+
+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 *,
+ const char *new_var_name);
void expr_free (struct expression *);
struct dataset;
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 */