Added the ECHO command.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 3a6cdcdde787530c360e3367e0cd50629d87be67..03e18cac59045b88a7bb1e47ea11974d66785163 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+Wed Apr 27 07:44:57 WST 2005 John Darrington <john@darrington.wattle.id.au>
+
+       * utilities.texi: Added the ECHO command.
+
 Fri Apr 15 18:35:42 2005  Ben Pfaff  <blp@gnu.org>
 
        * pspp.texinfo: Change manual license to GNU FDL, pursuant to

diff --git a/doc/utilities.texi b/doc/utilities.texi
index e59e96fa651fece8e23e0318450cdac97fb21917..67035315129375b73560e030c05ee55b05bec314 100644 (file)
--- a/doc/utilities.texi
+++ b/doc/utilities.texi
@@ -14,6 +14,7 @@ encountered in the input.
 * DISPLAY DOCUMENTS::           Display active file documents.
 * DISPLAY FILE LABEL::          Display the active file label.
 * DROP DOCUMENTS::              Remove documents from the active file.
+* ECHO::                        Write a string to the output stream.
 * ERASE::                       Erase a file.
 * EXECUTE::                     Execute pending transformations.
 * FILE LABEL::                  Set the active file's label.
@@ -88,7 +89,7 @@ DISPLAY FILE LABEL.
 active file,
 if any.  @xref{FILE LABEL}.
 
-@node DROP DOCUMENTS, ERASE, DISPLAY FILE LABEL, Utilities
+@node DROP DOCUMENTS, ECHO, DISPLAY FILE LABEL, Utilities
 @section DROP DOCUMENTS
 @vindex DROP DOCUMENTS
 
@@ -102,8 +103,17 @@ New documents can be added with @cmd{DOCUMENT} (@pxref{DOCUMENT}).
 @cmd{DROP DOCUMENTS} changes only the active file.  It does not modify any
 system files stored on disk.
 
+@node ECHO, ERASE, DROP DOCUMENTS, Utilities
+@section ECHO
+@vindex ECHO
 
-@node ERASE, EXECUTE, DROP DOCUMENTS, Utilities
+@display 
+ECHO 'arbitrary text' .
+@end display
+
+Use @cmd{ECHO} to write arbitrary text to the output stream. The text should be enclosed in quotation marks following the normal rules for string tokens (@pxref{Tokens}).
+
+@node ERASE, EXECUTE, ECHO, Utilities
 @comment  node-name,  next,  previous,  up
 @section ERASE
 @vindex ERASE

diff --git a/po/en_GB.po b/po/en_GB.po
index c93f865643c63ffa057bce92aa56aaaf96522e64..6a7a0b06a8dcf31b215bce2e92bcf2f38ab02a7c 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.3.1\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2005-04-25 22:30-0700\n"
+"POT-Creation-Date: 2005-04-27 07:45+0800\n"
 "PO-Revision-Date: 2004-01-23 13:04+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: John Darrington <john@darrington.wattle.id.au>\n"
@@ -1227,6 +1227,25 @@ msgstr ""
 msgid "installation error"
 msgstr ""
 
+#: src/filename.c:221
+#, c-format
+msgid "Searching for `%s'..."
+msgstr ""
+
+#: src/filename.c:229 src/filename.c:261
+msgid "Search unsuccessful!"
+msgstr ""
+
+#: src/filename.c:254
+#, c-format
+msgid "Found `%s'."
+msgstr ""
+
+#: src/filename.c:686
+#, c-format
+msgid "Not opening pipe file `%s' because SAFER option set."
+msgstr ""
+
 #: src/file-type.c:129
 msgid "MIXED, GROUPED, or NESTED expected."
 msgstr ""
@@ -1365,25 +1384,6 @@ msgstr ""
 msgid "Unknown record type %g."
 msgstr ""
 
-#: src/filename.c:221
-#, c-format
-msgid "Searching for `%s'..."
-msgstr ""
-
-#: src/filename.c:229 src/filename.c:261
-msgid "Search unsuccessful!"
-msgstr ""
-
-#: src/filename.c:254
-#, c-format
-msgid "Found `%s'."
-msgstr ""
-
-#: src/filename.c:686
-#, c-format
-msgid "Not opening pipe file `%s' because SAFER option set."
-msgstr ""
-
 #: src/flip.c:82
 msgid ""
 "FLIP ignores TEMPORARY.  Temporary transformations will be made permanent."
@@ -3564,26 +3564,26 @@ msgid ""
 "commands."
 msgstr ""
 
-#: src/title.c:56
+#: src/title.c:57
 #, c-format
 msgid "%s before: %s\n"
 msgstr ""
 
-#: src/title.c:56
+#: src/title.c:57
 msgid "<none>"
 msgstr ""
 
-#: src/title.c:68
+#: src/title.c:69
 #, c-format
 msgid "%s: `.' expected after string."
 msgstr ""
 
-#: src/title.c:84
+#: src/title.c:85
 #, c-format
 msgid "%s after: %s\n"
 msgstr ""
 
-#: src/title.c:140
+#: src/title.c:141
 #, c-format
 msgid "Document entered %s %02d:%02d:%02d by %s (%s):"
 msgstr ""

diff --git a/po/pspp.pot b/po/pspp.pot
index f7d3a30987abbbae809abc2232f7e939ba97ade0..e2c23a7af0c168fa86f596aaa84088d38300267e 100644 (file)
--- a/po/pspp.pot
+++ b/po/pspp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2005-04-25 22:30-0700\n"
+"POT-Creation-Date: 2005-04-27 07:45+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1228,6 +1228,25 @@ msgstr ""
 msgid "installation error"
 msgstr ""
 
