result = CMD_EOF;
goto finish;
}
- else if (lex_token (lexer) == '.')
+ else if (lex_token (lexer) == T_ENDCMD)
{
/* Null commands can result from extra empty lines. */
result = CMD_SUCCESS;
struct string s;
if (lex_token (lexer) == T_EXP
- || lex_token (lexer) == '*'
- || lex_token (lexer) == '[')
+ || lex_token (lexer) == T_ASTERISK
+ || lex_token (lexer) == T_LBRACK)
{
static const struct command c = { S_ANY, 0, "COMMENT", cmd_comment };
return &c;
ds_init_empty (&s);
for (;;)
{
- if (lex_token (lexer) == '-')
+ if (lex_token (lexer) == T_DASH)
ds_put_byte (&s, '-');
else if (lex_token (lexer) == T_ID)
{
if (!ds_is_empty (&s) && ds_last (&s) != '-')
ds_put_byte (&s, ' ');
- ds_put_cstr (&s, lex_tokid (lexer));
+ ds_put_cstr (&s, lex_tokcstr (lexer));
}
else if (lex_is_integer (lexer) && lex_integer (lexer) >= 0)
{
if (!lex_force_match_id (lexer, "FILE"))
return CMD_FAILURE;
- lex_match (lexer, '=');
+ lex_match (lexer, T_EQUALS);
if (!lex_force_string (lexer))
return CMD_FAILURE;
- if (remove (ds_cstr (lex_tokstr (lexer))) == -1)
+ if (remove (lex_tokcstr (lexer)) == -1)
{
msg (SW, _("Error removing `%s': %s."),
- ds_cstr (lex_tokstr (lexer)), strerror (errno));
+ lex_tokcstr (lexer), strerror (errno));
return CMD_FAILURE;
}