X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Foperations.def;h=85e4d6c433a01365e6c4600a79c1d836fc89ef34;hb=e5675aa578a919a051f4de276d5f7e4df5ea8819;hp=6b4d5221eaec08b12873162c60be57bf79ed44be;hpb=8acca2de53c1852f38726f70fc6516b34732a79f;p=pspp diff --git a/src/language/expressions/operations.def b/src/language/expressions/operations.def index 6b4d5221ea..85e4d6c433 100644 --- a/src/language/expressions/operations.def +++ b/src/language/expressions/operations.def @@ -566,15 +566,8 @@ string function RTRIM (string s, string c) function NUMBER (string s, ni_format f) { - struct data_in di; union value out; - di.s = s.string; - di.v = &out; - di.flags = DI_IMPLIED_DECIMALS; - di.f1 = 1; - di.format = *f; - di.e = s.string + min (s.length, di.format.w); - data_in (&di); + data_in (ss_head (s, f->w), f->type, f->d, 0, &out, 0); return out.f; }