/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2013, 2016 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
{
enum fmt_type type = var_get_print_format (v[0])->type;
double x, y;
- bool ok;
if (!parse_num_range (lexer, &x, &y, &type))
goto error;
- ok = (x == y
+ if (!(x == y
? mv_add_num (&mv, x)
- : mv_add_range (&mv, x, y));
- if (!ok)
- ok = false;
+ : mv_add_range (&mv, x, y)))
+ {
+ msg (SE, _("Too many numeric missing values. At most "
+ "three individual values or one value and "
+ "one range are allowed."));
+ ok = false;
+ }
lex_match (lexer, T_COMMA);
}
}
else
{
+ const char *encoding = dict_get_encoding (dict);
+
mv_init (&mv, MV_MAX_STRING);
while (!lex_match (lexer, T_RPAREN))
{
- uint8_t value[MV_MAX_STRING];
- char *dict_mv;
- size_t length;
+ const char *utf8_s;
+ size_t utf8_trunc_len;
+ size_t utf8_len;
+
+ char *raw_s;
if (!lex_force_string (lexer))
{
break;
}
- dict_mv = recode_string (dict_get_encoding (dict), "UTF-8",
- lex_tokcstr (lexer),
- ss_length (lex_tokss (lexer)));
- length = strlen (dict_mv);
- if (length > MV_MAX_STRING)
+ /* Truncate the string to fit in 8 bytes in the dictionary
+ encoding. */
+ utf8_s = lex_tokcstr (lexer);
+ utf8_len = ss_length (lex_tokss (lexer));
+ utf8_trunc_len = utf8_encoding_trunc_len (utf8_s, encoding,
+ MV_MAX_STRING);
+ if (utf8_trunc_len < utf8_len)
+ msg (SE, _("Truncating missing value to maximum "
+ "acceptable length (%d bytes)."),
+ MV_MAX_STRING);
+
+ /* Recode to dictionary encoding and add. */
+ raw_s = recode_string (encoding, "UTF-8",
+ utf8_s, utf8_trunc_len);
+ if (!mv_add_str (&mv, CHAR_CAST (const uint8_t *, raw_s),
+ strlen (raw_s)))
{
- /* XXX truncate graphemes not bytes */
- msg (SE, _("Truncating missing value to maximum "
- "acceptable length (%d bytes)."),
- MV_MAX_STRING);
- length = MV_MAX_STRING;
+ msg (SE,
+ _("Too many string missing values. "
+ "At most three individual values are allowed."));
+ ok = false;
}
- memset (value, ' ', MV_MAX_STRING);
- memcpy (value, dict_mv, length);
- free (dict_mv);
-
- if (!mv_add_str (&mv, value))
- ok = false;
+ free (raw_s);
lex_get (lexer);
lex_match (lexer, T_COMMA);