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

[pspp] / src / language / utilities / echo.c

diff --git a/src/language/utilities/echo.c b/src/language/utilities/echo.c
index 88ece636ad1e1ba1054c45d2fe16b3c6de187cf1..13fa72155645a94224dd2e96e9ca3990bec923cb 100644 (file)
--- a/src/language/utilities/echo.c
+++ b/src/language/utilities/echo.c
@@ -20,10 +20,14 @@
 #include "language/lexer/lexer.h"
 #include "libpspp/message.h"
 #include "libpspp/str.h"
-#include "output/text-item.h"
+#include "output/output-item.h"
+#include "output/driver.h"
 
 #include "gl/xalloc.h"
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 /* Echos a string to the output stream */
 int
 cmd_echo (struct lexer *lexer, struct dataset *ds UNUSED)
@@ -31,7 +35,8 @@ cmd_echo (struct lexer *lexer, struct dataset *ds UNUSED)
   if (!lex_force_string (lexer))
     return CMD_FAILURE;
 
-  text_item_submit (text_item_create (TEXT_ITEM_ECHO, lex_tokcstr (lexer)));
+  output_submit (text_item_create (TEXT_ITEM_LOG, lex_tokcstr (lexer),
+                                   _("Echo")));
   lex_get (lexer);
 
   return CMD_SUCCESS;