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

macros cast_integer/cast_unsigned replaced by cast_u2s/cast_s2u, that

Browse Source 
should be used only between lua_Integer and lua_Unsigned
This commit is contained in:
Roberto Ierusalimschy
2014-04-15 11:29:30 -03:00
parent 5c46b7b8cf
commit 8f961da3db
7 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lvm.c
View File

@@ -1,5 +1,5 @@
/*
** $Id: lvm.c,v 2.195 2014/04/09 17:05:11 roberto Exp roberto $
** $Id: lvm.c,v 2.196 2014/04/11 19:02:16 roberto Exp roberto $
** Lua virtual machine
** See Copyright Notice in lua.h
*/
@@ -88,7 +88,7 @@ int luaV_tostring (lua_State *L, StkId obj) {
*/
int luaV_numtointeger (lua_Number n, lua_Integer *p) {
if (cast_num(LUA_MININTEGER) <= n && n < (LUA_MAXINTEGER + cast_num(1))) {
*p = cast_integer(n);
*p = cast(lua_Integer, n);
lua_assert(cast_num(*p) == n);
return 1;
}
@@ -343,7 +343,7 @@ void luaV_objlen (lua_State *L, StkId ra, const TValue *rb) {
lua_Integer luaV_div (lua_State *L, lua_Integer x, lua_Integer y) {
if (cast_unsigned(y) + 1u <= 1u) { /* special cases: -1 or 0 */
if (cast_s2u(y) + 1u <= 1u) { /* special cases: -1 or 0 */
if (y == 0)
luaG_runerror(L, "attempt to divide by zero");
return intop(-, 0, x); /* y==-1; avoid overflow with 0x80000...//-1 */
@@ -359,7 +359,7 @@ lua_Integer luaV_div (lua_State *L, lua_Integer x, lua_Integer y) {
lua_Integer luaV_mod (lua_State *L, lua_Integer x, lua_Integer y) {
if (cast_unsigned(y) + 1u <= 1u) { /* special cases: -1 or 0 */
if (cast_s2u(y) + 1u <= 1u) { /* special cases: -1 or 0 */
if (y == 0)
luaG_runerror(L, "attempt to perform 'n%%0'");
return 0; /* y==-1; avoid overflow with 0x80000...%-1 */
@@ -398,11 +398,11 @@ lua_Integer luaV_pow (lua_State *L, lua_Integer x, lua_Integer y) {
lua_Integer luaV_shiftl (lua_Integer x, lua_Integer y) {
if (y < 0) { /* shift right? */
if (y <= -NBITS) return 0;
else return cast_integer(cast_unsigned(x) >> (-y));
else return intop(>>, x, -y);
}
else { /* shift left */
if (y >= NBITS) return 0;
else return x << y;
else return intop(<<, x, y);
}
}
@@ -792,7 +792,7 @@ void luaV_execute (lua_State *L) {
TValue *rb = RB(i);
lua_Integer ib;
if (tointeger(rb, &ib)) {
setivalue(ra, intop(^, cast_integer(-1), ib));
setivalue(ra, intop(^, ~cast_s2u(0), ib));
}
else {
Protect(luaT_trybinTM(L, rb, rb, ra, TM_BNOT));