projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We've had a mix of min, max from libpspp/misc.h and MIN, MAX from
[pspp]
/
src
/
language
/
stats
/
sort-cases.c
diff --git
a/src/language/stats/sort-cases.c
b/src/language/stats/sort-cases.c
index 156c5b42ad92de4f2e1cd920e9b04971c497d235..d73a79c4b38310faa29102d054cecd0714443390 100644
(file)
--- a/
src/language/stats/sort-cases.c
+++ b/
src/language/stats/sort-cases.c
@@
-24,7
+24,7
@@
#include <limits.h>
#include "sort-criteria.h"
#include <limits.h>
#include "sort-criteria.h"
-#include <procedure.h>
+#include <
data/
procedure.h>
#include <data/settings.h>
#include <data/variable.h>
#include <language/command.h>
#include <data/settings.h>
#include <data/variable.h>
#include <language/command.h>
@@
-40,24
+40,24
@@
/* Performs the SORT CASES procedures. */
int
/* Performs the SORT CASES procedures. */
int
-cmd_sort_cases (
void
)
+cmd_sort_cases (
struct lexer *lexer, struct dataset *ds
)
{
struct sort_criteria *criteria;
bool success = false;
{
struct sort_criteria *criteria;
bool success = false;
- lex_match (T_BY);
+ lex_match (
lexer,
T_BY);
- criteria = sort_parse_criteria (
default_dict
, NULL, NULL, NULL, NULL);
+ criteria = sort_parse_criteria (
lexer, dataset_dict (ds)
, NULL, NULL, NULL, NULL);
if (criteria == NULL)
return CMD_CASCADING_FAILURE;
if (criteria == NULL)
return CMD_CASCADING_FAILURE;
- if (get_testing_mode () && lex_match ('/'))
+ if (get_testing_mode () && lex_match (
lexer,
'/'))
{
{
- if (!lex_force_match_id (
"BUFFERS") || !lex_match (
'=')
- || !lex_force_int ())
+ if (!lex_force_match_id (
lexer, "BUFFERS") || !lex_match (lexer,
'=')
+ || !lex_force_int (
lexer
))
goto done;
goto done;
- min_buffers = max_buffers = lex_integer ();
+ min_buffers = max_buffers = lex_integer (
lexer
);
allow_internal_sort = false;
if (max_buffers < 2)
{
allow_internal_sort = false;
if (max_buffers < 2)
{
@@
-65,10
+65,10
@@
cmd_sort_cases (void)
goto done;
}
goto done;
}
- lex_get ();
+ lex_get (
lexer
);
}
}
- success = sort_active_file_in_place (criteria);
+ success = sort_active_file_in_place (
ds,
criteria);
done:
min_buffers = 64;
done:
min_buffers = 64;
@@
-76,6
+76,6
@@
cmd_sort_cases (void)
allow_internal_sort = true;
sort_destroy_criteria (criteria);
allow_internal_sort = true;
sort_destroy_criteria (criteria);
- return success ? lex_end_of_command () : CMD_CASCADING_FAILURE;
+ return success ? lex_end_of_command (
lexer
) : CMD_CASCADING_FAILURE;
}
}