projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'gtk3'.
[pspp]
/
src
/
language
/
utilities
/
echo.c
diff --git
a/src/language/utilities/echo.c
b/src/language/utilities/echo.c
index 3d3c2c40e73ebde043d0be174f37205e41b3d5f8..88ece636ad1e1ba1054c45d2fe16b3c6de187cf1 100644
(file)
--- a/
src/language/utilities/echo.c
+++ b/
src/language/utilities/echo.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2009
, 2010
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
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
@@
-15,32
+15,24
@@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-#include <language/lexer/lexer.h>
-#include <language/command.h>
-#include <output/table.h>
-#include <output/manager.h>
-#include "xalloc.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 (struct lexer *lexer, struct dataset *ds UNUSED)
{
/* Echos a string to the output stream */
int
cmd_echo (struct lexer *lexer, struct dataset *ds UNUSED)
{
- struct tab_table *tab;
-
- if (lex_token (lexer) != T_STRING)
+ if (!lex_force_string (lexer))
return CMD_FAILURE;
return CMD_FAILURE;
- tab = tab_create(1, 1);
-
- tab_dim (tab, tab_natural_dimensions, NULL, NULL);
- tab_flags (tab, SOMF_NO_TITLE );
-
- tab_text(tab, 0, 0, 0, ds_cstr (lex_tokstr (lexer)));
-
- tab_submit(tab);
+ text_item_submit (text_item_create (TEXT_ITEM_ECHO, lex_tokcstr (lexer)));
+ lex_get (lexer);
return CMD_SUCCESS;
}
return CMD_SUCCESS;
}