starting to look like it works

[pspp] / src / data / transformations.h

diff --git a/src/data/transformations.h b/src/data/transformations.h
index 209149978261c831c0615b8736c890c7da89e9d5..dd8c29d0c873c2b048d9953c47b3e2d3d86a9212 100644 (file)
--- a/src/data/transformations.h
+++ b/src/data/transformations.h
@@ -21,7 +21,8 @@
 #include <stddef.h>
 #include "data/case.h"
 
-/* trns_proc_func return values. */
+/* One transformation. */
+
 enum trns_result
   {
     TRNS_CONTINUE,              /* Continue to next transformation. */
@@ -34,38 +35,39 @@ enum trns_result
 
 struct ccase;
 
-typedef enum trns_result trns_proc_func (void *, struct ccase **, casenumber);
-typedef bool trns_free_func (void *);
 struct trns_class
   {
-    int (*execute) (void *aux, struct ccase **, casenumber);
+    const char *name;           /* For debugging. */
+    enum trns_result (*execute) (void *aux, struct ccase **, casenumber);
     bool (*destroy) (void *aux);
   };
-\f
-/* Transformation chains. */
 
 struct transformation
   {
     const struct trns_class *class;
     void *aux;
   };
-enum trns_result transformations_execute (const struct transformation *,
-                                          size_t n,
-                                          struct ccase **, casenumber case_num);
-void transformations_destroy (struct transformation *, size_t n);
+\f
+/* A chain of transformations. */
 
-struct trns_builder *trns_builder_create (void);
-void trns_builder_append (struct trns_builder *, trns_proc_func *, trns_free_func *, void *);
-struct trns_chain *trns_builder_finish (struct trns_builder *);
-void trns_builder_destroy (struct trns_chain *);
+struct trns_chain
+  {
+    struct transformation *xforms;
+    size_t n;
+    size_t allocated;
+  };
 
-bool trns_chain_is_empty (const struct trns_chain *);
+#define TRNS_CHAIN_INIT { .n = 0 }
 
-size_t trns_chain_next (struct trns_chain *);
-enum trns_result trns_chain_execute (const struct trns_chain *,
-                                     enum trns_result, struct ccase **,
-                                     casenumber case_nr);
+void trns_chain_init (struct trns_chain *);
+bool trns_chain_uninit (struct trns_chain *);
+
+bool trns_chain_clear (struct trns_chain *);
 
+void trns_chain_append (struct trns_chain *, const struct transformation *);
 void trns_chain_splice (struct trns_chain *, struct trns_chain *);
 
+enum trns_result trns_chain_execute (const struct trns_chain *,
+                                     casenumber case_num, struct ccase **);
+
 #endif /* transformations.h */