#include <limits.h>
#include <math.h>
#include <stdarg.h>
+#include <stdint.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <language/command.h>
#include <libpspp/message.h>
-#include <libpspp/magic.h>
#include <data/settings.h>
#include <libpspp/getl.h>
#include <libpspp/str.h>
#include <output/journal.h>
-#include "size_max.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
int token; /* Current token. */
double tokval; /* T_POS_NUM, T_NEG_NUM: the token's value. */
- char tokid [LONG_NAME_LEN + 1]; /* T_ID: the identifier. */
+ char tokid [VAR_NAME_LEN + 1]; /* T_ID: the identifier. */
struct string tokstr; /* T_ID, T_STRING: token string value.
For T_ID, this is not truncated as is
lex_is_integer (struct lexer *lexer)
{
return (lex_is_number (lexer)
- && lexer->tokval != NOT_LONG
- && lexer->tokval >= LONG_MIN
+ && lexer->tokval > LONG_MIN
&& lexer->tokval <= LONG_MAX
&& floor (lexer->tokval) == lexer->tokval);
}
byte_cnt = ds_length (&lexer->tokstr) / chars_per_byte;
if (ds_length (&lexer->tokstr) % chars_per_byte)
- msg (SE, _("String of %s digits has %d characters, which is not a "
+ msg (SE, _("String of %s digits has %zu characters, which is not a "
"multiple of %d."),
- base_name, (int) ds_length (&lexer->tokstr), chars_per_byte);
+ base_name, ds_length (&lexer->tokstr), chars_per_byte);
p = ds_cstr (&lexer->tokstr);
for (i = 0; i < byte_cnt; i++)
if (ds_length (&lexer->tokstr) > 255)
{
- msg (SE, _("String exceeds 255 characters in length (%d characters)."),
- (int) ds_length (&lexer->tokstr));
+ msg (SE, _("String exceeds 255 characters in length (%zu characters)."),
+ ds_length (&lexer->tokstr));
ds_truncate (&lexer->tokstr, 255);
}