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
{
cor_list = cor_last = NULL;
matrix_file = NULL;
- if (!parse_correlations (&cmd))
+ if (!parse_correlations (&cmd, NULL))
return CMD_FAILURE;
free_correlations (&cmd);
}
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;
}
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;