X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fprocedure.c;h=6690490f30681ef129ab34cb86b033a5159aa701;hb=c17ea35a73b7a690a54c5c6a213de19f0376e74f;hp=14b2ccdfe6e948adae6acb177ab30f7f3f2c6689;hpb=d908f52b818f4fdf2ab23797756812ec2986bd2b;p=pspp
diff --git a/src/data/procedure.c b/src/data/procedure.c
index 14b2ccdfe6..6690490f30 100644
--- a/src/data/procedure.c
+++ b/src/data/procedure.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000, 2006, 2007 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
@@ -39,6 +37,7 @@
#include
#include
+
struct dataset {
/* Cases are read from source,
their transformation variables are initialized,
@@ -63,6 +62,11 @@ struct dataset {
/* Callback which occurs whenever the DICT is replaced by a new one */
replace_dictionary_callback *replace_dict;
+ /* Callback which occurs whenever the transformation chain(s) have
+ been modified */
+ transformation_change_callback_func *xform_callback;
+ void *xform_callback_aux;
+
/* If true, cases are discarded instead of being written to
sink. */
bool discard_output;
@@ -92,7 +96,7 @@ struct dataset {
but proc_commit not yet called. */
}
proc_state;
- size_t cases_written; /* Cases output so far. */
+ casenumber cases_written; /* Cases output so far. */
bool ok; /* Error status. */
}; /* struct dataset */
@@ -213,7 +217,7 @@ proc_casereader_read (struct casereader *reader UNUSED, void *ds_,
assert (ds->proc_state == PROC_OPEN);
for (;;)
{
- size_t case_nr;
+ casenumber case_nr;
assert (retval == TRNS_DROP_CASE || retval == TRNS_ERROR);
if (retval == TRNS_ERROR)
@@ -230,7 +234,7 @@ proc_casereader_read (struct casereader *reader UNUSED, void *ds_,
/* Execute permanent transformations. */
case_nr = ds->cases_written + 1;
retval = trns_chain_execute (ds->permanent_trns_chain, TRNS_CONTINUE,
- c, &case_nr);
+ c, case_nr);
caseinit_update_left_vars (ds->caseinit, c);
if (retval != TRNS_CONTINUE)
{
@@ -265,7 +269,7 @@ proc_casereader_read (struct casereader *reader UNUSED, void *ds_,
if (ds->temporary_trns_chain != NULL)
{
retval = trns_chain_execute (ds->temporary_trns_chain, TRNS_CONTINUE,
- c, &ds->cases_written);
+ c, ds->cases_written);
if (retval != TRNS_CONTINUE)
{
case_destroy (c);
@@ -386,6 +390,10 @@ proc_capture_transformations (struct dataset *ds)
assert (ds->temporary_trns_chain == NULL);
chain = ds->permanent_trns_chain;
ds->cur_trns_chain = ds->permanent_trns_chain = trns_chain_create ();
+
+ if ( ds->xform_callback)
+ ds->xform_callback (false, ds->xform_callback_aux);
+
return chain;
}
@@ -396,6 +404,8 @@ void
add_transformation (struct dataset *ds, trns_proc_func *proc, trns_free_func *free, void *aux)
{
trns_chain_append (ds->cur_trns_chain, NULL, proc, free, aux);
+ if ( ds->xform_callback)
+ ds->xform_callback (true, ds->xform_callback_aux);
}
/* Adds a transformation that processes a case with PROC and
@@ -410,6 +420,9 @@ add_transformation_with_finalizer (struct dataset *ds,
trns_free_func *free, void *aux)
{
trns_chain_append (ds->cur_trns_chain, finalize, proc, free, aux);
+
+ if ( ds->xform_callback)
+ ds->xform_callback (true, ds->xform_callback_aux);
}
/* Returns the index of the next transformation.
@@ -444,6 +457,9 @@ proc_start_temporary_transformations (struct dataset *ds)
trns_chain_finalize (ds->permanent_trns_chain);
ds->temporary_trns_chain = ds->cur_trns_chain = trns_chain_create ();
+
+ if ( ds->xform_callback)
+ ds->xform_callback (true, ds->xform_callback_aux);
}
}
@@ -485,6 +501,10 @@ proc_cancel_temporary_transformations (struct dataset *ds)
trns_chain_destroy (ds->temporary_trns_chain);
ds->temporary_trns_chain = NULL;
+ if ( ds->xform_callback)
+ ds->xform_callback (!trns_chain_is_empty (ds->permanent_trns_chain),
+ ds->xform_callback_aux);
+
return true;
}
else
@@ -502,23 +522,35 @@ proc_cancel_all_transformations (struct dataset *ds)
ok = trns_chain_destroy (ds->temporary_trns_chain) && ok;
ds->permanent_trns_chain = ds->cur_trns_chain = trns_chain_create ();
ds->temporary_trns_chain = NULL;
+ if ( ds->xform_callback)
+ ds->xform_callback (false, ds->xform_callback_aux);
+
return ok;
}
/* Initializes procedure handling. */
struct dataset *
-create_dataset (replace_source_callback *rps,
- replace_dictionary_callback *rds)
+create_dataset (transformation_change_callback_func *cb, void *aux)
{
struct dataset *ds = xzalloc (sizeof(*ds));
ds->dict = dict_create ();
ds->caseinit = caseinit_create ();
- ds->replace_source = rps;
- ds->replace_dict = rds;
+ ds->xform_callback = cb;
+ ds->xform_callback_aux = aux;
proc_cancel_all_transformations (ds);
return ds;
}
+
+void
+dataset_add_transform_change_callback (struct dataset *ds,
+ transformation_change_callback_func *cb,
+ void *aux)
+{
+ ds->xform_callback = cb;
+ ds->xform_callback_aux = aux;
+}
+
/* Finishes up procedure handling. */
void
destroy_dataset (struct dataset *ds)
@@ -527,6 +559,9 @@ destroy_dataset (struct dataset *ds)
dict_destroy (ds->dict);
caseinit_destroy (ds->caseinit);
trns_chain_destroy (ds->permanent_trns_chain);
+
+ if ( ds->xform_callback)
+ ds->xform_callback (false, ds->xform_callback_aux);
free (ds);
}