struct cor_set
{
struct cor_set *next;
- struct variable **v1, **v2;
+ const struct variable **v1, **v2;
size_t nv1, nv2;
};
static int
cor_custom_variables (struct lexer *lexer, struct dataset *ds, struct cmd_correlations *cmd UNUSED, void *aux UNUSED)
{
- struct variable **v1, **v2;
+ const struct variable **v1, **v2;
size_t nv1, nv2;
struct cor_set *cor;
return 2;
lex_match (lexer, '=');
- if (!parse_variables (lexer, dataset_dict (ds), &v1, &nv1,
+ if (!parse_variables_const (lexer, dataset_dict (ds), &v1, &nv1,
PV_NO_DUPLICATE | PV_NUMERIC))
return 0;
-
+
if (lex_match (lexer, T_WITH))
{
- if (!parse_variables (lexer, dataset_dict (ds), &v2, &nv2,
+ if (!parse_variables_const (lexer, dataset_dict (ds), &v2, &nv2,
PV_NO_DUPLICATE | PV_NUMERIC))
{
free (v1);
cor_last = cor_last->next = cor;
else
cor_list = cor_last = cor;
-
+
return 1;
}
{
if (!lex_force_match (lexer, '('))
return 0;
-
+
if (lex_match (lexer, '*'))
matrix_file = NULL;
- else
+ else
{
matrix_file = fh_parse (lexer, FH_REF_FILE);
if (matrix_file == NULL)
- return 0;
+ return 0;
}
if (!lex_force_match (lexer, ')'))