projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: Change the functions for retrieving token strings.
[pspp-builds.git]
/
src
/
language
/
command.c
diff --git
a/src/language/command.c
b/src/language/command.c
index 3da5da69919a510adbd56f4f39c79df1de31847b..3bf9571fa5a4065537ce1225a01fb42a1ff49559 100644
(file)
--- a/
src/language/command.c
+++ b/
src/language/command.c
@@
-288,7
+288,7
@@
parse_command_name (struct lexer *lexer)
{
if (!ds_is_empty (&s) && ds_last (&s) != '-')
ds_put_byte (&s, ' ');
{
if (!ds_is_empty (&s) && ds_last (&s) != '-')
ds_put_byte (&s, ' ');
- ds_put_cstr (&s, lex_tok
id
(lexer));
+ ds_put_cstr (&s, lex_tok
cstr
(lexer));
}
else if (lex_is_integer (lexer) && lex_integer (lexer) >= 0)
{
}
else if (lex_is_integer (lexer) && lex_integer (lexer) >= 0)
{
@@
-514,10
+514,10
@@
cmd_erase (struct lexer *lexer, struct dataset *ds UNUSED)
if (!lex_force_string (lexer))
return CMD_FAILURE;
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."),
{
msg (SW, _("Error removing `%s': %s."),
-
ds_cstr (lex_tokstr (lexer)
), strerror (errno));
+
lex_tokcstr (lexer
), strerror (errno));
return CMD_FAILURE;
}
return CMD_FAILURE;
}