X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fsort-criteria.c;h=9ae299ee6c9e67da5513784eb266c56405e0da20;hb=b5c82cc9aabe7e641011130240ae1b2e84348e23;hp=fd90af22ff85958b2a00ef0523606d70846fe48b;hpb=a19b858e0ac3c69e4a28c0ca6d8674427268a863;p=pspp-builds.git diff --git a/src/language/stats/sort-criteria.c b/src/language/stats/sort-criteria.c index fd90af22..9ae299ee 100644 --- a/src/language/stats/sort-criteria.c +++ b/src/language/stats/sort-criteria.c @@ -1,103 +1,80 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . +/* PSPP - a program for statistical analysis. + Copyright (C) 1997-9, 2000, 2006 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 . */ #include -#include -#include + +#include + #include -#include -#include -#include -#include -#include -#include + +#include +#include #include -#include "sort-criteria.h" -#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) -static bool is_terminator(int tok, const int *terminators); - - -/* Parses a list of sort keys and returns a struct sort_criteria - based on it. Returns a null pointer on error. +/* Parses a list of sort fields and appends them to ORDERING, + which the caller must already have initialized. + Returns true if successful, false on error. If SAW_DIRECTION is nonnull, sets *SAW_DIRECTION to true if at least one parenthesized sort direction was specified, false - otherwise. - If TERMINATORS is non-null, then it must be a pointer to a - null terminated list of tokens, in addition to the defaults, - which are to be considered terminators of the clause being parsed. - The default terminators are '/' and '.' - -*/ -struct sort_criteria * -sort_parse_criteria (const struct dictionary *dict, - struct variable ***vars, size_t *var_cnt, - bool *saw_direction, - const int *terminators - ) + otherwise. */ +bool +parse_sort_criteria (struct lexer *lexer, const struct dictionary *dict, + struct subcase *ordering, + const struct variable ***vars, bool *saw_direction) { - struct sort_criteria *criteria; - struct variable **local_vars = NULL; - size_t local_var_cnt; + const struct variable **local_vars = NULL; + size_t var_cnt = 0; - assert ((vars == NULL) == (var_cnt == NULL)); if (vars == NULL) - { - vars = &local_vars; - var_cnt = &local_var_cnt; - } - - criteria = xmalloc (sizeof *criteria); - criteria->crits = NULL; - criteria->crit_cnt = 0; - + vars = &local_vars; *vars = NULL; - *var_cnt = 0; + if (saw_direction != NULL) *saw_direction = false; do { - size_t prev_var_cnt = *var_cnt; - enum sort_direction direction; + size_t prev_var_cnt = var_cnt; + enum subcase_direction direction; + size_t i; /* Variables. */ - if (!parse_variables (dict, vars, var_cnt, - PV_NO_DUPLICATE | PV_APPEND | PV_NO_SCRATCH)) + if (!parse_variables_const (lexer, dict, vars, &var_cnt, + PV_APPEND | PV_NO_SCRATCH)) goto error; /* Sort direction. */ - if (lex_match ('(')) + if (lex_match (lexer, '(')) { - if (lex_match_id ("D") || lex_match_id ("DOWN")) - direction = SRT_DESCEND; - else if (lex_match_id ("A") || lex_match_id ("UP")) - direction = SRT_ASCEND; + if (lex_match_id (lexer, "D") || lex_match_id (lexer, "DOWN")) + direction = SC_DESCEND; + else if (lex_match_id (lexer, "A") || lex_match_id (lexer, "UP")) + direction = SC_ASCEND; else { msg (SE, _("`A' or `D' expected inside parentheses.")); goto error; } - if (!lex_match (')')) + if (!lex_match (lexer, ')')) { msg (SE, _("`)' expected.")); goto error; @@ -106,59 +83,25 @@ sort_parse_criteria (const struct dictionary *dict, *saw_direction = true; } else - direction = SRT_ASCEND; + direction = SC_ASCEND; - criteria->crits = xnrealloc (criteria->crits, - *var_cnt, sizeof *criteria->crits); - criteria->crit_cnt = *var_cnt; - for (; prev_var_cnt < criteria->crit_cnt; prev_var_cnt++) + for (i = prev_var_cnt; i < var_cnt; i++) { - struct sort_criterion *c = &criteria->crits[prev_var_cnt]; - c->fv = (*vars)[prev_var_cnt]->fv; - c->width = (*vars)[prev_var_cnt]->width; - c->dir = direction; + const struct variable *var = (*vars)[i]; + if (!subcase_add_var (ordering, var, direction)) + msg (SW, _("Variable %s specified twice in sort criteria."), + var_get_name (var)); } } - while (token != '.' && token != '/' && !is_terminator(token, terminators)); + while (lex_token (lexer) == T_ID + && dict_lookup_var (dict, lex_tokid (lexer)) != NULL); free (local_vars); - return criteria; + return true; - error: +error: free (local_vars); - sort_destroy_criteria (criteria); - return NULL; -} - -/* Return TRUE if TOK is a member of the list of TERMINATORS. - FALSE otherwise */ -static bool -is_terminator(int tok, const int *terminators) -{ - if (terminators == NULL ) - return false; - - while ( *terminators) - { - if (tok == *terminators++) - return true; - } - + if (vars) + *vars = NULL; return false; } - - - -/* Destroys a SORT CASES program. */ -void -sort_destroy_criteria (struct sort_criteria *criteria) -{ - if (criteria != NULL) - { - free (criteria->crits); - free (criteria); - } -} - - -