MATRIX: Prevent from appearing inside DO IF or LOOP.

Thanks to Zhou Geng for reporting this bug as poc3 in the report here:
https://lists.gnu.org/archive/html/bug-gnu-pspp/2024-03/msg00015.html

diff --git a/src/language/command.def b/src/language/command.def
index f91669b88bcffe9f14276dd44748cbc1f626f786..c754aacfbfc8dab86fbb03d26462c819f46e93de 100644 (file)
--- a/src/language/command.def
+++ b/src/language/command.def
@@ -31,7 +31,6 @@ DEF_CMD (S_ANY, 0, "FINISH", N_("Finish"), cmd_finish)
 DEF_CMD (S_ANY, 0, "HOST", N_("Host"), cmd_host)
 DEF_CMD (S_ANY, 0, "INCLUDE", N_("Include"), cmd_include)
 DEF_CMD (S_ANY, 0, "INSERT", N_("Insert"), cmd_insert)
-DEF_CMD (S_ANY, 0, "MATRIX", N_("Matrix"), cmd_matrix)
 DEF_CMD (S_ANY, 0, "MCONVERT", N_("Matri Convert"), cmd_mconvert)
 DEF_CMD (S_ANY, 0, "N OF CASES", N_("N of Cases"), cmd_n_of_cases)
 DEF_CMD (S_ANY, F_ABBREV, "N", N_("N"), cmd_n_of_cases)
@@ -65,6 +64,7 @@ DEF_CMD (S_INITIAL | S_DATA, 0, "DATASET CLOSE", N_("Dataset Close"), cmd_datase
 DEF_CMD (S_INITIAL | S_DATA, 0, "DATASET COPY", N_("Dataset Copy"), cmd_dataset_copy)
 DEF_CMD (S_INITIAL | S_DATA, 0, "DATASET NAME", N_("Dataset Name"), cmd_dataset_name)
 DEF_CMD (S_INITIAL | S_DATA, 0, "DATASET DISPLAY", N_("Dataset Display"), cmd_dataset_display)
+DEF_CMD (S_INITIAL | S_DATA, 0, "MATRIX", N_("Matrix"), cmd_matrix)
 
 /* Utilities that may appear after active file definition or within INPUT PROGRAM. */
 DEF_CMD (S_DATA | S_INPUT_PROGRAM | S_NESTED_ANY, 0, "ADD VALUE LABELS", N_("Add Value Labels"), cmd_add_value_labels)