/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2010, 2011, 2014 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
#include "libpspp/cast.h"
#include "libpspp/i18n.h"
#include "libpspp/message.h"
+#include "data/settings.h"
#include "libpspp/str.h"
#include "libpspp/misc.h"
+#include "gl/c-ctype.h"
#include "gl/ftoastr.h"
/* Appends to OUTPUT a pair of hex digits for each byte in IN. */
bool ok;
v_in.f = number;
- s = data_out (&v_in, "FIXME", format);
+ s = data_out (&v_in, "FIXME", format, settings_get_fmt_settings ());
/* FIXME: UTF8 encoded strings will fail here */
- error = data_in (ss_cstr (s), C_ENCODING, format->type, &v_out, 0, NULL);
+ error = data_in (ss_cstr (s), C_ENCODING, format->type,
+ settings_get_fmt_settings (), &v_out, 0, NULL);
ok = error == NULL;
free (error);
if (width == 0)
syntax_gen_number (output, value->f, format);
else
- {
- char *s = CHAR_CAST_BUG (char *, value_str (value, width));
- syntax_gen_string (output, ss_buffer (s, width));
- }
+ syntax_gen_string (output,
+ ss_buffer (CHAR_CAST (const char *, value->s), width));
}
/* Appends <low> THRU <high> to OUTPUT. If LOW is LOWEST, then
{
for (;;)
{
+ char qualifier[16];
+ int precision = -1;
char directive;
size_t copy = strcspn (format, "%");
ds_put_substring (output, ss_buffer (format, copy));
assert (*format == '%');
format++;
directive = *format++;
+ if (directive == '.')
+ {
+ int x = 0;
+ while (directive = *format++, c_isdigit (directive))
+ {
+ assert (x < 16);
+ qualifier[x++] = directive;
+ }
+ qualifier[x++] = '\0';
+ precision = atoi (qualifier);
+ }
switch (directive)
{
case 's':
case 'f':
case 'g':
{
- char conv[3];
+ char conv[32];
double d = va_arg (args, double);
- conv[0]='%';
- conv[1]=directive;
- conv[2]='\0';
- ds_put_c_format (output, conv, d);
+ int x = 0;
+ conv[x++] = '%';
+ conv[x] = '\0';
+ if (precision != -1)
+ {
+ strcat (conv, ".");
+ strcat (conv, qualifier);
+ x += strlen (qualifier) + 1;
+ }
+ conv[x++] = directive;
+ conv[x++] = '\0';
+
+ ds_put_c_format (output, conv, d);
break;
}
%d: Same as printf's %d.
- %fp: The double argument is formatted precisely as a PSPP
- number, as if with a call to syntax_gen_number with a
- null FORMAT argument.
+ %f %g: Same as printf.
%%: Literal %.