Make the expression code a little nicer and fix bugs found

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

diff --git a/src/command.def b/src/command.def
index 790ed05dc265219c7a8f77bfe63186bceecdabba..09f809cd4c30adb755d68b69f4c257cb73e8549a 100644 (file)
--- a/src/command.def
+++ b/src/command.def
@@ -24,13 +24,12 @@
 #define PROC STATE_PROC
 #define ERRO STATE_ERROR
 
-DEFCMD ("@",                      INIT, INPU, TRAN, PROC, cmd_include_at)
 UNIMPL ("ADD FILES",              TRAN, ERRO, TRAN, TRAN)
 DEFCMD ("ADD VALUE LABELS",       ERRO, INPU, TRAN, TRAN, cmd_add_value_labels)
 DEFCMD ("AGGREGATE",              ERRO, ERRO, PROC, TRAN, cmd_aggregate)
 DEFCMD ("APPLY DICTIONARY",       ERRO, ERRO, TRAN, TRAN, cmd_apply_dictionary)
 DEFCMD ("AUTORECODE",             ERRO, ERRO, PROC, PROC, cmd_autorecode)
-DEFCMD ("BEGIN DATA",             ERRO, ERRO, PROC, PROC, cmd_begin_data)
+SPCCMD ("BEGIN DATA",             ERRO, ERRO, PROC, PROC, cmd_begin_data)
 DEFCMD ("BREAK",                  ERRO, INPU, TRAN, TRAN, cmd_break)
 UNIMPL ("CASESTOVARS",           ERRO, ERRO, PROC, PROC)
 DEFCMD ("CLEAR TRANSFORMATIONS",  ERRO, INPU, TRAN, TRAN, cmd_clear_transformations)
@@ -40,11 +39,12 @@ DEFCMD ("CONDESCRIPTIVES",        ERRO, ERRO, PROC, PROC, cmd_descriptives)
 DEFCMD ("COUNT",                  ERRO, INPU, TRAN, TRAN, cmd_count)
 DEFCMD ("CROSSTABS",              ERRO, ERRO, PROC, PROC, cmd_crosstabs)
 DEFCMD ("DATA LIST",              TRAN, INPU, TRAN, TRAN, cmd_data_list)
+DEFCMD ("DEBUG EVALUATE",        INIT, INPU, TRAN, PROC, cmd_debug_evaluate)
 DEFCMD ("DESCRIPTIVES",           ERRO, ERRO, PROC, PROC, cmd_descriptives)
 DEFCMD ("DISPLAY",                ERRO, INPU, TRAN, PROC, cmd_display)
 DEFCMD ("DO IF",                  ERRO, INPU, TRAN, TRAN, cmd_do_if)
 DEFCMD ("DO REPEAT",              ERRO, INPU, TRAN, TRAN, cmd_do_repeat)
-DEFCMD ("DOCUMENT",               ERRO, INPU, TRAN, TRAN, cmd_document)
+SPCCMD ("DOCUMENT",               ERRO, INPU, TRAN, TRAN, cmd_document)
 DEFCMD ("DROP DOCUMENTS",         INIT, INPU, TRAN, PROC, cmd_drop_documents)
 UNIMPL ("EDIT",                   INIT, INPU, TRAN, PROC)
 DEFCMD ("ELSE",                   ERRO, INPU, TRAN, TRAN, cmd_else)
@@ -57,12 +57,11 @@ DEFCMD ("END INPUT PROGRAM",      ERRO, TRAN, ERRO, ERRO, cmd_end_input_program)
 DEFCMD ("END LOOP",               ERRO, INPU, TRAN, TRAN, cmd_end_loop)
 DEFCMD ("END REPEAT",             ERRO, INPU, TRAN, TRAN, cmd_end_repeat)
 DEFCMD ("ERASE",                  INIT, INPU, TRAN, PROC, cmd_erase)
-DEFCMD ("EVALUATE",               INIT, INPU, TRAN, PROC, cmd_evaluate)
 DEFCMD ("EXECUTE",                ERRO, ERRO, PROC, PROC, cmd_execute)
 DEFCMD ("EXIT",                   INIT, INPU, TRAN, PROC, cmd_exit)
 DEFCMD ("EXPORT",                 ERRO, ERRO, PROC, PROC, cmd_export)
 DEFCMD ("FILE HANDLE",            INIT, INPU, TRAN, PROC, cmd_file_handle)
