output: Introduce group_item in place of TEXT_ITEM_COMMAND_OPEN and CLOSE.

[pspp] / src / language / command.c

diff --git a/src/language/command.c b/src/language/command.c
index 788759113136e6e7570b4ebcfeb00eb9e8427526..0a198bc94c4f6015c128477cd9641abc42136030 100644 (file)
--- a/src/language/command.c
+++ b/src/language/command.c
@@ -36,7 +36,7 @@
 #include "libpspp/i18n.h"
 #include "libpspp/message.h"
 #include "libpspp/str.h"
-#include "output/text-item.h"
+#include "output/group-item.h"
 
 #include "xalloc.h"
 #include "xmalloca.h"
@@ -199,7 +199,7 @@ do_parse_command (struct lexer *lexer,
       result = CMD_FAILURE;
       goto finish;
     }
-  text_item_submit (text_item_create (TEXT_ITEM_COMMAND_OPEN, command->name));
+  group_open_item_submit (group_open_item_create (command->name));
   opened = true;
 
   if (command->function == NULL)
@@ -247,8 +247,7 @@ finish:
       lex_get (lexer);
 
   if (opened)
-    text_item_submit (text_item_create (TEXT_ITEM_COMMAND_CLOSE,
-                                        command->name));
+    group_close_item_submit (group_close_item_create ());
 
   return result;
 }
@@ -413,7 +412,7 @@ report_state_mismatch (const struct command *command, enum cmd_state state)
               command->name, "FILE TYPE");
           break;
         case S_INPUT_PROGRAM | S_FILE_TYPE:
-          msg (SE, _("%s is allowed only inside %s or inside %s."), command->name, 
+          msg (SE, _("%s is allowed only inside %s or inside %s."), command->name,
               "INPUT PROGRAM", "FILE TYPE");
           break;