X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Finclude.c;h=52d0e09c91dec5b559e8c86104917f08cad2b5dd;hb=a258e53c63a08b0ec48aea8f03808eb651729424;hp=fe98aeb87f3347b82b61853adc70360cee87f132;hpb=9e0e4996fad6563f0a1ce628b80db5c23ef8279e;p=pspp-builds.git
diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c
index fe98aeb8..52d0e09c 100644
--- a/src/language/utilities/include.c
+++ b/src/language/utilities/include.c
@@ -15,17 +15,20 @@
along with this program. If not, see . */
#include
+
#include
#include
#include
#include
+#include
+
+#include
#include
-#include
-#include
-#include
#include
+#include
+#include
+#include
#include
-#include
#include "dirname.h"
#include "xalloc.h"
@@ -88,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;
}
}
@@ -106,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;
}
}
@@ -123,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;
}
}
@@ -173,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;