lexer: Use lex_is_string() more consistently.

[pspp] / src / language / utilities / include.c

diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c
index ceb78771d748fb6f18bb8cb79274a23421720eab..52d0e09c91dec5b559e8c86104917f08cad2b5dd 100644 (file)
--- a/src/language/utilities/include.c
+++ b/src/language/utilities/include.c
@@ -91,8 +91,8 @@ cmd_insert (struct lexer *lexer, struct dataset *ds UNUSED)
            syntax_mode = GETL_BATCH;
          else
            {
-             lex_error(lexer,
-                       _("Expecting BATCH or INTERACTIVE after SYNTAX."));
+             lex_error (lexer, _("expecting %s or %s after %s"),
+                         "BATCH", "INTERACTIVE", "SYNTAX");
              return CMD_FAILURE;
            }
        }
@@ -109,7 +109,8 @@ cmd_insert (struct lexer *lexer, struct dataset *ds UNUSED)
            }
          else
            {
-             lex_error (lexer, _("Expecting YES or NO after CD."));
+             lex_error (lexer, _("expecting %s or %s after %s"),
+                         "YES", "NO", "CD");
              return CMD_FAILURE;
            }
        }
@@ -126,7 +127,8 @@ cmd_insert (struct lexer *lexer, struct dataset *ds UNUSED)
            }
          else
            {
-             lex_error (lexer, _("Expecting CONTINUE or STOP after ERROR."));
+             lex_error (lexer, _("expecting %s or %s after %s"),
+                         "CONTINUE", "STOP", "ERROR");
              return CMD_FAILURE;
            }
        }
@@ -176,7 +178,7 @@ parse_insert (struct lexer *lexer, char **filename)
     lex_match (lexer, '=');
 
   /* File name can be identifier or string. */
-  if (lex_token (lexer) != T_ID && lex_token (lexer) != T_STRING)
+  if (lex_token (lexer) != T_ID && !lex_is_string (lexer))
     {
       lex_error (lexer, _("expecting file name"));
       return CMD_FAILURE;