Eliminated global variable current_dataset.

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

diff --git a/src/language/expressions/private.h b/src/language/expressions/private.h
index 3fa108d5a4bd93007772d47500ab76ce7a9beea5..48ac889758ce56e01fc4ff22d8e23c3b45781799 100644 (file)
--- a/src/language/expressions/private.h
+++ b/src/language/expressions/private.h
@@ -78,7 +78,7 @@ struct operation
     int array_granularity;
   };
 
-extern struct operation operations[];
+extern const struct operation operations[];
 
 /* Tree structured expressions. */ 
 
@@ -156,7 +156,7 @@ union operation_data
 struct expression
   {
     struct pool *expr_pool;     /* Pool for expression static data. */
-    struct dictionary *dict;    /* Dictionary for variables, vectors. */
+    struct dataset *ds ;        /* The dataset */
     atom_type type;             /* Type of expression result. */
 
     union operation_data *ops;  /* Expression data. */
@@ -168,7 +168,7 @@ struct expression
     struct pool *eval_pool;     /* Pool for evaluation temporaries. */
   };
 
-struct expression *expr_parse_any (struct dictionary *, bool optimize);
+struct expression *expr_parse_any (struct dataset *,  bool optimize);
 void expr_debug_print_postfix (const struct expression *);
 
 union any_node *expr_optimize (union any_node *, struct expression *);