Encapsulated the static data of procedure.[ch] into a single object, to be

[pspp-builds.git] / src / data / procedure.h

diff --git a/src/data/procedure.h b/src/data/procedure.h
index 5a1968782cb9fa462aaf29351cbd7ed8a0a48e61..60e1e77f4f14fae73e74f5649ffea55bfc4253e8 100644 (file)
--- a/src/data/procedure.h
+++ b/src/data/procedure.h
@@ -22,62 +22,89 @@
 
 #include <time.h>
 #include <stdbool.h>
+
 #include <data/transformations.h>
+#include <libpspp/compiler.h>
 
 struct ccase;
 struct casefile;
 struct case_sink;
 struct case_source;
 
-/* Dictionary produced by permanent and temporary transformations
-   on data from the source. */
-extern struct dictionary *default_dict;
+struct dataset;
+
 \f
 /* Transformations. */
 
-void add_transformation (trns_proc_func *, trns_free_func *, void *);
-void add_transformation_with_finalizer (trns_finalize_func *,
+void add_transformation (struct dataset *ds, 
+                        trns_proc_func *, trns_free_func *, void *);
+void add_transformation_with_finalizer (struct dataset *ds, 
+                                       trns_finalize_func *,
                                         trns_proc_func *,
                                         trns_free_func *, void *);
-size_t next_transformation (void);
+size_t next_transformation (const struct dataset *ds);
+
+void discard_variables (struct dataset *ds);
 
-void discard_variables (void);
 
-bool proc_cancel_all_transformations (void);
-struct trns_chain *proc_capture_transformations (void);
 
-void proc_start_temporary_transformations (void);
-bool proc_in_temporary_transformations (void);
-bool proc_make_temporary_transformations_permanent (void);
-bool proc_cancel_temporary_transformations (void);
+bool proc_cancel_all_transformations (struct dataset *ds);
+struct trns_chain *proc_capture_transformations (struct dataset *ds);
+
+void proc_start_temporary_transformations (struct dataset *ds);
+bool proc_in_temporary_transformations (const struct dataset *ds);
+bool proc_make_temporary_transformations_permanent (struct dataset *ds);
+bool proc_cancel_temporary_transformations (struct dataset *ds);
 \f
 /* Procedures. */
 
-void proc_init (void);
-void proc_done (void);
-
-void proc_set_source (struct case_source *);
-bool proc_has_source (void);
-
-void proc_set_sink (struct case_sink *);
-struct casefile *proc_capture_output (void);
-
-bool procedure (bool (*proc_func) (struct ccase *, void *aux), void *aux);
-bool procedure_with_splits (void (*begin_func) (void *aux),
-                            bool (*proc_func) (struct ccase *, void *aux),
-                            void (*end_func) (void *aux),
-                            void *aux);
-bool multipass_procedure (bool (*proc_func) (const struct casefile *,
-                                             void *aux),
-                          void *aux);
-bool multipass_procedure_with_splits (bool (*) (const struct casefile *,
-                                                void *),
-                                      void *aux);
-time_t time_of_last_procedure (void);
+
+struct dataset *create_dataset (void);
+void destroy_dataset (struct dataset *);
+
+void proc_set_source (struct dataset *ds, struct case_source *);
+bool proc_has_source (const struct dataset *ds);
+
+void proc_set_sink (struct dataset *ds, struct case_sink *);
+struct casefile *proc_capture_output (struct dataset *ds);
+
+typedef bool (*casefile_func_t) (const struct casefile *, void *);
+typedef bool (*case_func_t) (const struct ccase *, void *);
+typedef void (*begin_func_t) (const struct ccase *, void *);
+
+
+
+bool procedure (struct dataset *ds, case_func_t, void *aux)  WARN_UNUSED_RESULT;
+
+bool procedure_with_splits (struct dataset *ds, 
+                           begin_func_t begin_func,
+                            case_func_t proc_func,
+                            void (*end_func) (void *),
+                            void *aux)
+     WARN_UNUSED_RESULT;
+bool multipass_procedure (struct dataset *ds, casefile_func_t, void  *aux)
+     WARN_UNUSED_RESULT;
+bool multipass_procedure_with_splits (struct dataset *ds,
+                                          bool (*) (const struct ccase *,
+                                                    const struct casefile *,
+                                                    void *),
+                                          void *aux)
+     WARN_UNUSED_RESULT;
+
+
+
+time_t time_of_last_procedure (struct dataset *ds);
 \f
-/* Number of cases to lag. */
-extern int n_lag;
 
-struct ccase *lagged_case (int n_before);
+struct ccase *lagged_case (const struct dataset *ds, int n_before);
+
+extern struct dataset *current_dataset;
+
+inline struct dictionary *dataset_dict (const struct dataset *ds);
+inline void dataset_set_dict ( struct dataset *ds, struct dictionary *dict);
+
+inline int dataset_n_lag (const struct dataset *ds);
+inline void dataset_set_n_lag (struct dataset *ds, int n_lag);
+
 
 #endif /* procedure.h */