[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp/src ChangeLog procedure.c data/ChangeLog d...
From: |
Ben Pfaff |
Subject: |
[Pspp-cvs] pspp/src ChangeLog procedure.c data/ChangeLog d... |
Date: |
Thu, 27 Apr 2006 03:01:57 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Branch:
Changes by: Ben Pfaff <address@hidden> 06/04/27 03:01:57
Modified files:
src : ChangeLog procedure.c
src/data : ChangeLog dictionary.c variable.h
src/language/data-io: inpt-pgm.c
src/language/dictionary: numeric.c
src/language/xforms: compute.c
Log message:
* variable.h: (struct variable) Rename `reinit' member as `leave' and
invert sense. Fix up all references.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ChangeLog.diff?tr1=1.282&tr2=1.283&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/procedure.c.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/ChangeLog.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/dictionary.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/variable.h.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/inpt-pgm.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/numeric.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/xforms/compute.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: pspp/src/ChangeLog
diff -u pspp/src/ChangeLog:1.282 pspp/src/ChangeLog:1.283
--- pspp/src/ChangeLog:1.282 Thu Apr 27 02:51:12 2006
+++ pspp/src/ChangeLog Thu Apr 27 03:01:57 2006
@@ -1,3 +1,8 @@
+Wed Apr 26 20:00:00 2006 Ben Pfaff <address@hidden>
+
+ * procedure.c (create_trns_case): Fix inverted decision on whether
+ numeric values should be initialized to 0 or SYSMIS.
+
Wed Apr 26 19:48:52 2006 Ben Pfaff <address@hidden>
Continue reforming procedure execution. In this phase, assert
Index: pspp/src/data/ChangeLog
diff -u pspp/src/data/ChangeLog:1.22 pspp/src/data/ChangeLog:1.23
--- pspp/src/data/ChangeLog:1.22 Thu Apr 27 02:42:01 2006
+++ pspp/src/data/ChangeLog Thu Apr 27 03:01:57 2006
@@ -1,3 +1,8 @@
+Wed Apr 26 20:01:19 2006 Ben Pfaff <address@hidden>
+
+ * variable.h: (struct variable) Rename `reinit' member as `leave'
+ and invert sense. Fix up all references.
+
Wed Apr 26 19:39:28 2006 Ben Pfaff <address@hidden>
Continue reforming procedure execution. In this phase, break
Index: pspp/src/data/dictionary.c
diff -u pspp/src/data/dictionary.c:1.6 pspp/src/data/dictionary.c:1.7
--- pspp/src/data/dictionary.c:1.6 Wed Apr 26 22:00:29 2006
+++ pspp/src/data/dictionary.c Thu Apr 27 03:01:57 2006
@@ -282,7 +282,7 @@
v->width = width;
v->fv = d->next_value_idx;
v->nv = width == 0 ? 1 : DIV_RND_UP (width, 8);
- v->reinit = dict_class_from_id (v->name) != DC_SCRATCH;
+ v->leave = dict_class_from_id (v->name) == DC_SCRATCH;
v->index = d->var_cnt;
mv_init (&v->miss, width);
if (v->type == NUMERIC)
@@ -358,7 +358,7 @@
short_name[] is intentionally not copied, because there is
no reason to give a new variable with potentially a new name
the same short name. */
- nv->reinit = ov->reinit;
+ nv->leave = ov->leave;
mv_copy (&nv->miss, &ov->miss);
nv->print = ov->print;
nv->write = ov->write;
Index: pspp/src/data/variable.h
diff -u pspp/src/data/variable.h:1.5 pspp/src/data/variable.h:1.6
--- pspp/src/data/variable.h:1.5 Wed Apr 26 22:00:29 2006
+++ pspp/src/data/variable.h Thu Apr 27 03:01:57 2006
@@ -64,7 +64,7 @@
/* Case information. */
int fv, nv; /* Index into `value's, number of
values. */
- bool reinit; /* True: reinitialize; false: leave. */
+ bool leave; /* Leave value from case to case? */
/* Data for use by containing dictionary. */
int index; /* Dictionary index. */
Index: pspp/src/language/data-io/inpt-pgm.c
diff -u pspp/src/language/data-io/inpt-pgm.c:1.5
pspp/src/language/data-io/inpt-pgm.c:1.6
--- pspp/src/language/data-io/inpt-pgm.c:1.5 Wed Apr 26 20:54:08 2006
+++ pspp/src/language/data-io/inpt-pgm.c Thu Apr 27 03:01:57 2006
@@ -124,7 +124,7 @@
size_t j;
value_init = var->type == NUMERIC ? INP_NUMERIC : INP_STRING;
- value_init |= var->reinit ? INP_REINIT : INP_INIT_ONCE;
+ value_init |= var->leave ? INP_INIT_ONCE : INP_REINIT;
for (j = 0; j < var->nv; j++)
inp->init[j + var->fv] = value_init;
Index: pspp/src/language/dictionary/numeric.c
diff -u pspp/src/language/dictionary/numeric.c:1.5
pspp/src/language/dictionary/numeric.c:1.6
--- pspp/src/language/dictionary/numeric.c:1.5 Wed Apr 26 22:00:29 2006
+++ pspp/src/language/dictionary/numeric.c Thu Apr 27 03:01:57 2006
@@ -192,11 +192,7 @@
if (!parse_variables (default_dict, &v, &nv, PV_NONE))
return CMD_CASCADING_FAILURE;
for (i = 0; i < nv; i++)
- {
- if (!v[i]->reinit)
- continue;
- v[i]->reinit = 0;
- }
+ v[i]->leave = true;
free (v);
return lex_end_of_command ();
Index: pspp/src/language/xforms/compute.c
diff -u pspp/src/language/xforms/compute.c:1.2
pspp/src/language/xforms/compute.c:1.3
--- pspp/src/language/xforms/compute.c:1.2 Wed Mar 15 03:29:11 2006
+++ pspp/src/language/xforms/compute.c Thu Apr 27 03:01:57 2006
@@ -392,7 +392,7 @@
/* Goofy behavior, but compatible: Turn off LEAVE. */
if (dict_class_from_id (compute->variable->name) != DC_SCRATCH)
- compute->variable->reinit = 1;
+ compute->variable->leave = false;
}
else
{
Index: pspp/src/procedure.c
diff -u pspp/src/procedure.c:1.10 pspp/src/procedure.c:1.11
--- pspp/src/procedure.c:1.10 Thu Apr 27 02:51:13 2006
+++ pspp/src/procedure.c Thu Apr 27 03:01:57 2006
@@ -227,7 +227,7 @@
union value *value = case_data_rw (trns_case, v->fv);
if (v->type == NUMERIC)
- value->f = v->reinit ? 0.0 : SYSMIS;
+ value->f = v->leave ? 0.0 : SYSMIS;
else
memset (value->s, ' ', v->width);
}
@@ -428,7 +428,7 @@
for (i = 0; i < var_cnt; i++)
{
struct variable *v = dict_get_var (default_dict, i);
- if (v->reinit)
+ if (!v->leave)
{
if (v->type == NUMERIC)
case_data_rw (c, v->fv)->f = SYSMIS;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp/src ChangeLog procedure.c data/ChangeLog d...,
Ben Pfaff <=