X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Foperations.def;h=df2887044fd377995d378009d9ea75df5d2c7555;hb=012b9e4ecf47d844aea352b2c0b7dda80a7194bd;hp=19bf2b54a8a00063b655d34b4429160ec0575912;hpb=a6dbf8792e4a17c2cdafa628a8c12236ca5ebf47;p=pspp diff --git a/src/language/expressions/operations.def b/src/language/expressions/operations.def index 19bf2b54a8..df2887044f 100644 --- 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; - 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) - 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", @@ -624,7 +626,7 @@ absorb_miss string function STRING (x, no_format f) 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);