X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fprivate.h;h=baf69c110eb4089d6fa2b54e7ee8b1abda518844;hb=3816248a008a4af75aac6319d0c9929cb7ff679e;hp=3fa108d5a4bd93007772d47500ab76ce7a9beea5;hpb=b74d09af5e07f954c18e7cdb8aca3af47fa10208;p=pspp diff --git a/src/language/expressions/private.h b/src/language/expressions/private.h index 3fa108d5a4..baf69c110e 100644 --- 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 lexer *lexer, struct dataset *, bool optimize); void expr_debug_print_postfix (const struct expression *); union any_node *expr_optimize (union any_node *, struct expression *);