if (lex_match_id (lexer, "DEPENDENT"))
{
- if (!lex_force_match (lexer, T_EQUALS))
- goto error;
+ lex_match (lexer, T_EQUALS);
free (regression.dep_vars);
regression.n_dep_vars = 0;
}
else if (lex_match_id (lexer, "STATISTICS"))
{
+ unsigned long statistics = 0;
lex_match (lexer, T_EQUALS);
while (lex_token (lexer) != T_ENDCMD
{
if (lex_match (lexer, T_ALL))
{
- regression.stats = ~0;
+ statistics = ~0;
}
else if (lex_match_id (lexer, "DEFAULTS"))
{
- regression.stats |= STATS_DEFAULT;
+ statistics |= STATS_DEFAULT;
}
else if (lex_match_id (lexer, "R"))
{
- regression.stats |= STATS_R;
+ statistics |= STATS_R;
}
else if (lex_match_id (lexer, "COEFF"))
{
- regression.stats |= STATS_COEFF;
+ statistics |= STATS_COEFF;
}
else if (lex_match_id (lexer, "ANOVA"))
{
- regression.stats |= STATS_ANOVA;
+ statistics |= STATS_ANOVA;
}
else if (lex_match_id (lexer, "BCOV"))
{
- regression.stats |= STATS_BCOV;
+ statistics |= STATS_BCOV;
}
else if (lex_match_id (lexer, "CI"))
{
- regression.stats |= STATS_CI;
+ statistics |= STATS_CI;
if (lex_match (lexer, T_LPAREN))
{
goto error;
}
}
+
+ if (statistics)
+ regression.stats = statistics;
+
}
else if (lex_match_id (lexer, "SAVE"))
{
workspace.pred_idx = -1;
workspace.writer = NULL;
workspace.reader = NULL;
+ workspace.residvars = NULL;
+ workspace.predvars = NULL;
if (save)
{
int i;
tab_double (t, 5, 1, 0, F, NULL, RC_OTHER);
- tab_double (t, 6, 1, 0, pval, NULL, RC_OTHER);
+ tab_double (t, 6, 1, 0, pval, NULL, RC_PVALUE);
tab_title (t, _("ANOVA (%s)"), var_to_string (var));
tab_submit (t);