projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: New function lex_error_expecting().
[pspp-builds.git]
/
src
/
language
/
utilities
/
include.c
diff --git
a/src/language/utilities/include.c
b/src/language/utilities/include.c
index bcee162c6a04f56e44a01164d0c7af87662cba62..89da3b9bf517b86f7dff167a0acec0842c014852 100644
(file)
--- a/
src/language/utilities/include.c
+++ b/
src/language/utilities/include.c
@@
-106,8
+106,8
@@
do_insert (struct lexer *lexer, struct dataset *ds, enum variant variant)
syntax_mode = LEX_SYNTAX_AUTO;
else
{
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;
}
}
goto exit;
}
}
@@
-124,8
+124,7
@@
do_insert (struct lexer *lexer, struct dataset *ds, enum variant variant)
}
else
{
}
else
{
- lex_error (lexer, _("expecting %s or %s after %s"),
- "YES", "NO", "CD");
+ lex_error_expecting (lexer, "YES", "NO", NULL_SENTINEL);
goto exit;
}
}
goto exit;
}
}
@@
-142,8
+141,7
@@
do_insert (struct lexer *lexer, struct dataset *ds, enum variant variant)
}
else
{
}
else
{
- lex_error (lexer, _("expecting %s or %s after %s"),
- "CONTINUE", "STOP", "ERROR");
+ lex_error_expecting (lexer, "CONTINUE", "STOP", NULL_SENTINEL);
goto exit;
}
}
goto exit;
}
}