Merge commit 'origin/stable'

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

diff --git a/src/data/procedure.h b/src/data/procedure.h
index 2d79d42564b08d4beb6805258effb9ba41206b7c..09d44eeef612bdda52072acbf8be40a8982f9a46 100644 (file)
--- a/src/data/procedure.h
+++ b/src/data/procedure.h
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000, 2006, 2007 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+   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 the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #ifndef PROCEDURE_H
 #define PROCEDURE_H 1
@@ -53,17 +51,21 @@ struct dictionary ;
 typedef void  replace_source_callback (struct casereader *);
 typedef void  replace_dictionary_callback (struct dictionary *);
 
+typedef void transformation_change_callback_func (bool non_empty, void *aux);
 
-struct dataset * create_dataset (replace_source_callback *,
-                                replace_dictionary_callback *);
+struct dataset * create_dataset (void);
 
 void destroy_dataset (struct dataset *);
 
+void dataset_add_transform_change_callback (struct dataset *,
+                                           transformation_change_callback_func *, void *);
+
 void proc_discard_active_file (struct dataset *);
 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);
 
@@ -77,8 +79,12 @@ bool proc_commit (struct dataset *);
 bool dataset_end_of_command (struct dataset *);
 \f
 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 */