X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fexpressions%2Fpublic.h;h=6eb539166b9237278dd7d843f75d26d74aeb1c04;hb=86e6b87d7ad411378c3204fe87504c7e6749be78;hp=3bddb4b8a1d36477f8551856485b36fefaf725de;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp

diff --git a/src/language/expressions/public.h b/src/language/expressions/public.h
index 3bddb4b8a1..6eb539166b 100644
--- a/src/language/expressions/public.h
+++ b/src/language/expressions/public.h
@@ -19,27 +19,20 @@
 
 #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 *, 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 *);
 
 struct dataset;
@@ -49,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 */