X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Fecho.c;h=88ece636ad1e1ba1054c45d2fe16b3c6de187cf1;hb=23c5ab34eec1b2c2fef34155620c7cab670175f0;hp=33d569f4acc9e80ff176ef649cedc88257f95631;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp
diff --git a/src/language/utilities/echo.c b/src/language/utilities/echo.c
index 33d569f4ac..88ece636ad 100644
--- a/src/language/utilities/echo.c
+++ b/src/language/utilities/echo.c
@@ -1,49 +1,38 @@
-/* PSPP - computes sample statistics. -*-c-*-
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc.
- Copyright (C) 2005 Free Software Foundation, Inc.
- Written by John Darrington 2005
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
-#include "message.h"
-#include "alloc.h"
-#include "str.h"
-#include "lexer.h"
-#include "command.h"
-#include "table.h"
-#include "manager.h"
+
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "output/text-item.h"
+
+#include "gl/xalloc.h"
/* Echos a string to the output stream */
int
-cmd_echo(void)
+cmd_echo (struct lexer *lexer, struct dataset *ds UNUSED)
{
- struct tab_table *tab;
-
- if (token != T_STRING)
+ if (!lex_force_string (lexer))
return CMD_FAILURE;
-
- tab = tab_create(1, 1, 0);
-
- tab_dim (tab, tab_natural_dimensions);
- tab_flags (tab, SOMF_NO_TITLE );
-
- tab_text(tab, 0, 0, 0, tokstr.string);
- tab_submit(tab);
+ text_item_submit (text_item_create (TEXT_ITEM_ECHO, lex_tokcstr (lexer)));
+ lex_get (lexer);
return CMD_SUCCESS;
}