X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fcorrelations.q;h=12d3645919d2eecf8600f0d25ce9358aae2a8f88;hb=eba3cf1b8a2fcfee20eabc51aa8f91b1f276f2f7;hp=59f06e48d08ac9ed42df89069512d36d102643a2;hpb=2322678e8fddbbf158b01b2720db2636404bba3b;p=pspp

diff --git a/src/language/stats/correlations.q b/src/language/stats/correlations.q
index 59f06e48d0..12d3645919 100644
--- a/src/language/stats/correlations.q
+++ b/src/language/stats/correlations.q
@@ -18,17 +18,21 @@
    02110-1301, USA. */
 
 #include <config.h>
+
 #include <stdlib.h>
-#include "alloc.h"
-#include "compiler.h"
-#include "dictionary.h"
-#include "file-handle-def.h"
-#include "command.h"
-#include "lexer.h"
-#include "variable.h"
-/* (headers) */
 
-#include "debug-print.h"
+#include <data/dictionary.h>
+#include <data/file-handle-def.h>
+#include <data/procedure.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/data-io/file-handle.h>
+#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+
+/* (headers) */
 
 struct cor_set
   {
@@ -55,8 +59,8 @@ cmd_correlations (void)
 /* (specification)
    "CORRELATIONS" (cor_):
      *variables=custom;
-     +missing=miss:!pairwise/listwise,
-	      inc:include/exclude;
+     missing=miss:!pairwise/listwise,
+	     inc:include/exclude;
      +print=tail:!twotail/onetail,
 	    sig:!sig/nosig;
      +format=fmt:!matrix/serial;
@@ -74,7 +78,7 @@ internal_cmd_correlations (void)
   cor_list = cor_last = NULL;
   matrix_file = NULL;
 
-  if (!parse_correlations (&cmd))
+  if (!parse_correlations (&cmd, NULL))
     return CMD_FAILURE;
   free_correlations (&cmd);
 
@@ -82,7 +86,7 @@ internal_cmd_correlations (void)
 }
 
 static int
-cor_custom_variables (struct cmd_correlations *cmd UNUSED)
+cor_custom_variables (struct cmd_correlations *cmd UNUSED, void *aux UNUSED)
 {
   struct variable **v1, **v2;
   size_t nv1, nv2;
@@ -129,7 +133,7 @@ cor_custom_variables (struct cmd_correlations *cmd UNUSED)
 }
 
 static int
-cor_custom_matrix (struct cmd_correlations *cmd UNUSED)
+cor_custom_matrix (struct cmd_correlations *cmd UNUSED, void *aux UNUSED)
 {
   if (!lex_force_match ('('))
     return 0;