Implement tabletype tagging
This commit is contained in:
@@ -171,29 +171,22 @@ void LuaStack::getclass(LuaSlot classtab, LuaSlot classname) const {
|
||||
LuaVar globtab, cname;
|
||||
LuaStack LS(L_, globtab, cname);
|
||||
|
||||
if (!LS.isstring(classname)) {
|
||||
luaL_error(L_, "Not a class name: %s", lua_tostring(L_, classname));
|
||||
}
|
||||
|
||||
// Convert class name to a table.
|
||||
if (LS.isstring(classname)) {
|
||||
if (LS.rawequal(classname, "_G")) {
|
||||
luaL_error(L_, "_G is explicitly not allowed as a class name");
|
||||
}
|
||||
LS.getglobaltable(globtab);
|
||||
LS.rawget(classtab, globtab, classname);
|
||||
if (!LS.istable(classtab)) {
|
||||
luaL_error(L_, "Not a class: %s", lua_tostring(L_, classname));
|
||||
}
|
||||
LS.rawget(cname, classtab, "__class");
|
||||
if (!LS.rawequal(cname, classname)) {
|
||||
luaL_error(L_, "Not a class: %s", lua_tostring(L_, classname));
|
||||
}
|
||||
} else {
|
||||
LS.set(classtab, classname);
|
||||
if (!LS.istable(classtab)) {
|
||||
luaL_error(L_, "class can be a string or a table");
|
||||
}
|
||||
LS.rawget(cname, classtab, "__class");
|
||||
if (!LS.isstring(cname)) {
|
||||
luaL_error(L_, "table is not a class");
|
||||
}
|
||||
if (LS.rawequal(classname, "_G")) {
|
||||
luaL_error(L_, "_G is explicitly not allowed as a class name");
|
||||
}
|
||||
LS.getglobaltable(globtab);
|
||||
LS.rawget(classtab, globtab, classname);
|
||||
if (!LS.istable(classtab)) {
|
||||
luaL_error(L_, "Not a class: %s", lua_tostring(L_, classname));
|
||||
}
|
||||
LS.rawget(cname, classtab, "__class");
|
||||
if (!LS.rawequal(cname, classname)) {
|
||||
luaL_error(L_, "Not a class: %s", lua_tostring(L_, classname));
|
||||
}
|
||||
|
||||
// OK, we're done.
|
||||
@@ -230,6 +223,7 @@ void LuaStack::makeclass(LuaSlot classtab, LuaSlot classname) const {
|
||||
}
|
||||
|
||||
// Repair the special fields.
|
||||
LS.settabletype(classtab, TAB_CLASS);
|
||||
LS.rawset(classtab, "__index", classtab);
|
||||
LS.rawset(classtab, "__class", classname);
|
||||
|
||||
@@ -271,3 +265,21 @@ void LuaStack::check_nret(int xnret, int otop, int nret) const {
|
||||
luaL_error(L_, "expected %d return values", xnret);
|
||||
}
|
||||
}
|
||||
|
||||
LuaStack::TableType LuaStack::gettabletype(LuaSlot tab) {
|
||||
uint16_t bits = lua_getflagbits(L_, tab.index());
|
||||
return TableType(bits & 0x000F);
|
||||
}
|
||||
|
||||
void LuaStack::settabletype(LuaSlot tab, TableType t) {
|
||||
lua_modflagbits(L_, tab.index(), 0x000F, t);
|
||||
}
|
||||
|
||||
bool LuaStack::getvisited(LuaSlot tab) {
|
||||
uint16_t bits = lua_getflagbits(L_, tab.index());
|
||||
return (bits & 0x0010);
|
||||
}
|
||||
|
||||
void LuaStack::setvisited(LuaSlot tab, bool visited) {
|
||||
lua_modflagbits(L_, tab.index(), 0x0010, visited ? 0x0010 : 0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user