Update all #include directives to the currently preferred style.

[pspp-builds.git] / src / language / data-io / get-data.c

diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c
index cb57ad46897749c3f56c607802274a2a09198b41..7e75b413ea49cf82fcb87a81daea8ba570e4b905 100644 (file)
--- a/src/language/data-io/get-data.c
+++ b/src/language/data-io/get-data.c
@@ -18,23 +18,22 @@
 
 #include <stdlib.h>
 
-#include <data/gnumeric-reader.h>
-#include <data/psql-reader.h>
-
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/settings.h>
-#include <language/command.h>
-#include <language/data-io/data-parser.h>
-#include <language/data-io/data-reader.h>
-#include <language/data-io/file-handle.h>
-#include <language/data-io/placement-parser.h>
-#include <language/lexer/format-parser.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
-
-#include "xalloc.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/gnumeric-reader.h"
+#include "data/procedure.h"
+#include "data/psql-reader.h"
+#include "data/settings.h"
+#include "language/command.h"
+#include "language/data-io/data-parser.h"
+#include "language/data-io/data-reader.h"
+#include "language/data-io/file-handle.h"
+#include "language/data-io/placement-parser.h"
+#include "language/lexer/format-parser.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -163,6 +162,7 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds)
        {
          lex_match (lexer, T_EQUALS);
          gri.asw = lex_integer (lexer);
+         lex_get (lexer);
        }
       else if (lex_match_id (lexer, "SHEET"))
        {
@@ -174,10 +174,13 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds)
 
              gri.sheet_name = ss_xstrdup (lex_tokss (lexer));
              gri.sheet_index = -1;
+
+             lex_get (lexer);
            }
          else if (lex_match_id (lexer, "INDEX"))
            {
              gri.sheet_index = lex_integer (lexer);
+             lex_get (lexer);
            }
          else
            goto error;
@@ -189,7 +192,6 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds)
          if (lex_match_id (lexer, "FULL"))
            {
              gri.cell_range = NULL;
-             lex_put_back (lexer, T_ID);
            }
          else if (lex_match_id (lexer, "RANGE"))
            {
@@ -197,6 +199,7 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds)
                goto error;
 
              gri.cell_range = ss_xstrdup (lex_tokss (lexer));
+             lex_get (lexer);
            }
          else
            goto error;
@@ -215,14 +218,12 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds)
            }
          else
            goto error;
-         lex_put_back (lexer, T_ID);
        }
       else
        {
-         printf ("Unknown data file type `%s'\n", lex_tokcstr (lexer));
+         lex_error (lexer, NULL);
          goto error;
        }
-      lex_get (lexer);
     }
 
   {