Encapsulated lexer and updated calling functions accordingly.

[pspp-builds.git] / src / language / expressions / public.h

diff --git a/src/language/expressions/public.h b/src/language/expressions/public.h
index 9a90cef70e8d72f1b12522d7c8fd3c17c57539e2..dc8aadc932d0986ca4ca916d24f8e1e88124fe74 100644 (file)
--- a/src/language/expressions/public.h
+++ b/src/language/expressions/public.h
@@ -35,12 +35,17 @@ struct expression;
 struct ccase;
 struct pool;
 union value;
-
-struct expression *expr_parse (struct dictionary *, enum expr_type);
-struct expression *expr_parse_pool (struct pool *,
-                                    struct dictionary *, enum expr_type);
+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);
 void expr_free (struct expression *);
 
+struct dataset;
 double expr_evaluate_num (struct expression *, const struct ccase *,
                           int case_idx);
 void expr_evaluate_str (struct expression *, const struct ccase *,