Start work on testing and debugging AGGREGATE.

[pspp-builds.git] / src / sort.h

diff --git a/src/sort.h b/src/sort.h
index 15a5b2db25d71f6f3a7d554e63426021ca52504d..c8f97af0a98500ca291da93d610d709f32ce0338 100644 (file)
--- a/src/sort.h
+++ b/src/sort.h
@@ -20,14 +20,21 @@
 #if !sort_h
 #define sort_h 1
 
-#include "vfm.h"
-
-/* SORT CASES programmatic interface. */
-int sort_cases (int separate);
-void read_sort_output (write_case_func *, write_case_data);
-
-/* Variables to sort. */
-extern struct variable **v_sort;
-extern int nv_sort;
+#include <stddef.h>
+#include "bool.h"
+
+struct casereader;
+struct dictionary;
+struct variable;
+
+struct sort_criteria *sort_parse_criteria (const struct dictionary *,
+                                           struct variable ***, int *,
+                                           bool *saw_direction);
+void sort_destroy_criteria (struct sort_criteria *);
+
+struct casefile *sort_execute (struct casereader *,
+                               const struct sort_criteria *);
+int sort_active_file_in_place (const struct sort_criteria *);
+struct casefile *sort_active_file_to_casefile (const struct sort_criteria *);
 
 #endif /* !sort_h */