projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
segment: The body of DEFINE does not have to be on separate lines.
[pspp]
/
src
/
language
/
expressions
/
operations.def
diff --git
a/src/language/expressions/operations.def
b/src/language/expressions/operations.def
index 19bf2b54a8a00063b655d34b4429160ec0575912..df2887044fd377995d378009d9ea75df5d2c7555 100644
(file)
--- a/
src/language/expressions/operations.def
+++ b/
src/language/expressions/operations.def
@@
-602,9
+602,11
@@
function NUMBER (string s, ni_format f)
if (s.length > f->w)
s.length = f->w;
if (s.length > f->w)
s.length = f->w;
- error = data_in (s, C_ENCODING, f->type, &out, 0, NULL);
+ error = data_in (s, C_ENCODING, f->type, settings_get_fmt_settings (),
+ &out, 0, NULL);
if (error == NULL)
if (error == NULL)
- data_in_imply_decimals (s, C_ENCODING, f->type, f->d, &out);
+ data_in_imply_decimals (s, C_ENCODING, f->type, f->d,
+ settings_get_fmt_settings (), &out);
else
{
msg (SE, "Cannot parse `%.*s' as format %s: %s",
else
{
msg (SE, "Cannot parse `%.*s' as format %s: %s",
@@
-624,7
+626,7
@@
absorb_miss string function STRING (x, no_format f)
v.f = x;
assert (!fmt_is_string (f->type));
v.f = x;
assert (!fmt_is_string (f->type));
- s = data_out (&v, C_ENCODING, f);
+ s = data_out (&v, C_ENCODING, f
, settings_get_fmt_settings ()
);
dst = alloc_string (e, strlen (s));
strcpy (dst.string, s);
free (s);
dst = alloc_string (e, strlen (s));
strcpy (dst.string, s);
free (s);