projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
numbers back in tables
[pspp]
/
src
/
data
/
data-in.h
diff --git
a/src/data/data-in.h
b/src/data/data-in.h
index 198128863bebec7e502d3e308600965905d50320..6540004d2333921560c7437e83c42e78323c9469 100644
(file)
--- a/
src/data/data-in.h
+++ b/
src/data/data-in.h
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006
, 2010, 2011
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
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
@@
-14,25
+14,26
@@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#if
!data_in_h
-#define
data_in_h
1
+#if
ndef DATA_DATA_IN_H
+#define
DATA_DATA_IN_H
1
-#include <stddef.h>
#include <stdbool.h>
#include <stdbool.h>
-#include <libpspp/legacy-encoding.h>
-#include <libpspp/float-format.h>
-#include <libpspp/integer-format.h>
-#include <libpspp/str.h>
-#include "format.h"
+#include "data/format.h"
+#include "libpspp/str.h"
-
enum integer_format data_in_get_integer_format (void)
;
-
void data_in_set_integer_format (enum integer_format)
;
+
union value
;
+
struct dictionary
;
-enum float_format data_in_get_float_format (void);
-void data_in_set_float_format (enum float_format);
+char *data_in (struct substring input, const char *input_encoding,
+ enum fmt_type, const struct fmt_settings *,
+ union value *output, int width, const char *output_encoding);
-bool data_in
(struct substring input, enum legacy
_encoding,
-
enum fmt_type, int implied_decimals, int first_column
,
-
union value *output, int width
);
+bool data_in
_msg (struct substring input, const char *input
_encoding,
+
enum fmt_type, const struct fmt_settings *
,
+
union value *output, int width, const char *output_encoding
);
-#endif /* data-in.h */
+void data_in_imply_decimals (struct substring input, const char *encoding,
+ enum fmt_type format, int d,
+ const struct fmt_settings *, union value *output);
+
+#endif /* data/data-in.h */