/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2011, 2013 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
#include <config.h>
-#include <data/transformations.h>
+#include "data/transformations.h"
#include <assert.h>
#include <stdlib.h>
-#include <libpspp/str.h>
+#include "libpspp/str.h"
-#include "xalloc.h"
+#include "gl/xalloc.h"
/* A single transformation. */
struct transformation
struct trns_chain
{
struct transformation *trns; /* Array of transformations. */
- size_t trns_cnt; /* Number of transformations. */
- size_t trns_cap; /* Allocated capacity. */
+ size_t n_trns; /* Number of transformations. */
+ size_t allocated_trns; /* Allocated capacity. */
bool finalized; /* Finalize functions called? */
};
{
struct trns_chain *chain = xmalloc (sizeof *chain);
chain->trns = NULL;
- chain->trns_cnt = 0;
- chain->trns_cap = 0;
+ chain->n_trns = 0;
+ chain->allocated_trns = 0;
chain->finalized = false;
return chain;
}
-/* Finalizes all the transformations in CHAIN.
- A chain is only finalized once; afterward, calling this
- function is a no-op.
- Finalizers may add transformations to CHAIN, but after
- finalization the chain's contents are fixed, so that no more
- transformations may be added afterward. */
+/* Finalizes all the un-finalized transformations in CHAIN.
+ Any given transformation is only finalized once. */
void
trns_chain_finalize (struct trns_chain *chain)
{
- if (!chain->finalized)
+ while (!chain->finalized)
{
size_t i;
- for (i = 0; i < chain->trns_cnt; i++)
+ chain->finalized = true;
+ for (i = 0; i < chain->n_trns; i++)
{
struct transformation *trns = &chain->trns[i];
- if (trns->finalize != NULL)
- trns->finalize (trns->aux);
+ trns_finalize_func *finalize = trns->finalize;
+
+ trns->finalize = NULL;
+ if (finalize != NULL)
+ finalize (trns->aux);
}
- chain->finalized = true;
}
}
/* Needed to ensure that the control stack gets cleared. */
trns_chain_finalize (chain);
- for (i = 0; i < chain->trns_cnt; i++)
+ for (i = 0; i < chain->n_trns; i++)
{
struct transformation *trns = &chain->trns[i];
if (trns->free != NULL)
bool
trns_chain_is_empty (const struct trns_chain *chain)
{
- return chain->trns_cnt == 0;
+ return chain->n_trns == 0;
}
/* Adds a transformation to CHAIN with finalize function
{
struct transformation *trns;
- assert (!chain->finalized);
+ chain->finalized = false;
- if (chain->trns_cnt == chain->trns_cap)
- chain->trns = x2nrealloc (chain->trns, &chain->trns_cap,
+ if (chain->n_trns == chain->allocated_trns)
+ chain->trns = x2nrealloc (chain->trns, &chain->allocated_trns,
sizeof *chain->trns);
- trns = &chain->trns[chain->trns_cnt++];
+ trns = &chain->trns[chain->n_trns++];
trns->idx_ofs = 0;
trns->finalize = finalize;
trns->execute = execute;
assert (dst->finalized);
assert (src->finalized);
- if (dst->trns_cnt + src->trns_cnt > dst->trns_cap)
+ if (dst->n_trns + src->n_trns > dst->allocated_trns)
{
- dst->trns_cap = dst->trns_cnt + src->trns_cnt;
- dst->trns = xnrealloc (dst->trns, dst->trns_cap, sizeof *dst->trns);
+ dst->allocated_trns = dst->n_trns + src->n_trns;
+ dst->trns = xnrealloc (dst->trns, dst->allocated_trns, sizeof *dst->trns);
}
- for (i = 0; i < src->trns_cnt; i++)
+ for (i = 0; i < src->n_trns; i++)
{
- struct transformation *d = &dst->trns[i + dst->trns_cnt];
+ struct transformation *d = &dst->trns[i + dst->n_trns];
const struct transformation *s = &src->trns[i];
*d = *s;
- d->idx_ofs += src->trns_cnt;
+ d->idx_ofs += src->n_trns;
}
- dst->trns_cnt += src->trns_cnt;
+ dst->n_trns += src->n_trns;
+ src->n_trns = 0;
trns_chain_destroy (src);
}
size_t
trns_chain_next (struct trns_chain *chain)
{
- return chain->trns_cnt;
+ return chain->n_trns;
}
/* Executes the given CHAIN of transformations on *C,
size_t i;
assert (chain->finalized);
- for (i = start < 0 ? 0 : start; i < chain->trns_cnt; )
+ for (i = start < 0 ? 0 : start; i < chain->n_trns;)
{
struct transformation *trns = &chain->trns[i];
int retval = trns->execute (trns->aux, c, case_nr);