[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] Changes to pspp/src/aggregate.c
From: |
Ben Pfaff |
Subject: |
[Pspp-cvs] Changes to pspp/src/aggregate.c |
Date: |
Mon, 02 May 2005 02:21:24 -0400 |
Index: pspp/src/aggregate.c
diff -u pspp/src/aggregate.c:1.34 pspp/src/aggregate.c:1.35
--- pspp/src/aggregate.c:1.34 Fri Apr 29 01:02:13 2005
+++ pspp/src/aggregate.c Mon May 2 06:21:20 2005
@@ -213,13 +213,8 @@
goto error;
for (i = 0; i < agr.break_var_cnt; i++)
- {
- struct variable *v = dict_clone_var (agr.dict, agr.break_vars[i],
- agr.break_vars[i]->name,
- agr.break_vars[i]->longname
- );
- assert (v != NULL);
- }
+ dict_clone_var_assert (agr.dict, agr.break_vars[i],
+ agr.break_vars[i]->name);
/* BREAK must follow the options. */
break;
@@ -455,7 +450,8 @@
arg[i].f = tokval;
type = NUMERIC;
} else {
- msg (SE, _("Missing argument %d to %s."), i + 1,
function->name);
+ msg (SE, _("Missing argument %d to %s."), i + 1,
+ function->name);
goto error;
}
@@ -543,10 +539,11 @@
}
if (function->alpha_type == ALPHA)
- destvar = dict_clone_var (agr->dict, v->src, 0, dest[i] );
- else if (v->src->type == NUMERIC
- || function->alpha_type == NUMERIC)
+ destvar = dict_clone_var (agr->dict, v->src, dest[i]);
+ else
{
+ assert (v->src->type == NUMERIC
+ || function->alpha_type == NUMERIC);
destvar = dict_create_var (agr->dict, dest[i], 0);
if (destvar != NULL)
{
- [Pspp-cvs] Changes to pspp/src/aggregate.c,
Ben Pfaff <=