X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fpublic.h;h=6eb539166b9237278dd7d843f75d26d74aeb1c04;hb=72c9c6a2f92e94779b2e55d0726568090411871c;hp=53781a6797fe7ef88464464104b0600eae434dad;hpb=b37457e4db3d02fbf1e41b24baf3248bf34a02d8;p=pspp

diff --git a/src/language/expressions/public.h b/src/language/expressions/public.h
index 53781a6797..6eb539166b 100644
--- a/src/language/expressions/public.h
+++ b/src/language/expressions/public.h
@@ -1,47 +1,38 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #if !expr_h
 #define expr_h 1
 
 #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;
@@ -51,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 */