projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: New type enum token_type.
[pspp-builds.git]
/
src
/
language
/
data-io
/
print.c
diff --git
a/src/language/data-io/print.c
b/src/language/data-io/print.c
index 86d69ea997ed338c630e350c1812e82f1445409e..cfbe04396191e5b1f7098f0b7df40ce6fac29edf 100644
(file)
--- a/
src/language/data-io/print.c
+++ b/
src/language/data-io/print.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006
, 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
@@
-23,6
+23,7
@@
#include <data/procedure.h>
#include <data/transformations.h>
#include <data/variable.h>
#include <data/procedure.h>
#include <data/transformations.h>
#include <data/variable.h>
+#include <data/format.h>
#include <language/command.h>
#include <language/data-io/data-writer.h>
#include <language/data-io/file-handle.h>
#include <language/command.h>
#include <language/data-io/data-writer.h>
#include <language/data-io/file-handle.h>
@@
-31,13
+32,14
@@
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
#include <libpspp/assertion.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
#include <libpspp/assertion.h>
+#include <libpspp/i18n.h>
#include <libpspp/compiler.h>
#include <libpspp/ll.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
#include <libpspp/compiler.h>
#include <libpspp/ll.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
-#include <output/
manager
.h>
-#include <output/tab
le
.h>
+#include <output/
text-item
.h>
+#include <output/tab.h>
#include "xalloc.h"
#include "xalloc.h"
@@
-82,6
+84,7
@@
struct print_trns
struct pool *pool; /* Stores related data. */
bool eject; /* Eject page before printing? */
bool include_prefix; /* Prefix lines with space? */
struct pool *pool; /* Stores related data. */
bool eject; /* Eject page before printing? */
bool include_prefix; /* Prefix lines with space? */
+ const char *encoding; /* Encoding to use for output. */
struct dfm_writer *writer; /* Output file, NULL=listing file. */
struct ll_list specs; /* List of struct prt_out_specs. */
size_t record_cnt; /* Number of records to write. */
struct dfm_writer *writer; /* Output file, NULL=listing file. */
struct ll_list specs; /* List of struct prt_out_specs. */
size_t record_cnt; /* Number of records to write. */
@@
-147,11
+150,11
@@
internal_cmd_print (struct lexer *lexer, struct dataset *ds,
tmp_pool = pool_create_subpool (trns->pool);
/* Parse the command options. */
tmp_pool = pool_create_subpool (trns->pool);
/* Parse the command options. */
- while (lex_token (lexer) !=
'/' && lex_token (lexer) != '.'
)
+ while (lex_token (lexer) !=
T_SLASH && lex_token (lexer) != T_ENDCMD
)
{
if (lex_match_id (lexer, "OUTFILE"))
{
{
if (lex_match_id (lexer, "OUTFILE"))
{
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
fh = fh_parse (lexer, FH_REF_FILE);
if (fh == NULL)
fh = fh_parse (lexer, FH_REF_FILE);
if (fh == NULL)
@@
-159,13
+162,13
@@
internal_cmd_print (struct lexer *lexer, struct dataset *ds,
}
else if (lex_match_id (lexer, "RECORDS"))
{
}
else if (lex_match_id (lexer, "RECORDS"))
{
- lex_match (lexer,
'='
);
- lex_match (lexer,
'('
);
+ lex_match (lexer,
T_EQUALS
);
+ lex_match (lexer,
T_LPAREN
);
if (!lex_force_int (lexer))
goto error;
trns->record_cnt = lex_integer (lexer);
lex_get (lexer);
if (!lex_force_int (lexer))
goto error;
trns->record_cnt = lex_integer (lexer);
lex_get (lexer);
- lex_match (lexer,
')'
);
+ lex_match (lexer,
T_RPAREN
);
}
else if (lex_match_id (lexer, "TABLE"))
print_table = true;
}
else if (lex_match_id (lexer, "TABLE"))
print_table = true;
@@
-194,7
+197,10
@@
internal_cmd_print (struct lexer *lexer, struct dataset *ds,
trns->writer = dfm_open_writer (fh);
if (trns->writer == NULL)
goto error;
trns->writer = dfm_open_writer (fh);
if (trns->writer == NULL)
goto error;
+ trns->encoding = dfm_writer_get_legacy_encoding (trns->writer);
}
}
+ else
+ trns->encoding = LEGACY_NATIVE;
/* Output the variable table if requested. */
if (print_table)
/* Output the variable table if requested. */
if (print_table)
@@
-233,20
+239,20
@@
parse_specs (struct lexer *lexer, struct pool *tmp_pool, struct print_trns *trns
int record = 0;
int column = 1;
int record = 0;
int column = 1;
- if (lex_token (lexer) ==
'.'
)
+ if (lex_token (lexer) ==
T_ENDCMD
)
{
trns->record_cnt = 1;
return true;
}
{
trns->record_cnt = 1;
return true;
}
- while (lex_token (lexer) !=
'.'
)
+ while (lex_token (lexer) !=
T_ENDCMD
)
{
bool ok;
if (!parse_record_placement (lexer, &record, &column))
return false;
{
bool ok;
if (!parse_record_placement (lexer, &record, &column))
return false;
- if (lex_
token (lexer) == T_STRING
)
+ if (lex_
is_string (lexer)
)
ok = parse_string_argument (lexer, trns, record, &column);
else
ok = parse_variable_argument (lexer, dict, trns, tmp_pool, &record, &column,
ok = parse_string_argument (lexer, trns, record, &column);
else
ok = parse_variable_argument (lexer, dict, trns, tmp_pool, &record, &column,
@@
-254,7
+260,7
@@
parse_specs (struct lexer *lexer, struct pool *tmp_pool, struct print_trns *trns
if (!ok)
return 0;
if (!ok)
return 0;
- lex_match (lexer,
','
);
+ lex_match (lexer,
T_COMMA
);
}
if (trns->record_cnt != 0 && trns->record_cnt != record)
}
if (trns->record_cnt != 0 && trns->record_cnt != record)
@@
-284,7
+290,8
@@
parse_string_argument (struct lexer *lexer, struct print_trns *trns, int record,
int first_column, last_column;
bool range_specified;
int first_column, last_column;
bool range_specified;
- if (!parse_column_range (lexer, &first_column, &last_column, &range_specified))
+ if (!parse_column_range (lexer, 1,
+ &first_column, &last_column, &range_specified))
return false;
spec->first_column = first_column;
return false;
spec->first_column = first_column;
@@
-316,7
+323,7
@@
parse_variable_argument (struct lexer *lexer, const struct dictionary *dict,
&vars, &var_cnt, PV_DUPLICATE))
return false;
&vars, &var_cnt, PV_DUPLICATE))
return false;
- if (lex_is_number (lexer) || lex_token (lexer) ==
'('
)
+ if (lex_is_number (lexer) || lex_token (lexer) ==
T_LPAREN
)
{
if (!parse_var_placements (lexer, tmp_pool, var_cnt, false,
&formats, &format_cnt))
{
if (!parse_var_placements (lexer, tmp_pool, var_cnt, false,
&formats, &format_cnt))
@@
-327,7
+334,7
@@
parse_variable_argument (struct lexer *lexer, const struct dictionary *dict,
{
size_t i;
{
size_t i;
- lex_match (lexer,
'*'
);
+ lex_match (lexer,
T_ASTERISK
);
formats = pool_nmalloc (tmp_pool, var_cnt, sizeof *formats);
format_cnt = var_cnt;
formats = pool_nmalloc (tmp_pool, var_cnt, sizeof *formats);
format_cnt = var_cnt;
@@
-389,8
+396,7
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
int row;
spec_cnt = ll_count (&trns->specs);
int row;
spec_cnt = ll_count (&trns->specs);
- t = tab_create (4, spec_cnt + 1, 0);
- tab_columns (t, TAB_COL_DOWN, 1);
+ t = tab_create (4, spec_cnt + 1);
tab_box (t, TAL_1, TAL_1, TAL_0, TAL_1, 0, 0, 3, spec_cnt);
tab_hline (t, TAL_2, 0, 3, 1);
tab_headers (t, 0, 0, 1, 0);
tab_box (t, TAL_1, TAL_1, TAL_0, TAL_1, 0, 0, 3, spec_cnt);
tab_hline (t, TAL_2, 0, 3, 1);
tab_headers (t, 0, 0, 1, 0);
@@
-398,7
+404,6
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
tab_text (t, 1, 0, TAB_CENTER | TAT_TITLE, _("Record"));
tab_text (t, 2, 0, TAB_CENTER | TAT_TITLE, _("Columns"));
tab_text (t, 3, 0, TAB_CENTER | TAT_TITLE, _("Format"));
tab_text (t, 1, 0, TAB_CENTER | TAT_TITLE, _("Record"));
tab_text (t, 2, 0, TAB_CENTER | TAT_TITLE, _("Columns"));
tab_text (t, 3, 0, TAB_CENTER | TAT_TITLE, _("Format"));
- tab_dim (t, tab_natural_dimensions);
row = 1;
ll_for_each (spec, struct prt_out_spec, ll, &trns->specs)
{
row = 1;
ll_for_each (spec, struct prt_out_spec, ll, &trns->specs)
{
@@
-407,8
+412,9
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
switch (spec->type)
{
case PRT_LITERAL:
switch (spec->type)
{
case PRT_LITERAL:
- tab_text (t, 0, row, TAB_LEFT | TAB_FIX | TAT_PRINTF, "\"%.*s\"",
- (int) ds_length (&spec->string), ds_data (&spec->string));
+ tab_text_format (t, 0, row, TAB_LEFT | TAB_FIX, "`%.*s'",
+ (int) ds_length (&spec->string),
+ ds_data (&spec->string));
width = ds_length (&spec->string);
break;
case PRT_VAR:
width = ds_length (&spec->string);
break;
case PRT_VAR:
@@
-420,19
+426,19
@@
dump_table (struct print_trns *trns, const struct file_handle *fh)
default:
NOT_REACHED ();
}
default:
NOT_REACHED ();
}
- tab_text
(t, 1, row, TAT_PRINTF
, "%d", spec->record);
- tab_text
(t, 2, row, TAT_PRINTF
, "%3d-%3d",
- spec->first_column, spec->first_column + width - 1);
+ tab_text
_format (t, 1, row, 0
, "%d", spec->record);
+ tab_text
_format (t, 2, row, 0
, "%3d-%3d",
+
spec->first_column, spec->first_column + width - 1);
row++;
}
if (fh != NULL)
row++;
}
if (fh != NULL)
- tab_title (t, ngettext ("Writing %
d
record to %s.",
- "Writing %
d
records to %s.", trns->record_cnt),
+ tab_title (t, ngettext ("Writing %
zu
record to %s.",
+ "Writing %
zu
records to %s.", trns->record_cnt),
trns->record_cnt, fh_get_name (fh));
else
trns->record_cnt, fh_get_name (fh));
else
- tab_title (t, ngettext ("Writing %
d
record.",
- "Writing %
d
records.", trns->record_cnt),
+ tab_title (t, ngettext ("Writing %
zu
record.",
+ "Writing %
zu
records.", trns->record_cnt),
trns->record_cnt);
tab_submit (t);
}
trns->record_cnt);
tab_submit (t);
}
@@
-444,33
+450,44
@@
static void flush_records (struct print_trns *, int target_record,
/* Performs the transformation inside print_trns T on case C. */
static int
/* Performs the transformation inside print_trns T on case C. */
static int
-print_trns_proc (void *trns_, struct ccase *c, casenumber case_num UNUSED)
+print_trns_proc (void *trns_, struct ccase *
*
c, casenumber case_num UNUSED)
{
struct print_trns *trns = trns_;
bool eject = trns->eject;
{
struct print_trns *trns = trns_;
bool eject = trns->eject;
+ char encoded_space = legacy_from_native (trns->encoding, ' ');
int record = 1;
struct prt_out_spec *spec;
ds_clear (&trns->line);
int record = 1;
struct prt_out_spec *spec;
ds_clear (&trns->line);
- ds_put_
char
(&trns->line, ' ');
+ ds_put_
byte
(&trns->line, ' ');
ll_for_each (spec, struct prt_out_spec, ll, &trns->specs)
{
flush_records (trns, spec->record, &eject, &record);
ll_for_each (spec, struct prt_out_spec, ll, &trns->specs)
{
flush_records (trns, spec->record, &eject, &record);
- ds_set_length (&trns->line, spec->first_column,
' '
);
+ ds_set_length (&trns->line, spec->first_column,
encoded_space
);
if (spec->type == PRT_VAR)
{
if (spec->type == PRT_VAR)
{
- const union value *input = case_data (c, spec->var);
+ const union value *input = case_data (
*
c, spec->var);
char *output = ds_put_uninit (&trns->line, spec->format.w);
if (!spec->sysmis_as_spaces || input->f != SYSMIS)
char *output = ds_put_uninit (&trns->line, spec->format.w);
if (!spec->sysmis_as_spaces || input->f != SYSMIS)
- data_out
(input
, &spec->format, output);
+ data_out
_legacy (input, trns->encoding
, &spec->format, output);
else
else
- memset (output,
' '
, spec->format.w);
+ memset (output,
encoded_space
, spec->format.w);
if (spec->add_space)
if (spec->add_space)
- ds_put_
char (&trns->line, ' '
);
+ ds_put_
byte (&trns->line, encoded_space
);
}
else
}
else
- ds_put_substring (&trns->line, ds_ss (&spec->string));
+ {
+ ds_put_substring (&trns->line, ds_ss (&spec->string));
+ if (0 != strcmp (trns->encoding, LEGACY_NATIVE))
+ {
+ size_t length = ds_length (&spec->string);
+ char *data = ss_data (ds_tail (&trns->line, length));
+ char *s = recode_string (trns->encoding, LEGACY_NATIVE, data, length);
+ memcpy (data, s, length);
+ free (s);
+ }
+ }
}
flush_records (trns, trns->record_cnt + 1, &eject, &record);
}
flush_records (trns, trns->record_cnt + 1, &eject, &record);
@@
-497,14
+514,14
@@
flush_records (struct print_trns *trns, int target_record,
{
*eject = false;
if (trns->writer == NULL)
{
*eject = false;
if (trns->writer == NULL)
-
som_eject_page (
);
+
text_item_submit (text_item_create (TEXT_ITEM_EJECT_PAGE, "")
);
else
leader = '1';
}
else
leader = '1';
}
- line[0] = le
ader
;
+ line[0] = le
gacy_from_native (trns->encoding, leader)
;
if (trns->writer == NULL)
if (trns->writer == NULL)
- tab_output_text (TAB_FIX
| TAT_NOWRAP
, &line[1]);
+ tab_output_text (TAB_FIX, &line[1]);
else
{
if (!trns->include_prefix)
else
{
if (!trns->include_prefix)