/* PSPP - a program for statistical analysis.
- Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006, 2009, 2010 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
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
+
#include "value-parser.h"
+
#include <stdbool.h>
-#include <data/data-in.h>
-#include <libpspp/message.h>
-#include "lexer.h"
-#include <libpspp/str.h>
-#include <data/value.h>
-#include <data/format.h>
+
+#include "data/data-in.h"
+#include "data/format.h"
+#include "data/value.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/cast.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
lex_get (lexer);
return true;
}
- else if (lex_token (lexer) == T_STRING && format != NULL)
+ else if (lex_is_string (lexer) && format != NULL)
{
union value v;
- assert (! (fmt_get_category (*format) & ( FMT_CAT_STRING )));
- data_in (ds_ss (lex_tokstr (lexer)), LEGACY_NATIVE,
- *format, 0, 0, 0, NULL, &v, 0);
+
+ assert (fmt_get_category (*format) != FMT_CAT_STRING);
+
+ if (!data_in_msg (lex_tokss (lexer), LEGACY_NATIVE,
+ *format, &v, 0, NULL))
+ return false;
+
lex_get (lexer);
*x = v.f;
if (*x == SYSMIS)
return false;
v->f = lex_tokval (lexer);
}
- else
+ else if (lex_force_string (lexer))
{
+ const char *s;
+
if (!lex_force_string (lexer))
return false;
- value_copy_str_rpad (v, width, ds_cstr (lex_tokstr (lexer)), ' ');
+
+ s = lex_tokcstr (lexer);
+ value_copy_str_rpad (v, width, CHAR_CAST_BUG (const uint8_t *, s), ' ');
}
+ else
+ return false;
lex_get (lexer);