Change enum legacy_encoding to const char *.

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

diff --git a/src/data/data-in.h b/src/data/data-in.h
index 287b2fbeda7bf180543c895b483c7cfd2fb82886..5256bb9132553b46075f4f5526c20f8e936f7e8f 100644 (file)
--- a/src/data/data-in.h
+++ b/src/data/data-in.h
@@ -1,52 +1,34 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 1997-9, 2000, 2006 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/>. */
 
-#if !data_in_h
-#define data_in_h 1
+#ifndef DATA_DATA_IN_H
+#define DATA_DATA_IN_H 1
 
-#include <stddef.h>
 #include <stdbool.h>
-#include "format.h"
-
-/* Flags. */
-enum
-  {
-    DI_IGNORE_ERROR = 01,      /* Don't report errors to the user. */
-    DI_IMPLIED_DECIMALS = 02    /* Insert decimals if no '.' in input. */
-  };
-
-/* Information about parsing one data field. */
-struct data_in
-  {
-    const char *s;              /* Source start. */
-    const char *e;              /* Source end. */
-
-    union value *v;            /* Destination. */
-
-    int flags;                 /* Zero or more of DI_*. */
-    int f1, f2;                        /* Columns the field was taken from. */
-    struct fmt_spec format;    /* Format specification to use. */
-  };
-
-bool data_in (struct data_in *);
-
-void data_in_finite_line (struct data_in *di, const char *line, size_t len,
-                         int fc, int lc);
-
-#endif /* data-in.h */
+#include <libpspp/legacy-encoding.h>
+#include <libpspp/float-format.h>
+#include <libpspp/integer-format.h>
+#include <libpspp/str.h>
+#include <data/format.h>
+
+enum fmt_type;
+union value;
+bool data_in (struct substring input, const char *encoding,
+              enum fmt_type, int implied_decimals,
+              int first_column, int last_column,
+              union value *output, int width);
+
+#endif /* data/data-in.h */