Actually implement the new procedure code and adapt all of its clients

[pspp-builds.git] / src / language / stats / npar.h

diff --git a/src/language/stats/npar.h b/src/language/stats/npar.h
index 9118a44ce8e26b7b6b04ef7693bfa48c7c2c06fc..80446c3a56af41e6f392e6738c2c9fe43ca0b7b3 100644 (file)
--- a/src/language/stats/npar.h
+++ b/src/language/stats/npar.h
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 2006 Free Software Foundation, Inc.
-   Written by John Darrington <john@darrington.wattle.id.au>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -20,28 +19,36 @@
 #if !npar_h
 #define npar_h 1
 
-typedef struct variable *var_ptr;
-typedef var_ptr variable_pair[2];
+#include <stddef.h>
+#include <data/missing-values.h>
+
+#include <stddef.h>
+#include <data/missing-values.h>
+ 
+typedef struct variable *variable_pair[2];
 
 struct hsh_table;
-struct casefilter ;
+struct const_hsh_table;
+struct casefilter;
+struct casereader;
+struct dataset;
 
 struct npar_test
 {
   void (*execute) (const struct dataset *, 
-                  const struct casefile *, 
-                  struct casefilter *,
+                  struct casereader *,
+                   enum mv_class exclude,
                   const struct npar_test *
                   );
 
   void (*insert_variables) (const struct npar_test *, 
-                           struct hsh_table *);
+                           struct const_hsh_table *);
 };
 
 struct one_sample_test
 {
   struct npar_test parent;
-  struct variable **vars;
+  const struct variable **vars;
   size_t n_vars;
 };