/* PSPP - a program for statistical analysis.
- Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009, 2010, 2011, 2012 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
#include <limits.h>
#include <stdlib.h>
-#include <data/procedure.h>
-#include <data/value.h>
-#include <language/command.h>
-#include <language/data-io/data-writer.h>
-#include <language/data-io/file-handle.h>
-#include <language/expressions/public.h>
-#include <language/lexer/lexer.h>
-#include <output/manager.h>
-#include <libpspp/message.h>
+#include "data/dataset.h"
+#include "data/value.h"
+#include "language/command.h"
+#include "language/data-io/data-writer.h"
+#include "language/data-io/file-handle.h"
+#include "language/expressions/public.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+#include "output/driver.h"
-#include "xalloc.h"
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
cmd_print_space (struct lexer *lexer, struct dataset *ds)
{
struct print_space_trns *trns;
- struct file_handle *handle;
- struct expression *expr;
+ struct file_handle *handle = NULL;
+ struct expression *expr = NULL;
struct dfm_writer *writer;
+ char *encoding = NULL;
if (lex_match_id (lexer, "OUTFILE"))
{
- lex_match (lexer, '=');
+ lex_match (lexer, T_EQUALS);
- handle = fh_parse (lexer, FH_REF_FILE);
+ handle = fh_parse (lexer, FH_REF_FILE, NULL);
if (handle == NULL)
return CMD_FAILURE;
- lex_get (lexer);
+
+ if (lex_match_id (lexer, "ENCODING"))
+ {
+ lex_match (lexer, T_EQUALS);
+ if (!lex_force_string (lexer))
+ goto error;
+
+ encoding = ss_xstrdup (lex_tokss (lexer));
+
+ lex_get (lexer);
+ }
}
else
handle = NULL;
- if (lex_token (lexer) != '.')
+ if (lex_token (lexer) != T_ENDCMD)
{
- expr = expr_parse (lexer, ds, EXPR_NUMBER);
- if (lex_token (lexer) != '.')
+ expr = expr_parse (lexer, NULL, ds, VAL_NUMERIC);
+ if (lex_token (lexer) != T_ENDCMD)
{
- expr_free (expr);
- lex_error (lexer, _("expecting end of command"));
- return CMD_FAILURE;
+ lex_error (lexer, _("expecting end of command"));
+ goto error;
}
}
else
if (handle != NULL)
{
- writer = dfm_open_writer (handle);
+ writer = dfm_open_writer (handle, encoding);
if (writer == NULL)
- {
- fh_unref (handle);
- expr_free (expr);
- return CMD_FAILURE;
- }
+ goto error;
}
else
writer = NULL;
print_space_trns_proc, print_space_trns_free, trns);
fh_unref (handle);
return CMD_SUCCESS;
+
+error:
+ fh_unref (handle);
+ expr_free (expr);
+ return CMD_FAILURE;
}
/* Executes a PRINT SPACE transformation. */
{
double f = expr_evaluate_num (trns->expr, *c, case_num);
if (f == SYSMIS)
- msg (SW, _("The expression on PRINT SPACE evaluated to the "
- "system-missing value."));
+ msg (SW, _("The expression on %s evaluated to the "
+ "system-missing value."), "PRINT SPACE");
else if (f < 0 || f > INT_MAX)
- msg (SW, _("The expression on PRINT SPACE evaluated to %g."), f);
+ msg (SW, _("The expression on %s evaluated to %g."), "PRINT SPACE", f);
else
n = f;
}
while (n--)
if (trns->writer == NULL)
- som_blank_line ();
+ output_log ("%s", "");
else
- dfm_put_record (trns->writer, " ", 1);
+ dfm_put_record (trns->writer, " ", 1); /* XXX */
if (trns->writer != NULL && dfm_write_error (trns->writer))
return TRNS_ERROR;