projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output-item: Collapse the inheritance hierarchy into a single struct.
[pspp]
/
src
/
language
/
data-io
/
print-space.c
diff --git
a/src/language/data-io/print-space.c
b/src/language/data-io/print-space.c
index b7245e629bdc2c551efe30950434cacee9877127..fafaff81a96d86be310110696e38b29bb42c08de 100644
(file)
--- a/
src/language/data-io/print-space.c
+++ b/
src/language/data-io/print-space.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2006, 2009, 2010, 2011 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
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
@@
-27,7
+27,7
@@
#include "language/expressions/public.h"
#include "language/lexer/lexer.h"
#include "libpspp/message.h"
#include "language/expressions/public.h"
#include "language/lexer/lexer.h"
#include "libpspp/message.h"
-#include "output/
tex
t-item.h"
+#include "output/
outpu
t-item.h"
#include "gl/xalloc.h"
#include "gl/xalloc.h"
@@
-48,9
+48,10
@@
int
cmd_print_space (struct lexer *lexer, struct dataset *ds)
{
struct print_space_trns *trns;
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;
struct dfm_writer *writer;
+ char *encoding = NULL;
if (lex_match_id (lexer, "OUTFILE"))
{
if (lex_match_id (lexer, "OUTFILE"))
{
@@
-59,6
+60,17
@@
cmd_print_space (struct lexer *lexer, struct dataset *ds)
handle = fh_parse (lexer, FH_REF_FILE, NULL);
if (handle == NULL)
return CMD_FAILURE;
handle = fh_parse (lexer, FH_REF_FILE, NULL);
if (handle == NULL)
return CMD_FAILURE;
+
+ 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;
}
else
handle = NULL;
@@
-68,9
+80,8
@@
cmd_print_space (struct lexer *lexer, struct dataset *ds)
expr = expr_parse (lexer, ds, EXPR_NUMBER);
if (lex_token (lexer) != T_ENDCMD)
{
expr = expr_parse (lexer, ds, EXPR_NUMBER);
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
}
}
else
@@
-78,13
+89,9
@@
cmd_print_space (struct lexer *lexer, struct dataset *ds)
if (handle != NULL)
{
if (handle != NULL)
{
- writer = dfm_open_writer (handle);
+ writer = dfm_open_writer (handle
, encoding
);
if (writer == NULL)
if (writer == NULL)
- {
- fh_unref (handle);
- expr_free (expr);
- return CMD_FAILURE;
- }
+ goto error;
}
else
writer = NULL;
}
else
writer = NULL;
@@
-97,6
+104,11
@@
cmd_print_space (struct lexer *lexer, struct dataset *ds)
print_space_trns_proc, print_space_trns_free, trns);
fh_unref (handle);
return CMD_SUCCESS;
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. */
}
/* Executes a PRINT SPACE transformation. */
@@
-112,19
+124,19
@@
print_space_trns_proc (void *t_, struct ccase **c,
{
double f = expr_evaluate_num (trns->expr, *c, case_num);
if (f == SYSMIS)
{
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)
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)
else
n = f;
}
while (n--)
if (trns->writer == NULL)
-
text_item_submit (text_item_create (TEXT_ITEM_BLANK_LINE, ""
));
+
output_item_submit (text_item_create (TEXT_ITEM_LOG, "", NULL
));
else
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;
if (trns->writer != NULL && dfm_write_error (trns->writer))
return TRNS_ERROR;