output-item: Collapse the inheritance hierarchy into a single struct.

[pspp] / src / language / command.c

diff --git a/src/language/command.c b/src/language/command.c
index 788759113136e6e7570b4ebcfeb00eb9e8427526..3c98c3feda1e2c45a860da84072348e78184a8f5 100644 (file)
--- a/src/language/command.c
+++ b/src/language/command.c
@@ -36,9 +36,8 @@
 #include "libpspp/i18n.h"
 #include "libpspp/message.h"
 #include "libpspp/str.h"
-#include "output/text-item.h"
+#include "output/output-item.h"
 
-#include "xalloc.h"
 #include "xmalloca.h"
 
 #include "gettext.h"
@@ -199,7 +198,9 @@ do_parse_command (struct lexer *lexer,
       result = CMD_FAILURE;
       goto finish;
     }
-  text_item_submit (text_item_create (TEXT_ITEM_COMMAND_OPEN, command->name));
+  output_item_submit (group_open_item_create_nocopy (
+                        utf8_to_title (command->name),
+                        utf8_to_title (command->name)));
   opened = true;
 
   if (command->function == NULL)
@@ -247,8 +248,7 @@ finish:
       lex_get (lexer);
 
   if (opened)
-    text_item_submit (text_item_create (TEXT_ITEM_COMMAND_CLOSE,
-                                        command->name));
+    output_item_submit (group_close_item_create ());
 
   return result;
 }
@@ -413,7 +413,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;
 
@@ -443,7 +443,7 @@ report_state_mismatch (const struct command *command, enum cmd_state state)
     }
   else if (state == CMD_STATE_INPUT_PROGRAM)
     msg (SE, _("%s is not allowed inside %s."),
-        command->name, "INPUT PROGRAM" );
+        command->name, "INPUT PROGRAM");
   else if (state == CMD_STATE_FILE_TYPE)
     msg (SE, _("%s is not allowed inside %s."), command->name, "FILE TYPE");