Merge commit 'origin/stable'

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

diff --git a/src/data/procedure.h b/src/data/procedure.h
index cfb8f218c5402cc5d26053003b7993d27f01cc10..09d44eeef612bdda52072acbf8be40a8982f9a46 100644 (file)
--- a/src/data/procedure.h
+++ b/src/data/procedure.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2007, 2009 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
@@ -53,7 +53,8 @@ typedef void  replace_dictionary_callback (struct dictionary *);
 
 typedef void transformation_change_callback_func (bool non_empty, void *aux);
 
-struct dataset * create_dataset (transformation_change_callback_func *, void *);
+struct dataset * create_dataset (void);
+
 void destroy_dataset (struct dataset *);
 
 void dataset_add_transform_change_callback (struct dataset *,
@@ -64,6 +65,7 @@ void proc_set_active_file (struct dataset *,
                            struct casereader *, struct dictionary *);
 bool proc_set_active_file_data (struct dataset *, struct casereader *);
 bool proc_has_active_file (const struct dataset *ds);
+struct casereader *proc_extract_active_file_data (struct dataset *);
 
 void proc_discard_output (struct dataset *ds);
 
@@ -80,7 +82,9 @@ struct dictionary *dataset_dict (const struct dataset *ds);
 const struct casereader *dataset_source (const struct dataset *ds);
 
 
-struct ccase *lagged_case (const struct dataset *ds, int n_before);
+const struct ccase *lagged_case (const struct dataset *ds, int n_before);
 void dataset_need_lag (struct dataset *ds, int n_before);
 
+void dataset_set_callback (struct dataset *ds, void (*cb) (void *), void *);
+
 #endif /* procedure.h */