cw = true;
else
{
- lex_error_expecting (lexer, "READONLY", "WRITEABLE",
- NULL_SENTINEL);
+ lex_error_expecting (lexer, "READONLY", "WRITEABLE");
goto error;
}
sysfile_opts.create_writeable = porfile_opts.create_writeable = cw;
*retain_unselected = false;
else
{
- lex_error_expecting (lexer, "RETAIN", "DELETE", NULL_SENTINEL);
+ lex_error_expecting (lexer, "RETAIN", "DELETE");
goto error;
}
}
&& lex_match_id (lexer, "VERSION"))
{
lex_match (lexer, T_EQUALS);
- if (!lex_force_int (lexer))
+ if (!lex_force_int_range (lexer, "VERSION", 2, 3))
goto error;
sysfile_opts.version = lex_integer (lexer);
lex_get (lexer);
porfile_opts.type = PFM_TAPE;
else
{
- lex_error_expecting (lexer, "COMM", "TAPE", NULL_SENTINEL);
+ lex_error_expecting (lexer, "COMM", "TAPE");
goto error;
}
}
else if (writer_type == PORFILE_WRITER && lex_match_id (lexer, "DIGITS"))
{
lex_match (lexer, T_EQUALS);
- if (!lex_force_int (lexer))
+ if (!lex_force_int_range (lexer, "DIGITS", 1, INT_MAX))
goto error;
porfile_opts.digits = lex_integer (lexer);
lex_get (lexer);
}
- else if (!parse_dict_trim (lexer, dict))
+ else if (!parse_dict_trim (lexer, dict, false))
goto error;
if (!lex_match (lexer, T_SLASH))