Work toward getting rid of finalizers and control stacks and jumping around among...

[pspp] / src / data / transformations.h

diff --git a/src/data/transformations.h b/src/data/transformations.h
index 013bcaa731e8e29adedaad8eb04d75b46e3e37e4..209149978261c831c0615b8736c890c7da89e9d5 100644 (file)
--- a/src/data/transformations.h
+++ b/src/data/transformations.h
@@ -24,28 +24,43 @@
 /* trns_proc_func return values. */
 enum trns_result
   {
-    TRNS_CONTINUE = -1,         /* Continue to next transformation. */
-    TRNS_DROP_CASE = -2,        /* Drop this case. */
-    TRNS_ERROR = -3,            /* A serious error, so stop the procedure. */
-    TRNS_END_CASE = -4,         /* Skip to next case.  INPUT PROGRAM only. */
-    TRNS_END_FILE = -5          /* End of input.  INPUT PROGRAM only. */
+    TRNS_CONTINUE,              /* Continue to next transformation. */
+    TRNS_BREAK,                 /* Break out of LOOP. */
+    TRNS_DROP_CASE,             /* Drop this case. */
+    TRNS_ERROR,                 /* A serious error, so stop the procedure. */
+    TRNS_END_CASE,              /* Skip to next case.  INPUT PROGRAM only. */
+    TRNS_END_FILE               /* End of input.  INPUT PROGRAM only. */
   };
 
 struct ccase;
-typedef void trns_finalize_func (void *);
-typedef int trns_proc_func (void *, struct ccase **, casenumber);
+
+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);
+    bool (*destroy) (void *aux);
+  };
 \f
 /* Transformation chains. */
 
-struct trns_chain *trns_chain_create (void);
-void trns_chain_finalize (struct trns_chain *);
-bool trns_chain_destroy (struct trns_chain *);
+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);
+
+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 *);
 
 bool trns_chain_is_empty (const struct trns_chain *);
 
-void trns_chain_append (struct trns_chain *, trns_finalize_func *,
-                        trns_proc_func *, trns_free_func *, void *);
 size_t trns_chain_next (struct trns_chain *);
 enum trns_result trns_chain_execute (const struct trns_chain *,
                                      enum trns_result, struct ccase **,