X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Finclude.c;h=a05456e2a2e8ff7366556865d1eb1e40b023f239;hb=18e998adf231aef51c477bd26d60c65334d19436;hp=bcee162c6a04f56e44a01164d0c7af87662cba62;hpb=fe8dc2171009e90d2335f159d05f7e6660e24780;p=pspp

diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c
index bcee162c6a..a05456e2a2 100644
--- a/src/language/utilities/include.c
+++ b/src/language/utilities/include.c
@@ -59,12 +59,8 @@ do_insert (struct lexer *lexer, struct dataset *ds, enum variant variant)
   if (lex_match_id (lexer, "FILE"))
     lex_match (lexer, T_EQUALS);
 
-  /* File name can be identifier or string. */
-  if (lex_token (lexer) != T_ID && !lex_is_string (lexer))
-    {
-      lex_error (lexer, _("expecting file name"));
-      return CMD_FAILURE;
-    }
+  if (!lex_force_string_or_id (lexer))
+    return CMD_FAILURE;
 
   relative_name = utf8_to_filename (lex_tokcstr (lexer)); 
   filename = include_path_search (relative_name);
@@ -106,8 +102,8 @@ do_insert (struct lexer *lexer, struct dataset *ds, enum variant variant)
 	    syntax_mode = LEX_SYNTAX_AUTO;
 	  else
 	    {
-	      lex_error (lexer, _("expecting %s, %s, or %s after %s"),
-                         "BATCH", "INTERACTIVE", "AUTO", "SYNTAX");
+	      lex_error_expecting (lexer, "BATCH", "INTERACTIVE", "AUTO",
+                                   NULL_SENTINEL);
 	      goto exit;
 	    }
 	}
@@ -124,8 +120,7 @@ do_insert (struct lexer *lexer, struct dataset *ds, enum variant variant)
 	    }
 	  else
 	    {
-	      lex_error (lexer, _("expecting %s or %s after %s"),
-                         "YES", "NO", "CD");
+	      lex_error_expecting (lexer, "YES", "NO", NULL_SENTINEL);
 	      goto exit;
 	    }
 	}
@@ -142,8 +137,7 @@ do_insert (struct lexer *lexer, struct dataset *ds, enum variant variant)
 	    }
 	  else
 	    {
-	      lex_error (lexer, _("expecting %s or %s after %s"),
-                         "CONTINUE", "STOP", "ERROR");
+	      lex_error_expecting (lexer, "CONTINUE", "STOP", NULL_SENTINEL);
 	      goto exit;
 	    }
 	}