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 8ba8a08e4bb9458d3f9e9497826abdd3b16bbd4a..d9fc463315fac68b0b82e65fe148db107d696ae0 100644 (file)
--- a/src/language/command.c
+++ b/src/language/command.c
@@ -24,8 +24,8 @@
 #include <errno.h>
 
 #include "data/casereader.h"
+#include "data/dataset.h"
 #include "data/dictionary.h"
-#include "data/procedure.h"
 #include "data/settings.h"
 #include "data/variable.h"
 #include "language/lexer/command-name.h"
@@ -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,
-                            proc_has_active_file (ds) &&
+                            dataset_has_source (ds) &&
                             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)
 {
-  proc_discard_active_file (ds);
+  dataset_clear (ds);
   return CMD_SUCCESS;
 }