mirrors/lua
1
0
Fork 0
mirror of https://github.com/lua/lua synced 2025-04-13 00:12:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

simpler checking for numbers (strtod does the rest)

Browse Source
This commit is contained in:
Roberto Ierusalimschy 2005-11-08 17:45:14 -02:00
parent e43e95553f
commit d2811e8097
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
llex.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: llex.c,v 2.11 2005/05/16 21:19:00 roberto Exp roberto $ ** $Id: llex.c,v 2.12 2005/05/17 19:49:15 roberto Exp roberto $
** Lexical Analyzer ** Lexical Analyzer
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -155,28 +155,23 @@ void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source) {
static int check_next (LexState *ls, const char *set) {
if (!strchr(set, ls->current))
return 0;
save_and_next(ls);
return 1;
}
/* LUA_NUMBER */ /* LUA_NUMBER */
static void read_numeral (LexState *ls, SemInfo *seminfo) { static void read_numeral (LexState *ls, SemInfo *seminfo) {
while (isdigit(ls->current)) { lua_assert(isdigit(ls->current));
do {
save_and_next(ls); save_and_next(ls);
} } while (isdigit(ls->current) || ls->current == '.');
if (ls->current == '.') { if (check_next(ls, "Ee")) { /* `E'? */
save_and_next(ls); check_next(ls, "+-"); /* optional exponent sign */
if (ls->current == '.') {
save_and_next(ls);
luaX_lexerror(ls,
"ambiguous syntax (decimal point x string concatenation)",
TK_NUMBER);
}
}
while (isdigit(ls->current)) {
save_and_next(ls);
}
if (ls->current == 'e' || ls->current == 'E') {
save_and_next(ls); /* read `E' */
if (ls->current == '+' || ls->current == '-')
save_and_next(ls); /* optional exponent sign */
while (isdigit(ls->current)) { while (isdigit(ls->current)) {
save_and_next(ls); save_and_next(ls);
} }
@ -375,12 +370,9 @@ int luaX_lex (LexState *ls, SemInfo *seminfo) {
} }
case '.': { case '.': {
save_and_next(ls); save_and_next(ls);
if (ls->current == '.') { if (check_next(ls, ".")) {
next(ls); if (check_next(ls, "."))
if (ls->current == '.') {
next(ls);
return TK_DOTS; /* ... */ return TK_DOTS; /* ... */
}
else return TK_CONCAT; /* .. */ else return TK_CONCAT; /* .. */
} }
else if (!isdigit(ls->current)) return '.'; else if (!isdigit(ls->current)) return '.';