Change terminology from "active file" to "active dataset".

[pspp-builds.git] / src / language / command.def

diff --git a/src/language/command.def b/src/language/command.def
index 2b00ea27b8138e2873d9c4a2f71c4b0a0cd0469d..016a14068a7787a7b48338b60d58aeaa8f73d0e7 100644 (file)
--- a/src/language/command.def
+++ b/src/language/command.def
@@ -16,13 +16,15 @@
 
 /* Utility commands acceptable anywhere. */
 DEF_CMD (S_ANY, F_ENHANCED, "CLOSE FILE HANDLE", cmd_close_file_handle)
-DEF_CMD (S_ANY, F_KEEP_FINAL_TOKEN, "COMMENT", cmd_comment)
+DEF_CMD (S_ANY, 0, "CACHE", cmd_cache)
 DEF_CMD (S_ANY, 0, "CD", cmd_cd)
+DEF_CMD (S_ANY, 0, "DO REPEAT", cmd_do_repeat)
+DEF_CMD (S_ANY, 0, "END REPEAT", cmd_end_repeat)
 DEF_CMD (S_ANY, 0, "ECHO", cmd_echo)
 DEF_CMD (S_ANY, 0, "ERASE", cmd_erase)
 DEF_CMD (S_ANY, 0, "EXIT", cmd_finish)
 DEF_CMD (S_ANY, 0, "FILE HANDLE", cmd_file_handle)
-DEF_CMD (S_ANY, F_KEEP_FINAL_TOKEN, "FILE LABEL", cmd_file_label)
+DEF_CMD (S_ANY, 0, "FILE LABEL", cmd_file_label)
 DEF_CMD (S_ANY, 0, "FINISH", cmd_finish)
 DEF_CMD (S_ANY, 0, "HOST", cmd_host)
 DEF_CMD (S_ANY, 0, "INCLUDE", cmd_include)
@@ -37,11 +39,11 @@ DEF_CMD (S_ANY, 0, "QUIT", cmd_finish)
 DEF_CMD (S_ANY, 0, "RESTORE", cmd_restore)
 DEF_CMD (S_ANY, 0, "SET", cmd_set)
 DEF_CMD (S_ANY, 0, "SHOW", cmd_show)
-DEF_CMD (S_ANY, F_KEEP_FINAL_TOKEN, "SUBTITLE", cmd_subtitle)
+DEF_CMD (S_ANY, 0, "SUBTITLE", cmd_subtitle)
 DEF_CMD (S_ANY, 0, "SYSFILE INFO", cmd_sysfile_info)
-DEF_CMD (S_ANY, F_KEEP_FINAL_TOKEN, "TITLE", cmd_title)
+DEF_CMD (S_ANY, 0, "TITLE", cmd_title)
 
-/* Commands that define (or replace) the active file. */
+/* Commands that define (or replace) the active dataset. */
 DEF_CMD (S_INITIAL | S_DATA, 0, "ADD FILES", cmd_add_files)
 DEF_CMD (S_INITIAL | S_DATA | S_INPUT_PROGRAM | S_FILE_TYPE, 0, "DATA LIST", cmd_data_list)
 DEF_CMD (S_INITIAL | S_DATA, 0, "GET", cmd_get)
@@ -60,10 +62,8 @@ DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "BREAK", cmd_break)
 DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "COMPUTE", cmd_compute)
 DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "DATAFILE ATTRIBUTE", cmd_datafile_attribute)
 DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "DISPLAY", cmd_display)
-DEF_CMD (S_DATA | S_INPUT_PROGRAM, F_KEEP_FINAL_TOKEN, "DOCUMENT", cmd_document)
+DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "DOCUMENT", cmd_document)
 DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "DO IF", cmd_do_if)
-DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "DO REPEAT", cmd_do_repeat)
-DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "END REPEAT", cmd_end_repeat)
 DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "DROP DOCUMENTS", cmd_drop_documents)
 DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "ELSE IF", cmd_else_if)
 DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "ELSE", cmd_else)
@@ -97,10 +97,10 @@ DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "WRITE", cmd_write)
 DEF_CMD (S_DATA | S_INPUT_PROGRAM, F_ENHANCED, "XEXPORT", cmd_xexport)
 DEF_CMD (S_DATA | S_INPUT_PROGRAM, 0, "XSAVE", cmd_xsave)
 
