#include <stdio.h>
#include <stdlib.h>
+#include "data/dictionary.h"
#include "data/procedure.h"
#include "data/value-labels.h"
#include "data/variable.h"
#include "language/lexer/lexer.h"
#include "language/lexer/value-parser.h"
#include "language/lexer/variable-parser.h"
+#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/str.h"
static int do_value_labels (struct lexer *,
const struct dictionary *dict, bool);
static void erase_labels (struct variable **vars, size_t var_cnt);
-static int get_label (struct lexer *, struct variable **vars, size_t var_cnt);
+static int get_label (struct lexer *, struct variable **vars, size_t var_cnt,
+ const char *dict_encoding);
\f
/* Stubs. */
if (erase)
erase_labels (vars, var_cnt);
while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD)
- if (!get_label (lexer, vars, var_cnt))
+ if (!get_label (lexer, vars, var_cnt, dict_get_encoding (dict)))
goto lossage;
if (lex_token (lexer) != T_SLASH)
free (vars);
}
- if (parse_err)
- return CMD_FAILURE;
-
- return lex_end_of_command (lexer);
+ return parse_err ? CMD_FAILURE : CMD_SUCCESS;
lossage:
free (vars);
/* Parse all the labels for the VAR_CNT variables in VARS and add
the specified labels to those variables. */
static int
-get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt)
+get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt,
+ const char *dict_encoding)
{
/* Parse all the labels and add them to the variables. */
do
int width = var_get_width (vars[0]);
union value value;
struct string label;
+ size_t trunc_len;
size_t i;
/* Set value. */
ds_init_substring (&label, lex_tokss (lexer));
- if (ds_length (&label) > MAX_LABEL_LEN)
+ trunc_len = utf8_encoding_trunc_len (ds_cstr (&label), dict_encoding,
+ MAX_LABEL_LEN);
+ if (ds_length (&label) > trunc_len)
{
msg (SW, _("Truncating value label to %d bytes."), MAX_LABEL_LEN);
- ds_truncate (&label, MAX_LABEL_LEN);
+ ds_truncate (&label, trunc_len);
}
for (i = 0; i < var_cnt; i++)