// -*- c -*-
//
// PSPP - a program for statistical analysis.
-// Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2009, 2010, 2011 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
function NUMBER (string s, ni_format f)
{
union value out;
- data_in (ss_head (s, f->w), LEGACY_NATIVE, f->type, 0, 0, NULL, &out, 0);
- data_in_imply_decimals (s, LEGACY_NATIVE, f->type, f->d, &out);
+ char *error;
+
+ if (s.length > f->w)
+ s.length = f->w;
+ error = data_in (s, C_ENCODING, f->type, &out, 0, NULL);
+ if (error == NULL)
+ data_in_imply_decimals (s, C_ENCODING, f->type, f->d, &out);
+ else
+ {
+ msg (SE, "Cannot parse `%.*s' as format %s: %s",
+ (int) s.length, s.string, fmt_name (f->type), error);
+ free (error);
+ }
return out.f;
}
v.f = x;
assert (!fmt_is_string (f->type));
- s = data_out (&v, LEGACY_NATIVE, f);
+ s = data_out (&v, C_ENCODING, f);
dst = alloc_string (e, strlen (s));
strcpy (dst.string, s);
free (s);