rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simpler definition for 'luaV_tonumber_'

This commit is contained in:
Roberto Ierusalimschy 2014-11-19 13:05:15 -02:00
parent 244646bdf7
commit 5d628519d3
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lvm.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lvm.c,v 2.227 2014/11/02 19:19:04 roberto Exp roberto $ ** $Id: lvm.c,v 2.228 2014/11/03 20:07:47 roberto Exp roberto $
** Lua virtual machine ** Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -63,26 +63,23 @@ static int tofloat (const TValue *obj, lua_Number *n) {
/* /*
** Try to convert a value to a float. Check 'isinteger' first, because ** Try to convert a value to a float. The float case is already handled
** in general the float case is already handled by the macro 'tonumber'. ** by the macro 'tonumber'.
*/ */
int luaV_tonumber_ (const TValue *obj, lua_Number *n) { int luaV_tonumber_ (const TValue *obj, lua_Number *n) {
TValue v; TValue v;
again:
if (ttisinteger(obj)) { if (ttisinteger(obj)) {
*n = cast_num(ivalue(obj)); *n = cast_num(ivalue(obj));
return 1; return 1;
} }
else if (ttisfloat(obj)) {
*n = fltvalue(obj);
return 1;
}
else if (cvt2num(obj) && /* string convertible to number? */ else if (cvt2num(obj) && /* string convertible to number? */
luaO_str2num(svalue(obj), &v) == tsvalue(obj)->len + 1) { luaO_str2num(svalue(obj), &v) == tsvalue(obj)->len + 1) {
obj = &v; /* convert result of 'luaO_str2num' to a float */
goto again; /* convert result from 'luaO_str2num' to a float */ *n = (ttisinteger(&v)) ? cast_num(ivalue(&v)) : fltvalue(&v);
return 1;
} }
return 0; /* conversion failed */ else
return 0; /* conversion failed */
} }