work on datasets

[pspp] / src / language / data-io / data-parser.h

diff --git a/src/language/data-io/data-parser.h b/src/language/data-io/data-parser.h
index b250e91bb53d2d7cf7b628fd6f41cb8113f7f30b..023538abc6b95b694ad364b7f9ec2880a0bec346 100644 (file)
--- a/src/language/data-io/data-parser.h
+++ b/src/language/data-io/data-parser.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2011, 2016 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
@@ -20,14 +20,14 @@
 /* Abstraction of a DATA LIST or GET DATA TYPE=TXT data parser. */
 
 #include <stdbool.h>
-#include <data/case.h>
-#include <libpspp/str.h>
+#include "data/case.h"
+#include "libpspp/str.h"
 
-struct dataset;
 struct dfm_reader;
 struct dictionary;
 struct file_handle;
 struct fmt_spec;
+struct session;
 struct substring;
 
 /* Type of data read by a data parser. */
@@ -38,15 +38,13 @@ enum data_parser_type
   };
 
 /* Creating and configuring any parser. */
-struct data_parser *data_parser_create (void);
+struct data_parser *data_parser_create (const struct dictionary *dict);
 void data_parser_destroy (struct data_parser *);
 
 enum data_parser_type data_parser_get_type (const struct data_parser *);
 void data_parser_set_type (struct data_parser *, enum data_parser_type);
 
 void data_parser_set_skip (struct data_parser *, int initial_records_to_skip);
-void data_parser_set_case_limit (struct data_parser *, casenumber max_cases);
-void data_parser_set_case_percent (struct data_parser *, int case_percent);
 
 /* For configuring delimited parsers only. */
 bool data_parser_get_span (const struct data_parser *);
@@ -78,7 +76,7 @@ bool data_parser_parse (struct data_parser *,
 /* Uses for a configured parser. */
 void data_parser_output_description (struct data_parser *,
                                      const struct file_handle *);
-void data_parser_make_active_file (struct data_parser *, struct dataset *,
+void data_parser_make_active_file (struct data_parser *, struct session *,
                                    struct dfm_reader *, struct dictionary *);
 
 #endif /* language/data-io/data-parser.h */