projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New wrapper for access to temporary files.
[pspp-builds.git]
/
src
/
data
/
data-out.c
diff --git
a/src/data/data-out.c
b/src/data/data-out.c
index 967f57eddc23bf2090360032d26fb20417b01728..86688a6774cd939facdb8453dbd7e9e2832934ec 100644
(file)
--- a/
src/data/data-out.c
+++ b/
src/data/data-out.c
@@
-25,17
+25,16
@@
#include <stdlib.h>
#include <time.h>
#include <stdlib.h>
#include <time.h>
-#include
"calendar.h"
-#include
"format.h"
-#include
"settings.h"
-#include
"value.h"
+#include
<data/calendar.h>
+#include
<data/format.h>
+#include
<data/settings.h>
+#include
<data/value.h>
#include <libpspp/assertion.h>
#include <libpspp/float-format.h>
#include <libpspp/integer-format.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/assertion.h>
#include <libpspp/float-format.h>
#include <libpspp/integer-format.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
-#include <libpspp/misc.h>
#include <libpspp/str.h>
#include "minmax.h"
#include <libpspp/str.h>
#include "minmax.h"
@@
-61,12
+60,6
@@
static int rounder_width (const struct rounder *, int decimals,
static void rounder_format (const struct rounder *, int decimals,
char *output);
\f
static void rounder_format (const struct rounder *, int decimals,
char *output);
\f
-/* Format of integers in output (SET WIB). */
-static enum integer_format output_integer_format = INTEGER_NATIVE;
-
-/* Format of reals in output (SET WRB). */
-static enum float_format output_float_format = FLOAT_NATIVE_DOUBLE;
-
typedef void data_out_converter_func (const union value *,
const struct fmt_spec *,
char *);
typedef void data_out_converter_func (const union value *,
const struct fmt_spec *,
char *);
@@
-92,11
+85,12
@@
static void output_hex (const void *, size_t bytes, char *);
\f
/* Converts the INPUT value into printable form in the exactly
FORMAT->W characters in OUTPUT according to format
\f
/* Converts the INPUT value into printable form in the exactly
FORMAT->W characters in OUTPUT according to format
- specification FORMAT. No null terminator is appended to the
- buffer. */
+ specification FORMAT. The output is recoded from native form
+ into the given legacy character ENCODING. No null terminator
+ is appended to the buffer. */
void
void
-data_out
(const union value *input, const struct fmt_spec *format
,
- char *output)
+data_out
_legacy (const union value *input, enum legacy_encoding encoding
,
+
const struct fmt_spec *format,
char *output)
{
static data_out_converter_func *const converters[FMT_NUMBER_OF_FORMATS] =
{
{
static data_out_converter_func *const converters[FMT_NUMBER_OF_FORMATS] =
{
@@
-107,35
+101,19
@@
data_out (const union value *input, const struct fmt_spec *format,
assert (fmt_check_output (format));
converters[format->type] (input, format, output);
assert (fmt_check_output (format));
converters[format->type] (input, format, output);
+ if (encoding != LEGACY_NATIVE
+ && fmt_get_category (format->type) != FMT_CAT_BINARY)
+ legacy_recode (LEGACY_NATIVE, output, encoding, output, format->w);
}
}
-/* Returns the current output integer format. */
-enum integer_format
-data_out_get_integer_format (void)
-{
- return output_integer_format;
-}
-
-/* Sets the output integer format to INTEGER_FORMAT. */
+/* Same as data_out_legacy with ENCODING set to LEGACY_NATIVE. */
void
void
-data_out_set_integer_format (enum integer_format integer_format)
-{
- output_integer_format = integer_format;
-}
-
-/* Returns the current output float format. */
-enum float_format
-data_out_get_float_format (void)
+data_out (const union value *value, const struct fmt_spec *format,
+ char *output)
{
{
- return
output_float_format
;
+ return
data_out_legacy (value, LEGACY_NATIVE, format, output)
;
}
}
-/* Sets the output float format to FLOAT_FORMAT. */
-void
-data_out_set_float_format (enum float_format float_format)
-{
- output_float_format = float_format;
-}
\f
/* Main conversion functions. */
\f
/* Main conversion functions. */
@@
-249,7
+227,8
@@
output_IB (const union value *input, const struct fmt_spec *format,
uint64_t integer = fabs (number);
if (number < 0)
integer = -integer;
uint64_t integer = fabs (number);
if (number < 0)
integer = -integer;
- output_binary_integer (integer, format->w, output_integer_format,
+ output_binary_integer (integer, format->w,
+ settings_get_output_integer_format (),
output);
}
}
output);
}
}
@@
-264,7
+243,8
@@
output_PIB (const union value *input, const struct fmt_spec *format,
|| number < 0 || number >= power256 (format->w))
memset (output, 0, format->w);
else
|| number < 0 || number >= power256 (format->w))
memset (output, 0, format->w);
else
- output_binary_integer (number, format->w, output_integer_format, output);
+ output_binary_integer (number, format->w,
+ settings_get_output_integer_format (), output);
}
/* Outputs PIBHEX format. */
}
/* Outputs PIBHEX format. */
@@
-355,7
+335,7
@@
output_date (const union value *input, const struct fmt_spec *format,
p += sprintf (p, "%02d", month);
else
{
p += sprintf (p, "%02d", month);
else
{
- static const char *months[12] =
+ static const char *
const
months[12] =
{
"JAN", "FEB", "MAR", "APR", "MAY", "JUN",
"JUL", "AUG", "SEP", "OCT", "NOV", "DEC",
{
"JAN", "FEB", "MAR", "APR", "MAY", "JUN",
"JUL", "AUG", "SEP", "OCT", "NOV", "DEC",
@@
-375,7
+355,8
@@
output_date (const union value *input, const struct fmt_spec *format,
}
else
{
}
else
{
- int offset = year - get_epoch ();
+ int epoch = settings_get_epoch ();
+ int offset = year - epoch;
if (offset < 0 || offset > 99)
goto overflow;
p += sprintf (p, "%02d", abs (year) % 100);
if (offset < 0 || offset > 99)
goto overflow;
p += sprintf (p, "%02d", abs (year) % 100);
@@
-415,11
+396,11
@@
output_date (const union value *input, const struct fmt_spec *format,
int d = MIN (format->d, excess_width - 4);
int w = d + 3;
sprintf (p, ":%0*.*f", w, d, number);
int d = MIN (format->d, excess_width - 4);
int w = d + 3;
sprintf (p, ":%0*.*f", w, d, number);
-
if (fm
t_decimal_char (FMT_F) != '.')
+
if (settings_ge
t_decimal_char (FMT_F) != '.')
{
char *cp = strchr (p, '.');
if (cp != NULL)
{
char *cp = strchr (p, '.');
if (cp != NULL)
-
*cp = fm
t_decimal_char (FMT_F);
+
*cp = settings_ge
t_decimal_char (FMT_F);
}
p += strlen (p);
}
}
p += strlen (p);
}
@@
-451,7
+432,7
@@
static void
output_WKDAY (const union value *input, const struct fmt_spec *format,
char *output)
{
output_WKDAY (const union value *input, const struct fmt_spec *format,
char *output)
{
- static const char *weekdays[7] =
+ static const char *
const
weekdays[7] =
{
"SUNDAY", "MONDAY", "TUESDAY", "WEDNESDAY",
"THURSDAY", "FRIDAY", "SATURDAY",
{
"SUNDAY", "MONDAY", "TUESDAY", "WEDNESDAY",
"THURSDAY", "FRIDAY", "SATURDAY",
@@
-472,7
+453,7
@@
static void
output_MONTH (const union value *input, const struct fmt_spec *format,
char *output)
{
output_MONTH (const union value *input, const struct fmt_spec *format,
char *output)
{
- static const char *months[12] =
+ static const char *
const
months[12] =
{
"JANUARY", "FEBRUARY", "MARCH", "APRIL", "MAY", "JUNE",
"JULY", "AUGUST", "SEPTEMBER", "OCTOBER", "NOVEMBER", "DECEMBER",
{
"JANUARY", "FEBRUARY", "MARCH", "APRIL", "MAY", "JUNE",
"JULY", "AUGUST", "SEPTEMBER", "OCTOBER", "NOVEMBER", "DECEMBER",
@@
-501,7
+482,7
@@
static void
output_AHEX (const union value *input, const struct fmt_spec *format,
char *output)
{
output_AHEX (const union value *input, const struct fmt_spec *format,
char *output)
{
- output_hex (input->s, format->w, output);
+ output_hex (input->s, format->w
/ 2
, output);
}
\f
/* Decimal and scientific formatting. */
}
\f
/* Decimal and scientific formatting. */
@@
-532,7
+513,9
@@
static bool
output_decimal (const struct rounder *r, const struct fmt_spec *format,
bool require_affixes, char *output)
{
output_decimal (const struct rounder *r, const struct fmt_spec *format,
bool require_affixes, char *output)
{
- const struct fmt_number_style *style = fmt_get_style (format->type);
+ const struct fmt_number_style *style =
+ settings_get_style (format->type);
+
int decimals;
for (decimals = format->d; decimals >= 0; decimals--)
int decimals;
for (decimals = format->d; decimals >= 0; decimals--)
@@
-634,7
+617,8
@@
static bool
output_scientific (double number, const struct fmt_spec *format,
bool require_affixes, char *output)
{
output_scientific (double number, const struct fmt_spec *format,
bool require_affixes, char *output)
{
- const struct fmt_number_style *style = fmt_get_style (format->type);
+ const struct fmt_number_style *style =
+ settings_get_style (format->type);
int width;
int fraction_width;
bool add_affixes;
int width;
int fraction_width;
bool add_affixes;