X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fsort-cases.c;h=1134874da5b5034fc54b932cb153ef5818d4aeeb;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=deb8b5cbc97b00f1ee4cd7da54bbff8701260ffa;hpb=3bbb4370239deb29ebbf813d258aef6249e2a431;p=pspp-builds.git diff --git a/src/language/stats/sort-cases.c b/src/language/stats/sort-cases.c index deb8b5cb..1134874d 100644 --- a/src/language/stats/sort-cases.c +++ b/src/language/stats/sort-cases.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2010, 2011 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 @@ -17,21 +17,21 @@ #include #include -#include #include - -#include "sort-criteria.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include "xalloc.h" +#include "data/procedure.h" +#include "data/settings.h" +#include "data/subcase.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "language/stats/sort-criteria.h" +#include "libpspp/message.h" +#include "math/sort.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -52,9 +52,9 @@ cmd_sort_cases (struct lexer *lexer, struct dataset *ds) if (!parse_sort_criteria (lexer, dataset_dict (ds), &ordering, NULL, NULL)) return CMD_CASCADING_FAILURE; - if (settings_get_testing_mode () && lex_match (lexer, '/')) + if (settings_get_testing_mode () && lex_match (lexer, T_SLASH)) { - if (!lex_force_match_id (lexer, "BUFFERS") || !lex_match (lexer, '=') + if (!lex_force_match_id (lexer, "BUFFERS") || !lex_match (lexer, T_EQUALS) || !lex_force_int (lexer)) goto done;