nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

own implementation of 'tunumber', so that it works correctly with

Browse Source 
numbers outside the 'int' range
This commit is contained in:
Roberto Ierusalimschy
2010-12-27 16:00:38 -02:00
parent 0b3f4e254e
commit aa6faa6331
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lbaselib.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lbaselib.c,v 1.255 2010/12/13 16:38:00 roberto Exp roberto $ ** $Id: lbaselib.c,v 1.256 2010/12/17 15:14:58 roberto Exp roberto $
** Basic library ** Basic library
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -47,33 +47,39 @@ static int luaB_print (lua_State *L) {
static int luaB_tonumber (lua_State *L) { static int luaB_tonumber (lua_State *L) {
int base = luaL_optint(L, 2, 10); int base = luaL_optint(L, 2, 10);
luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
if (base == 10) { /* standard conversion */ if (base == 10) { /* standard conversion */
luaL_checkany(L, 1); luaL_checkany(L, 1);
if (lua_isnumber(L, 1)) { if (lua_isnumber(L, 1)) {
lua_pushnumber(L, lua_tonumber(L, 1)); lua_pushnumber(L, lua_tonumber(L, 1));
return 1; return 1;
} } /* else not a number */
} }
else { else {
size_t l1; size_t l;
const char *s1 = luaL_checklstring(L, 1, &l1); const char *s = luaL_checklstring(L, 1, &l);
const char *e1 = s1 + l1; const char *e = s + l; /* end point for 's' */
char *s2;
unsigned long n;
int neg = 0; int neg = 0;
luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range"); s += strspn(s, SPACECHARS); /* skip initial spaces */
s1 += strspn(s1, SPACECHARS); /* skip initial spaces */ if (*s == '-') { s++; neg = 1; } /* handle signal */
if (*s1 == '-') { s1++; neg = 1; } else if (*s == '+') s++;
n = strtoul(s1, &s2, base); if (isalnum((unsigned char)*s)) {
if (s1 != s2) { /* at least one valid digit? */ lua_Number n = 0;
s2 += strspn(s2, SPACECHARS); /* skip trailing spaces */ do {
if (s2 == e1) { /* no invalid trailing characters? */ int digit = (isdigit((unsigned char)*s)) ? *s - '0'
lua_pushnumber(L, (neg) ? -(lua_Number)n : (lua_Number)n); : toupper((unsigned char)*s) - 'A' + 10;
if (digit >= base) break; /* invalid numeral; force a fail */
n = n * (lua_Number)base + (lua_Number)digit;
s++;
} while (isalnum((unsigned char)*s));
s += strspn(s, SPACECHARS); /* skip trailing spaces */
if (s == e) { /* no invalid trailing characters? */
lua_pushnumber(L, (neg) ? -n : n);
return 1; return 1;
} } /* else not a number */
} } /* else not a number */
} }
lua_pushnil(L); /* else not a number */ lua_pushnil(L); /* not a number */
return 1; return 1;
} }