projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added (some of the) calculations for the examine command.
[pspp]
/
src
/
correlations.q
diff --git
a/src/correlations.q
b/src/correlations.q
index e3e131fd5a9617d19562a1fac8d3242b77d15595..4c9f74b7f3344f5a5e32fdcbe70045bf679a9c45 100644
(file)
--- a/
src/correlations.q
+++ b/
src/correlations.q
@@
-72,9
+72,6
@@
internal_cmd_correlations (void)
cor_list = cor_last = NULL;
matrix_file = NULL;
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);
if (!parse_correlations (&cmd))
return CMD_FAILURE;
free_correlations (&cmd);
@@
-83,25
+80,26
@@
internal_cmd_correlations (void)
}
static int
}
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. */
{
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 ('=');
&& 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))
{
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);
PV_NO_DUPLICATE | PV_NUMERIC))
{
free (v1);
@@
-129,7
+127,7
@@
cor_custom_variables (struct cmd_correlations *cmd unused)
}
static int
}
static int
-cor_custom_matrix (struct cmd_correlations *cmd
unused
)
+cor_custom_matrix (struct cmd_correlations *cmd
UNUSED
)
{
if (!lex_force_match ('('))
return 0;
{
if (!lex_force_match ('('))
return 0;
@@
-162,3
+160,9
@@
free_correlations_state (void)
free (cor);
}
}
free (cor);
}
}
+
+/*
+ Local Variables:
+ mode: c
+ End:
+*/