From d47d17d02aae5f31a21723ed32df8f8ef7e61e0b Mon Sep 17 00:00:00 2001
From: abma <spring@abma.de>
Date: Sat, 1 Jun 2013 17:09:10 +0200
Subject: [PATCH] simplify math.bit_* / allow 32 bit

---
 rts/Lua/LuaBitOps.cpp | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/rts/Lua/LuaBitOps.cpp b/rts/Lua/LuaBitOps.cpp
index a2403be..a875173 100644
--- a/rts/Lua/LuaBitOps.cpp
+++ b/rts/Lua/LuaBitOps.cpp
@@ -8,8 +8,6 @@
 #include "LuaUtils.h"
 
 
-const int mask = 0x00FFFFFF; // 2^24
-
 
 /******************************************************************************/
 /******************************************************************************/
@@ -28,61 +26,55 @@ bool LuaBitOps::PushEntries(lua_State* L)
 /******************************************************************************/
 /******************************************************************************/
 
-static inline unsigned int luaL_checkuint(lua_State* L, int index)
-{
-	return (unsigned int)luaL_checkint(L, index);
-}
-
-
 int LuaBitOps::bit_or(lua_State* L)
 {
-	unsigned int result = 0x00000000;
+	int result = 0x00000000;
 	for (int i = 1; !lua_isnone(L, i); i++) {
-		result = result | luaL_checkuint(L, i);
+		result = result | luaL_checkint(L, i);
 	}
-	lua_pushnumber(L, result & mask);
+	lua_pushinteger(L, result);
 	return 1;
 }
 
 
 int LuaBitOps::bit_and(lua_State* L)
 {
-	unsigned int result = 0xFFFFFFFF;
+	int result = 0xFFFFFFFF;
 	for (int i = 1; !lua_isnone(L, i); i++) {
-		result = result & luaL_checkuint(L, i);
+		result = result & luaL_checkint(L, i);
 	}
-	lua_pushnumber(L, result & mask);
+	lua_pushinteger(L, result);
 	return 1;
 }
 
 
 int LuaBitOps::bit_xor(lua_State* L)
 {
-	unsigned int result = 0x00000000;
+	int result = 0x00000000;
 	for (int i = 1; !lua_isnone(L, i); i++) {
-		result = result ^ luaL_checkuint(L, i);
+		result = result ^ luaL_checkint(L, i);
 	}
-	lua_pushnumber(L, result & mask);
+	lua_pushinteger(L, result);
 	return 1;
 }
 
 
 int LuaBitOps::bit_inv(lua_State* L)
 {
-	const unsigned int result = ~luaL_checkuint(L, 1);
-	lua_pushnumber(L, result & mask);
+	const int result = ~luaL_checkint(L, 1);
+	lua_pushinteger(L, result);
 	return 1;
 }
 
 
 int LuaBitOps::bit_bits(lua_State* L)
 {
-	unsigned int result = 0x00000000;
+	int result = 0x00000000;
 	for (int i = 1; !lua_isnone(L, i); i++) {
-		const int bit = (unsigned int)luaL_checkint(L, i);
+		const int bit = luaL_checkint(L, i);
 		result = result | (1 << bit);
 	}
-	lua_pushnumber(L, result & mask);
+	lua_pushinteger(L, result);
 	return 1;
 }
 
-- 
1.8.1.2