#include "var.h"
/* (headers) */
-#undef DEBUGGING
-#define DEBUGGING 1
#include "debug-print.h"
struct cor_set
cor_list = cor_last = NULL;
matrix_file = NULL;
- lex_match_id ("PEARSON");
- lex_match_id ("CORRELATIONS");
-
if (!parse_correlations (&cmd))
return CMD_FAILURE;
free_correlations (&cmd);
}
static int
-cor_custom_variables (struct cmd_correlations *cmd unused)
+cor_custom_variables (struct cmd_correlations *cmd UNUSED)
{
struct variable **v1, **v2;
int nv1, nv2;
struct cor_set *cor;
/* Ensure that this is a VARIABLES subcommand. */
- if (!lex_match_id ("VARIABLES") && (token != T_ID || !is_varname (tokid))
+ if (!lex_match_id ("VARIABLES")
+ && (token != T_ID || dict_lookup_var (default_dict, tokid) != NULL)
&& token != T_ALL)
return 2;
lex_match ('=');
- if (!parse_variables (&default_dict, &v1, &nv1,
+ if (!parse_variables (default_dict, &v1, &nv1,
PV_NO_DUPLICATE | PV_NUMERIC))
return 0;
if (lex_match (T_WITH))
{
- if (!parse_variables (&default_dict, &v2, &nv2,
+ if (!parse_variables (default_dict, &v2, &nv2,
PV_NO_DUPLICATE | PV_NUMERIC))
{
free (v1);
}
static int
-cor_custom_matrix (struct cmd_correlations *cmd unused)
+cor_custom_matrix (struct cmd_correlations *cmd UNUSED)
{
if (!lex_force_match ('('))
return 0;
free (cor);
}
}
+
+/*
+ Local Variables:
+ mode: c
+ End:
+*/