projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
magic-elimination.patch from patch #6230.
[pspp-builds.git]
/
src
/
language
/
lexer
/
lexer.c
diff --git
a/src/language/lexer/lexer.c
b/src/language/lexer/lexer.c
index 71597302032a48cbf31f4d12d028f54bbc009780..7d5ece79b9cb983c01c7b8d939e15038b7f22125 100644
(file)
--- a/
src/language/lexer/lexer.c
+++ b/
src/language/lexer/lexer.c
@@
-27,7
+27,6
@@
#include <libpspp/assertion.h>
#include <language/command.h>
#include <libpspp/message.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 <data/settings.h>
#include <libpspp/getl.h>
#include <libpspp/str.h>
@@
-513,8
+512,7
@@
bool
lex_is_integer (struct lexer *lexer)
{
return (lex_is_number (lexer)
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);
}
&& lexer->tokval <= LONG_MAX
&& floor (lexer->tokval) == lexer->tokval);
}