projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add code to read character encoding to dissect-sysfile.
[pspp]
/
src
/
language
/
dictionary
/
value-labels.c
diff --git
a/src/language/dictionary/value-labels.c
b/src/language/dictionary/value-labels.c
index 6af0b62c57aa981175253e0f5dd04f2ad10f9640..39f544ec4b917fa2b517129a06ad6c252d5cc171 100644
(file)
--- a/
src/language/dictionary/value-labels.c
+++ b/
src/language/dictionary/value-labels.c
@@
-25,11
+25,12
@@
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
\f
#include "gettext.h"
#define _(msgid) gettext (msgid)
\f
@@
-162,11
+163,9
@@
get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt)
{
if (!lex_is_number (lexer))
{
{
if (!lex_is_number (lexer))
{
- lex_error (lexer, _("expecting
integ
er"));
+ lex_error (lexer, _("expecting
numb
er"));
return 0;
}
return 0;
}
- if (!lex_is_integer (lexer))
- msg (SW, _("Value label `%g' is not integer."), lex_tokval (lexer));
value.f = lex_tokval (lexer);
}
lex_get (lexer);
value.f = lex_tokval (lexer);
}
lex_get (lexer);