Work on getting rid of trns_chain_finalize().

[pspp] / src / data / transformations.h

diff --git a/src/data/transformations.h b/src/data/transformations.h
index 59001f1139da18a544775337b9921baa435b7e6c..1d422376a628ec854fd71ba67c99c1f6b5df04ed 100644 (file)
--- a/src/data/transformations.h
+++ b/src/data/transformations.h
@@ -1,5 +1,5 @@
 /* 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
@@ -17,34 +17,43 @@
 #ifndef TRANSFORMATIONS_H
 #define TRANSFORMATIONS_H 1
 
+#include <limits.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <data/case.h>
+#include "data/case.h"
 
 /* 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 = INT_MIN,    /* Continue to next transformation. */
+    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 bool trns_free_func (void *);
+typedef struct pxd_object *trns_save_func (void *, struct pxd *);
+typedef void *trns_load_func (struct pxd_object *, const struct pxd *);
+
+#if 0
+struct trns_class
+  {
+    int (*execute) (struct trns_class *, struct ccase **, casenumber);
+    bool (*destroy) (struct ccase *);
+  };
+#endif
 \f
 /* Transformation chains. */
 
 struct trns_chain *trns_chain_create (void);
-void trns_chain_finalize (struct trns_chain *);
 bool trns_chain_destroy (struct trns_chain *);
 
 bool trns_chain_is_empty (const struct trns_chain *);
 
-void trns_chain_append (struct trns_chain *, trns_finalize_func *,
+void trns_chain_append (struct trns_chain *,
                         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 *,