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
/
data-io
/
data-list.c
diff --git
a/src/language/data-io/data-list.c
b/src/language/data-io/data-list.c
index aec243a59256cdcb858847acc39795a82a634536..046c7b0e0cc165001f35dc0c04d2b572bdf8f7b6 100644
(file)
--- a/
src/language/data-io/data-list.c
+++ b/
src/language/data-io/data-list.c
@@
-108,7
+108,7
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
if (!lex_force_string (lexer))
goto error;
if (!lex_force_string (lexer))
goto error;
- ds_init_s
tring (&encoding, lex_tokstr
(lexer));
+ ds_init_s
ubstring (&encoding, lex_tokss
(lexer));
lex_get (lexer);
}
lex_get (lexer);
}
@@
-147,9
+147,9
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
lex_match (lexer, T_EQUALS);
if (!lex_force_id (lexer))
goto error;
lex_match (lexer, T_EQUALS);
if (!lex_force_id (lexer))
goto error;
- end = dict_lookup_var (dict, lex_tok
id
(lexer));
+ end = dict_lookup_var (dict, lex_tok
cstr
(lexer));
if (!end)
if (!end)
- end = dict_create_var_assert (dict, lex_tok
id
(lexer), 0);
+ end = dict_create_var_assert (dict, lex_tok
cstr
(lexer), 0);
lex_get (lexer);
}
else if (lex_match_id (lexer, "NOTABLE"))
lex_get (lexer);
}
else if (lex_match_id (lexer, "NOTABLE"))
@@
-197,9
+197,9
@@
cmd_data_list (struct lexer *lexer, struct dataset *ds)
if (lex_match_id (lexer, "TAB"))
delim = '\t';
else if (lex_is_string (lexer)
if (lex_match_id (lexer, "TAB"))
delim = '\t';
else if (lex_is_string (lexer)
- &&
ds_length (lex_tokstr
(lexer)) == 1)
+ &&
ss_length (lex_tokss
(lexer)) == 1)
{
{
- delim =
ds_first (lex_tokstr
(lexer));
+ delim =
ss_first (lex_tokss
(lexer));
lex_get (lexer);
}
else
lex_get (lexer);
}
else