X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fdata-out.c;h=86688a6774cd939facdb8453dbd7e9e2832934ec;hb=569e7caed79685e25c6a78ae0d836945df276fd5;hp=335f6d86523e1892fecf2bc8cd88169d6594dbcd;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp-builds.git
diff --git a/src/data/data-out.c b/src/data/data-out.c
index 335f6d86..86688a67 100644
--- a/src/data/data-out.c
+++ b/src/data/data-out.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000, 2006 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
@@ -26,20 +24,17 @@
#include
#include
#include
-#include
-#include "calendar.h"
-#include "format.h"
-#include "settings.h"
-#include "value.h"
+#include
+#include
+#include
+#include
#include
#include
#include
-#include
#include
#include
-#include
#include
#include "minmax.h"
@@ -65,12 +60,6 @@ static int rounder_width (const struct rounder *, int decimals,
static void rounder_format (const struct rounder *, int decimals,
char *output);
-/* 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 *);
@@ -96,11 +85,12 @@ static void output_hex (const void *, size_t bytes, char *);
/* 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
-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] =
{
@@ -111,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);
+ 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
-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;
-}
/* Main conversion functions. */
@@ -153,7 +127,7 @@ output_number (const union value *input, const struct fmt_spec *format,
if (number == SYSMIS)
output_missing (format, output);
- else if (!gsl_finite (number))
+ else if (!isfinite (number))
output_infinite (number, format, output);
else
{
@@ -253,7 +227,8 @@ output_IB (const union value *input, const struct fmt_spec *format,
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);
}
}
@@ -268,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
- 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. */
@@ -359,7 +335,7 @@ output_date (const union value *input, const struct fmt_spec *format,
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",
@@ -379,7 +355,8 @@ output_date (const union value *input, const struct fmt_spec *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);
@@ -419,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);
- 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);
}
@@ -455,7 +432,7 @@ static void
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",
@@ -476,7 +453,7 @@ static void
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",
@@ -505,7 +482,7 @@ static void
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);
}
/* Decimal and scientific formatting. */
@@ -536,7 +513,9 @@ static bool
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--)
@@ -638,7 +617,8 @@ static bool
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;
@@ -713,16 +693,6 @@ output_scientific (double number, const struct fmt_spec *format,
return true;
}
-#ifndef HAVE_ROUND
-/* Return X rounded to the nearest integer,
- rounding ties away from zero. */
-static double
-round (double x)
-{
- return x >= 0.0 ? floor (x + .5) : ceil (x - .5);
-}
-#endif /* !HAVE_ROUND */
-
/* Returns true if the magnitude represented by R should be
rounded up when chopped off at DECIMALS decimal places, false
if it should be rounded down. */
@@ -951,7 +921,7 @@ power256 (int x)
static void
output_infinite (double number, const struct fmt_spec *format, char *output)
{
- assert (!gsl_finite (number));
+ assert (!isfinite (number));
if (format->w >= 3)
{