+#: src/filename.c:221
+#, c-format
+msgid "Searching for `%s'..."
+msgstr ""
+
+#: src/filename.c:229 src/filename.c:261
+msgid "Search unsuccessful!"
+msgstr ""
+
+#: src/filename.c:254
+#, c-format
+msgid "Found `%s'."
+msgstr ""
+
+#: src/filename.c:686
+#, c-format
+msgid "Not opening pipe file `%s' because SAFER option set."
+msgstr ""
+
 #: src/file-type.c:129
 msgid "MIXED, GROUPED, or NESTED expected."
 msgstr ""
@@ -1366,25 +1385,6 @@ msgstr ""
 msgid "Unknown record type %g."
 msgstr ""
 
-#: src/filename.c:221
-#, c-format
-msgid "Searching for `%s'..."
-msgstr ""
-
-#: src/filename.c:229 src/filename.c:261
-msgid "Search unsuccessful!"
-msgstr ""
-
-#: src/filename.c:254
-#, c-format
-msgid "Found `%s'."
-msgstr ""
-
-#: src/filename.c:686
-#, c-format
-msgid "Not opening pipe file `%s' because SAFER option set."
-msgstr ""
-
 #: src/flip.c:82
 msgid ""
 "FLIP ignores TEMPORARY.  Temporary transformations will be made permanent."
@@ -3565,26 +3565,26 @@ msgid ""
 "commands."
 msgstr ""
 
-#: src/title.c:56
+#: src/title.c:57
 #, c-format
 msgid "%s before: %s\n"
 msgstr ""
 
-#: src/title.c:56
+#: src/title.c:57
 msgid "<none>"
 msgstr ""
 
-#: src/title.c:68
+#: src/title.c:69
 #, c-format
 msgid "%s: `.' expected after string."
 msgstr ""
 
-#: src/title.c:84
+#: src/title.c:85
 #, c-format
 msgid "%s after: %s\n"
 msgstr ""
 
-#: src/title.c:140
+#: src/title.c:141
 #, c-format
 msgid "Document entered %s %02d:%02d:%02d by %s (%s):"
 msgstr ""

diff --git a/src/ChangeLog b/src/ChangeLog
index e31bb4ae4e4a536a96971899c98696fb1635c100..4f65c2f99315861df46858190c25a3fdd25063bf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+Wed Apr 27 07:43:50 WST 2005 John Darrington <john@darrington.wattle.id.au>
+
+       * command.def echo.c:  Added the ECHO command.
+
 Mon Apr 25 22:55:59 2005  Ben Pfaff  <blp@gnu.org>
 
        Finish fixing MATCH FILES (PR 11677).

diff --git a/src/Makefile.am b/src/Makefile.am
index d3297630c207d2c9ea7c3514d9e99d570e3a8c06..ec592100afc00cafc97f8752fd8c223d7fee86c5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,7 +50,7 @@ chart.h cmdline.c cmdline.h command.c command.def \
 command.h compute.c copyleft.c copyleft.h count.c data-in.c data-in.h  \
 data-list.c data-list.h data-out.c date.c debug-print.h descript.c     \
 devind.c devind.h dfm-read.c dfm-read.h dfm-write.c dfm-write.h        \
-dictionary.c dictionary.h do-if.c do-ifP.h error.c \
+dictionary.c dictionary.h do-if.c do-ifP.h echo.c error.c \
 error.h factor_stats.c factor_stats.h file-handle.h    \
 file-type.c filename.c filename.h flip.c font.h format.c format.def    \
 format.h formats.c get.c getline.c getline.h glob.c glob.h             \

diff --git a/src/command.def b/src/command.def
index 345b2c8183c8e443925588255a54d827673d72dd..3aafdb57e718e2f55b22e561ac699e756443dcf1 100644 (file)
--- a/src/command.def
+++ b/src/command.def
@@ -62,6 +62,7 @@ SPCCMD ("DOCUMENT",               ERRO, INPU, TRAN, TRAN, cmd_document)
 DEFCMD ("DO IF",                  ERRO, INPU, TRAN, TRAN, cmd_do_if)
 DEFCMD ("DO REPEAT",              ERRO, INPU, TRAN, TRAN, cmd_do_repeat)
 DEFCMD ("DROP DOCUMENTS",         INIT, INPU, TRAN, PROC, cmd_drop_documents)
+DEFCMD ("ECHO",                   INIT, INPU, TRAN, PROC, cmd_echo)
 UNIMPL ("EDIT",                   ERRO, ERRO, ERRO, ERRO)
 DEFCMD ("ELSE",                   ERRO, INPU, TRAN, TRAN, cmd_else)
 DEFCMD ("ELSE IF",                ERRO, INPU, TRAN, TRAN, cmd_else_if)

diff --git a/src/echo.c b/src/echo.c
new file mode 100644 (file)
index 0000000..a669a1f
--- /dev/null
+++ b/src/echo.c
@@ -0,0 +1,49 @@
+/* PSPP - computes sample statistics. -*-c-*-
+
+   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 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.
+
+   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., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA. */
+
+#include <config.h>
+#include "error.h"
+#include "alloc.h"
+#include "str.h"
+#include "lexer.h"
+#include "command.h"
+#include "tab.h"
+#include "som.h"
+
+/* Echos a string to the output stream */
+int
+cmd_echo(void)
+{
+  struct tab_table *tab;
+
+  if (token != T_STRING) 
+    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);
+
+  return CMD_SUCCESS;
+}