/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009 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
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 *);
char *);
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
- specification FORMAT. The output is recoded from native form
- into the given legacy character ENCODING. No null terminator
- is appended to the buffer. */
+/* Same as data_out, and additionally recodes the output from
+ native form into the given legacy character ENCODING. */
void
data_out_legacy (const union value *input, enum legacy_encoding encoding,
const struct fmt_spec *format, char *output)
legacy_recode (LEGACY_NATIVE, output, encoding, output, format->w);
}
-/* Same as data_out_legacy with ENCODING set to LEGACY_NATIVE. */
-void
-data_out (const union value *value, const struct fmt_spec *format,
- char *output)
-{
- return data_out_legacy (value, LEGACY_NATIVE, format, output);
-}
-
-/* Returns the current output integer format. */
-enum integer_format
-data_out_get_integer_format (void)
-{
- return output_integer_format;
-}
+/* 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.
-/* Sets the output integer format to INTEGER_FORMAT. */
+ VALUE must be the correct width for FORMAT, that is, its
+ width must be fmt_var_width(FORMAT). */
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 *input, const struct fmt_spec *format,
+ char *output)
{
- return output_float_format;
+ return data_out_legacy (input, 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. */
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);
}
}
|| 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. */
}
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);
int d = MIN (format->d, excess_width - 4);
int w = d + 3;
sprintf (p, ":%0*.*f", w, d, number);
- if (fmt_decimal_char (FMT_F) != '.')
+ if (settings_get_decimal_char (FMT_F) != '.')
{
char *cp = strchr (p, '.');
if (cp != NULL)
- *cp = fmt_decimal_char (FMT_F);
+ *cp = settings_get_decimal_char (FMT_F);
}
p += strlen (p);
}
}
}
- buf_copy_lpad (output, format->w, tmp, p - tmp);
+ buf_copy_lpad (output, format->w, tmp, p - tmp, ' ');
return;
overflow:
};
if (input->f >= 1 && input->f < 8)
- buf_copy_str_rpad (output, format->w, weekdays[(int) input->f - 1]);
+ buf_copy_str_rpad (output, format->w, weekdays[(int) input->f - 1], ' ');
else
{
if (input->f != SYSMIS)
};
if (input->f >= 1 && input->f < 13)
- buf_copy_str_rpad (output, format->w, months[(int) input->f - 1]);
+ buf_copy_str_rpad (output, format->w, months[(int) input->f - 1], ' ');
else
{
if (input->f != SYSMIS)
output_A (const union value *input, const struct fmt_spec *format,
char *output)
{
- memcpy (output, input->s, format->w);
+ memcpy (output, value_str (input, format->w), format->w);
}
/* Outputs AHEX format. */
output_AHEX (const union value *input, const struct fmt_spec *format,
char *output)
{
- output_hex (input->s, format->w / 2, output);
+ output_hex (value_str (input, format->w), format->w / 2, output);
}
\f
/* Decimal and scientific formatting. */
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--)
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;
else
s = "Unknown";
- buf_copy_str_lpad (output, format->w, s);
+ buf_copy_str_lpad (output, format->w, s, ' ');
}
else
output_overflow (format, output);