From d6850d8b37aed424e3d35ca1439243220678b72a Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 6 Feb 2011 13:39:38 -0800 Subject: [PATCH] GET DATA: Get rid of lex_put_back(). An upcoming commit will get rid of lex_put_back(), so don't use it here. --- src/language/data-io/get-data.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c index cb57ad46..f055af2d 100644 --- a/src/language/data-io/get-data.c +++ b/src/language/data-io/get-data.c @@ -163,6 +163,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 +175,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 +193,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 +200,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 +219,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); } { -- 2.30.2