-DEFCMD ("FILE LABEL",             INIT, INPU, TRAN, PROC, cmd_file_label)
+SPCCMD ("FILE LABEL",             INIT, INPU, TRAN, PROC, cmd_file_label)
 DEFCMD ("FILE TYPE",              INPU, ERRO, INPU, INPU, cmd_file_type)
 DEFCMD ("FILTER",                 ERRO, ERRO, TRAN, TRAN, cmd_filter)
 DEFCMD ("FINISH",                 INIT, INPU, TRAN, PROC, cmd_finish)
@@ -87,6 +86,7 @@ DEFCMD ("MEANS",                  ERRO, ERRO, PROC, PROC, cmd_means)
 DEFCMD ("MISSING VALUES",         ERRO, INPU, TRAN, TRAN, cmd_missing_values)
 DEFCMD ("MODIFY VARS",            ERRO, ERRO, TRAN, PROC, cmd_modify_vars)
 DEFCMD ("NEW FILE",               INIT, ERRO, INIT, INIT, cmd_new_file)
+DEFCMD ("N",                      INIT, INPU, TRAN, TRAN, cmd_n_of_cases)
 DEFCMD ("N OF CASES",             INIT, INPU, TRAN, TRAN, cmd_n_of_cases)
 UNIMPL ("NUMBERED",               INIT, INPU, TRAN, PROC)
 DEFCMD ("NUMERIC",                ERRO, INPU, TRAN, TRAN, cmd_numeric)
@@ -105,7 +105,6 @@ DEFCMD ("QUIT",                   INIT, INPU, TRAN, PROC, cmd_exit)
 DEFCMD ("RECODE",                 ERRO, INPU, TRAN, TRAN, cmd_recode)
 DEFCMD ("RECORD TYPE",            ERRO, INPU, ERRO, ERRO, cmd_record_type)
 UNIMPL ("REFORMAT",               ERRO, ERRO, TRAN, TRAN)
-DEFCMD ("REMARK",                 INIT, INPU, TRAN, PROC, cmd_remark)
 DEFCMD ("RENAME VARIABLES",       ERRO, INPU, TRAN, PROC, cmd_rename_variables)
 DEFCMD ("REPEATING DATA",         ERRO, INPU, ERRO, ERRO, cmd_repeating_data)
 DEFCMD ("REREAD",                 ERRO, INPU, ERRO, ERRO, cmd_reread)
@@ -114,16 +113,18 @@ DEFCMD ("SAMPLE",                 ERRO, ERRO, TRAN, TRAN, cmd_sample)
 DEFCMD ("SAVE",                   ERRO, ERRO, PROC, PROC, cmd_save)
 DEFCMD ("SELECT IF",              ERRO, ERRO, TRAN, TRAN, cmd_select_if)
 DEFCMD ("SET",                    INIT, INPU, TRAN, PROC, cmd_set)
-UNIMPL ("SHOW",                   INIT, INPU, TRAN, PROC)
+DEFCMD ("SHOW",                   INIT, INPU, TRAN, PROC, cmd_show)
+DEFCMD ("SORT",                   ERRO, ERRO, PROC, PROC, cmd_sort_cases)
 DEFCMD ("SORT CASES",             ERRO, ERRO, PROC, PROC, cmd_sort_cases)
 DEFCMD ("SPLIT FILE",             ERRO, INPU, TRAN, TRAN, cmd_split_file)
 DEFCMD ("STRING",                 ERRO, INPU, TRAN, TRAN, cmd_string)
-DEFCMD ("SUBTITLE",               INIT, INPU, TRAN, PROC, cmd_subtitle)
+SPCCMD ("SUBTITLE",               INIT, INPU, TRAN, PROC, cmd_subtitle)
 DEFCMD ("SYSFILE INFO",           INIT, INPU, TRAN, PROC, cmd_sysfile_info)
 DEFCMD ("TEMPORARY",              ERRO, ERRO, TRAN, TRAN, cmd_temporary)
-DEFCMD ("TITLE",                  INIT, INPU, TRAN, PROC, cmd_title)
+SPCCMD ("TITLE",                  INIT, INPU, TRAN, PROC, cmd_title)
 DEFCMD ("T-TEST",                 ERRO, ERRO, PROC, PROC, cmd_t_test)
 UNIMPL ("UPDATE",                 TRAN, ERRO, TRAN, TRAN)
+DEFCMD ("USE",                   ERRO, ERRO, TRAN, TRAN, cmd_use)
 DEFCMD ("VALUE LABELS",           ERRO, INPU, TRAN, TRAN, cmd_value_labels)
 DEFCMD ("VARIABLE LABELS",        ERRO, INPU, TRAN, TRAN, cmd_variable_labels)
 UNIMPL ("VARSTOCASES",           ERRO, ERRO, PROC, PROC)