projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dataset: Rename functions with "dataset_" prefix.
[pspp-builds.git]
/
src
/
language
/
command.c
diff --git
a/src/language/command.c
b/src/language/command.c
index 703ae3ebceaf9c683926f231e31e3e5aa928b1a3..d9fc463315fac68b0b82e65fe148db107d696ae0 100644
(file)
--- a/
src/language/command.c
+++ b/
src/language/command.c
@@
-147,7
+147,7
@@
cmd_parse (struct lexer *lexer, struct dataset *ds)
{
const struct dictionary *dict = dataset_dict (ds);
return cmd_parse_in_state (lexer, ds,
{
const struct dictionary *dict = dataset_dict (ds);
return cmd_parse_in_state (lexer, ds,
-
proc_has_active_fil
e (ds) &&
+
dataset_has_sourc
e (ds) &&
dict_get_var_cnt (dict) > 0 ?
CMD_STATE_DATA : CMD_STATE_INITIAL);
}
dict_get_var_cnt (dict) > 0 ?
CMD_STATE_DATA : CMD_STATE_INITIAL);
}
@@
-541,6
+541,6
@@
cmd_erase (struct lexer *lexer, struct dataset *ds UNUSED)
int
cmd_new_file (struct lexer *lexer UNUSED, struct dataset *ds)
{
int
cmd_new_file (struct lexer *lexer UNUSED, struct dataset *ds)
{
-
proc_discard_active_file
(ds);
+
dataset_clear
(ds);
return CMD_SUCCESS;
}
return CMD_SUCCESS;
}