for (v = 0; v < cmd->n_by_vars; ++v)
{
if (var_is_value_missing (cmd->by_var[v],
- case_data (c, cmd->by_var[v]),
- cmd->fctr_excl))
+ case_data (c, cmd->by_var[v]))
+ & cmd->fctr_excl)
break;
}
const struct variable *var = cmd->dep_vars[v];
const double x = case_num (c, var);
- if (var_is_value_missing (var, case_data (c, var), cmd->dep_excl))
+ if (var_is_value_missing (var, case_data (c, var)) & cmd->dep_excl)
{
cmd->es[v].missing += weight;
continue;
const struct variable *v = NULL;
if (!lex_match_variable (lexer,graph.dict,&v))
{
- lex_error (lexer, _("Variable expected"));
+ lex_error (lexer, _("Syntax error expecting variable name."));
goto error;
}
graph.by_var[0] = v;
else if (lex_match_id (lexer, "FOOTNOTE"))
{
lex_error (lexer, _("%s is not yet implemented."),"FOOTNOTE");
- lex_error (lexer, _("FOOTNOTE is not implemented yet for GRAPH"));
goto error;
}
else if (lex_match_id (lexer, "MISSING"))
}
else if (lex_match_id (lexer, "REPORT"))
{
- graph.fctr_excl = MV_NEVER;
+ graph.fctr_excl = 0;
}
else if (lex_match_id (lexer, "NOREPORT"))
{
ok = proc_commit (ds) && ok;
}
- subcase_destroy (&graph.ordering);
+ subcase_uninit (&graph.ordering);
free (graph.dep_vars);
pool_destroy (graph.pool);
caseproto_unref (graph.gr_proto);
return CMD_SUCCESS;
error:
- subcase_destroy (&graph.ordering);
+ subcase_uninit (&graph.ordering);
caseproto_unref (graph.gr_proto);
free (graph.dep_vars);
pool_destroy (graph.pool);