Bruce/lua-immutable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switched hash to be stored in an 'int' instead of 'unsigned long long',

Browse Source 
so that it interacts consistenly with rawgeti and rawseti in Lua 5.1
api.
This commit is contained in:
Bruce Hill 2018-05-04 16:59:43 -07:00
parent 6e6e38ad1f
commit 156d88a020
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
limmutable.c
View File

@ -52,7 +52,7 @@ static int WEAK_VALUE_METATABLE;
static int SHARED_CLASS_METATABLE;
typedef struct {
unsigned long long hash;
int hash;
size_t len;
} immutable_info_t;
@ -84,7 +84,7 @@ static int Lcreate_instance(lua_State *L)
}
// Compute the hash:
unsigned long long hash = 0x9a937c4d; // Seed
unsigned long long ull_hash = 0x9a937c4d; // Seed
for (lua_Integer i=1; i <=(lua_Integer)n; i++) {
unsigned long long item_hash;
int type = n > n_args ? LUA_TNIL : lua_type(L, 1+i);
@ -128,8 +128,9 @@ static int Lcreate_instance(lua_State *L)
default:
item_hash = 0;
}
hash = (1000003 * hash) ^ item_hash;
ull_hash = (1000003 * ull_hash) ^ item_hash;
}
int hash = (int)ull_hash;
lua_getfield(L, 1, "__instances");
@ -356,7 +357,7 @@ static int Lindex(lua_State *L)
lua_rawgeti(L, -1, info->hash);
// Stack: [mt, indices, i, buckets, bucket]
if (lua_isnil(L, -1)) {
luaL_error(L, "Failed to find hash bucket for hash: %p", (void*)info->hash);
luaL_error(L, "Failed to find hash bucket for hash: %d", info->hash);
}
lua_pushvalue(L, 1);
// Stack: [mt, indices, i, buckets, bucket, inst_udata]
@ -593,7 +594,7 @@ static int Ltable(lua_State *L)
lua_rawgeti(L, -1, info->hash);
// Stack: [mt, buckets, bucket]
if (lua_isnil(L, -1)) {
luaL_error(L, "Failed to find hash bucket for hash: %p", (void*)info->hash);
luaL_error(L, "Failed to find hash bucket for hash: %d", info->hash);
}
lua_pushvalue(L, 1);
// Stack: [mt, buckets, bucket, inst_udata]