-/* Commands that may appear after active file definition. */
+/* Commands that may appear after active dataset definition. */
 DEF_CMD (S_DATA, 0, "AGGREGATE", cmd_aggregate)
 DEF_CMD (S_DATA, 0, "AUTORECODE", cmd_autorecode)
-DEF_CMD (S_DATA, F_KEEP_FINAL_TOKEN, "BEGIN DATA", cmd_begin_data)
+DEF_CMD (S_DATA, 0, "BEGIN DATA", cmd_begin_data)
 DEF_CMD (S_DATA, 0, "COUNT", cmd_count)
 DEF_CMD (S_DATA, 0, "CROSSTABS", cmd_crosstabs)
 DEF_CMD (S_DATA, 0, "CORRELATIONS", cmd_correlation)
@@ -127,7 +127,6 @@ DEF_CMD (S_DATA, 0, "SAMPLE", cmd_sample)
 DEF_CMD (S_DATA, 0, "SAVE", cmd_save)
 DEF_CMD (S_DATA, 0, "SAVE TRANSLATE", cmd_save_translate)
 DEF_CMD (S_DATA, 0, "SORT CASES", cmd_sort_cases)
-DEF_CMD (S_DATA, F_ABBREV, "SORT", cmd_sort_cases)
 DEF_CMD (S_DATA, 0, "T-TEST", cmd_t_test)
 DEF_CMD (S_DATA, 0, "TEMPORARY", cmd_temporary)
 DEF_CMD (S_DATA, 0, "USE", cmd_use)
@@ -158,7 +157,7 @@ UNIMPL_CMD ("CASESTOVARS", "Restructure complex data")
 UNIMPL_CMD ("CATPCA", "Categorical principle components analysis")
 UNIMPL_CMD ("CATREG", "Categorical regression")
 UNIMPL_CMD ("CCF", "Time series cross correlation")
-UNIMPL_CMD ("CLEAR TRANSFORMATIONS", "Clears transformations from active file")
+UNIMPL_CMD ("CLEAR TRANSFORMATIONS", "Clears transformations from active dataset")
 UNIMPL_CMD ("CLUSTER", "Hierachial clustering")
 UNIMPL_CMD ("CONJOINT", "Analyse full concept data")
 UNIMPL_CMD ("CORRESPONDENCE", "Show correspondence")
@@ -172,7 +171,12 @@ UNIMPL_CMD ("CSSELECT", "Select complex samples")
 UNIMPL_CMD ("CSTABULATE", "Tabulate complex samples")
 UNIMPL_CMD ("CTABLES", "Display complex samples")
 UNIMPL_CMD ("CURVEFIT", "Fit curve to line plot")
-UNIMPL_CMD ("DATASET", "Alternate data set")
+UNIMPL_CMD ("DATASET ACTIVATE", "Switch to alternate data set")
+UNIMPL_CMD ("DATASET CLOSE", "Delete alternate data set")
+UNIMPL_CMD ("DATASET COPY", "Duplicate alternate data set")
+UNIMPL_CMD ("DATASET DECLARE", "Start alternate data set")
+UNIMPL_CMD ("DATASET DISPLAY", "List alternate data sets")
+UNIMPL_CMD ("DATASET NAME", "Give the current data set a name")
 UNIMPL_CMD ("DATE", "Create time series data")
 UNIMPL_CMD ("DEFINE", "Syntax macros")
 UNIMPL_CMD ("DETECTANOMALY", "Find unusual cases")
@@ -201,10 +205,10 @@ UNIMPL_CMD ("MATRIX DATA", "Matrix data input")
 UNIMPL_CMD ("MCONVERT", "Convert covariance/correlation matrices")
 UNIMPL_CMD ("MEANS", cmd_means)
 UNIMPL_CMD ("MIXED", "Mixed linear models")
-UNIMPL_CMD ("MODEL CLOSE ", "Close server connection")
+UNIMPL_CMD ("MODEL CLOSE", "Close server connection")
 UNIMPL_CMD ("MODEL HANDLE", "Define server connection")
-UNIMPL_CMD ("MODEL LIST ", "Show existing models")
-UNIMPL_CMD ("MODEL NAME ", "Specify model label")
+UNIMPL_CMD ("MODEL LIST", "Show existing models")
+UNIMPL_CMD ("MODEL NAME", "Specify model label")
 UNIMPL_CMD ("MULTIPLE CORRESPONDENCE", "Multiple correspondence analysis")
 UNIMPL_CMD ("MULT RESPONSE", "Multiple reponse analysis")
 UNIMPL_CMD ("MVA", "Missing value analysis")