-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);