X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Flexer%2Fvariable-parser.h;h=7abea0a14beade2d73626e24f16e77f300367a72;hb=9ade26c8349b4434008c46cf09bc7473ec743972;hp=f71a778e467841f6213b43c0227fa2c5de874161;hpb=c708736bdd0fea4b79f3ee4a10e00c3abb95d9e3;p=pspp-builds.git diff --git a/src/language/lexer/variable-parser.h b/src/language/lexer/variable-parser.h index f71a778e..7abea0a1 100644 --- a/src/language/lexer/variable-parser.h +++ b/src/language/lexer/variable-parser.h @@ -1,21 +1,18 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. - Written by Ben Pfaff . +/* PSPP - a program for statistical analysis. + Copyright (C) 1997-9, 2000, 2006, 2007, 2010 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 . */ #ifndef VARIABLE_PARSER_H #define VARIABLE_PARSER_H 1 @@ -26,19 +23,18 @@ struct pool; struct dictionary; struct var_set; +struct const_var_set; struct variable; +struct lexer ; struct var_set *var_set_create_from_dict (const struct dictionary *d); struct var_set *var_set_create_from_array (struct variable *const *var, size_t); size_t var_set_get_cnt (const struct var_set *vs); -struct variable *var_set_get_var (const struct var_set *vs, size_t idx); -struct variable *var_set_lookup_var (const struct var_set *vs, - const char *name); -bool var_set_lookup_var_idx (const struct var_set *vs, const char *name, - size_t *idx); + void var_set_destroy (struct var_set *vs); + /* Variable parsers. */ @@ -52,22 +48,82 @@ enum PV_NUMERIC = 0020, /* Vars must be numeric. */ PV_STRING = 0040, /* Vars must be string. */ PV_SAME_TYPE = 00100, /* All vars must be the same type. */ - PV_NO_SCRATCH = 00200 /* Disallow scratch variables. */ + PV_SAME_WIDTH = 00200, /* All vars must be the same type and width. */ + PV_NO_SCRATCH = 00400 /* Disallow scratch variables. */ }; -struct variable *parse_variable (void); -struct variable *parse_dict_variable (const struct dictionary *); -bool parse_variables (const struct dictionary *, struct variable ***, size_t *, +struct variable *parse_variable (struct lexer *, const struct dictionary *); +bool parse_variables (struct lexer *, const struct dictionary *, struct variable ***, size_t *, int opts); -bool parse_variables_pool (struct pool *, const struct dictionary *, +bool parse_variables_pool (struct lexer *, struct pool *, const struct dictionary *, struct variable ***, size_t *, int opts); -bool parse_var_set_vars (const struct var_set *, struct variable ***, size_t *, +bool parse_var_set_vars (struct lexer *, const struct var_set *, struct variable ***, size_t *, int opts); -bool parse_DATA_LIST_vars (char ***names, size_t *cnt, int opts); -bool parse_DATA_LIST_vars_pool (struct pool *, - char ***names, size_t *cnt, int opts); -bool parse_mixed_vars (char ***names, size_t *cnt, int opts); -bool parse_mixed_vars_pool (struct pool *, +bool parse_DATA_LIST_vars (struct lexer *, const struct dictionary *, char ***names, size_t *cnt, int opts); +bool parse_DATA_LIST_vars_pool (struct lexer *, const struct dictionary *, + struct pool *, + char ***names, size_t *cnt, int opts); +bool parse_mixed_vars (struct lexer *, const struct dictionary *dict, + char ***names, size_t *cnt, int opts); +bool parse_mixed_vars_pool (struct lexer *, const struct dictionary *dict, + struct pool *, + char ***names, size_t *cnt, int opts); + + +/* Const wrappers */ + +static inline const struct variable * +parse_variable_const (struct lexer *l, const struct dictionary *d) +{ + return parse_variable (l, d); +} + +static inline bool +parse_variables_const (struct lexer *l, const struct dictionary *d, + const struct variable ***v, size_t *s, + int opts) +{ + return parse_variables (l, d, (struct variable ***) v, s, opts); +} + +static inline bool +parse_variables_const_pool (struct lexer *l, struct pool *p, + const struct dictionary *d, + const struct variable ***v, size_t *s, int opts) +{ + return parse_variables_pool (l, p, d, (struct variable ***) v, s, opts); +} + + + +static inline struct const_var_set * +const_var_set_create_from_dict (const struct dictionary *d) +{ + return (struct const_var_set *) var_set_create_from_dict (d); +} + +static inline struct const_var_set * +const_var_set_create_from_array (const struct variable *const *var, + size_t s) +{ + return (struct const_var_set *) var_set_create_from_array ((struct variable *const *) var, s); +} + + +static inline bool +parse_const_var_set_vars (struct lexer *l, const struct const_var_set *vs, + const struct variable ***v, size_t *s, int opts) +{ + return parse_var_set_vars (l, (const struct var_set *) vs, + (struct variable ***) v, s, opts); +} + +static inline void +const_var_set_destroy (struct const_var_set *vs) +{ + var_set_destroy ( (struct var_set *) vs); +} + #endif /* variable-parser.h */