projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Continue reforming procedure execution. In this phase, move
[pspp-builds.git]
/
src
/
language
/
data-io
/
data-reader.c
diff --git
a/src/language/data-io/data-reader.c
b/src/language/data-io/data-reader.c
index 988735dd91041d4b2b5e972f1b8e8a96dcc36dee..a8b484d469010808af15ac90e9098225086c9123 100644
(file)
--- a/
src/language/data-io/data-reader.c
+++ b/
src/language/data-io/data-reader.c
@@
-18,21
+18,24
@@
02110-1301, USA. */
#include <config.h>
02110-1301, USA. */
#include <config.h>
+
#include <language/data-io/data-reader.h>
#include <language/data-io/data-reader.h>
+
#include <ctype.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
-#include <language/command.h>
-#include <libpspp/message.h>
-#include <language/data-io/file-handle.h>
+
#include <data/file-handle-def.h>
#include <data/file-name.h>
#include <data/file-handle-def.h>
#include <data/file-name.h>
-#include <language/line-buffer.h>
+#include <data/procedure.h>
+#include <language/command.h>
+#include <language/data-io/file-handle.h>
#include <language/lexer/lexer.h>
#include <language/lexer/lexer.h>
+#include <language/line-buffer.h>
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
#include <libpspp/str.h>
#include <libpspp/str.h>
-#include <procedure.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-50,7
+53,7
@@
enum dfm_reader_flags
struct dfm_reader
{
struct file_handle *fh; /* File handle. */
struct dfm_reader
{
struct file_handle *fh; /* File handle. */
- struct
file_locator where;
/* Current location in data file. */
+ struct
msg_locator where;
/* Current location in data file. */
struct string line; /* Current line. */
struct string scratch; /* Extra line buffer. */
enum dfm_reader_flags flags; /* Zero or more of DFM_*. */
struct string line; /* Current line. */
struct string scratch; /* Extra line buffer. */
enum dfm_reader_flags flags; /* Zero or more of DFM_*. */
@@
-392,7
+395,7
@@
void
dfm_push (struct dfm_reader *r)
{
if (r->fh != fh_inline_file ())
dfm_push (struct dfm_reader *r)
{
if (r->fh != fh_inline_file ())
-
err_push_file
_locator (&r->where);
+
msg_push_msg
_locator (&r->where);
}
/* Pops the file name and line number from the fn/ln stack. */
}
/* Pops the file name and line number from the fn/ln stack. */
@@
-400,7
+403,7
@@
void
dfm_pop (struct dfm_reader *r)
{
if (r->fh != fh_inline_file ())
dfm_pop (struct dfm_reader *r)
{
if (r->fh != fh_inline_file ())
-
err_pop_file
_locator (&r->where);
+
msg_pop_msg
_locator (&r->where);
}
\f
/* BEGIN DATA...END DATA procedure. */
}
\f
/* BEGIN DATA...END DATA procedure. */