Rewrite PSPP output engine.

[pspp-builds.git] / src / language / utilities / echo.c

diff --git a/src/language/utilities/echo.c b/src/language/utilities/echo.c
index fe148ab8359abf9a3221299ae9733e3c46361e2b..ebd6a990fc88e1c1c02a48a7562fd91d4fccdc32 100644 (file)
--- a/src/language/utilities/echo.c
+++ b/src/language/utilities/echo.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,12 +16,12 @@
 
 #include <config.h>
 #include <libpspp/message.h>
-#include <libpspp/alloc.h>
 #include <libpspp/str.h>
 #include <language/lexer/lexer.h>
 #include <language/command.h>
-#include <output/table.h>
-#include <output/manager.h>
+#include <output/tab.h>
+
+#include "xalloc.h"
 
 /* Echos a string to the output stream */
 int
@@ -32,10 +32,7 @@ cmd_echo (struct lexer *lexer, struct dataset *ds UNUSED)
   if (lex_token (lexer) != T_STRING)
     return CMD_FAILURE;
 
-  tab = tab_create(1, 1, 0);
-
-  tab_dim (tab, tab_natural_dimensions);
-  tab_flags (tab, SOMF_NO_TITLE );
+  tab = tab_create(1, 1);
 
   tab_text(tab, 0, 0, 0, ds_cstr (lex_tokstr (lexer)));