Skip to content
Merged
1 change: 0 additions & 1 deletion emmy_core/src/emmy_core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ static const luaL_Reg lib[] = {
{"breakHere", breakHere},
{"stop", stop},
{"tcpSharedListen", tcpSharedListen},
{"enableDisplayCustomTypeInfo", enableDisplayCustomTypeInfo},
{"registerTypeName", registerTypeName},
{nullptr, nullptr}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ class Debugger: public std::enable_shared_from_this<Debugger>

void ClearVariableArenaRef();

void EnableDisplayCustomTypeInfo();
bool RegisterTypeName(const std::string& typeName, std::string& err);

private:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ int tcpSharedListen(lua_State* L);
// emmy.stop()
int stop(lua_State* L);

// emmy.enableDisplayCustomTypeInfo(): bool
int enableDisplayCustomTypeInfo(lua_State* L);

// emmy.registerTypeName(typeName: string): bool
int registerTypeName(lua_State* L);

Expand Down
1 change: 0 additions & 1 deletion emmy_debugger/include/emmy_debugger/emmy_facade.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ class EmmyFacade
bool PipeListen(lua_State* L, const std::string& name, std::string& err);
bool PipeConnect(lua_State* L, const std::string& name, std::string& err);
int BreakHere(lua_State* L);
bool EnableDisplayCustomTypeInfo(lua_State *L, std::string &err);
bool RegisterTypeName(lua_State *L, const std::string &typeName, std::string &err);

int OnConnect(bool suc);
Expand Down
5 changes: 1 addition & 4 deletions emmy_debugger/src/debugger/emmy_debugger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1443,16 +1443,13 @@ int Debugger::GetTypeFromName(const char* typeName) {
return -1; // 未知类型
}

void Debugger::EnableDisplayCustomTypeInfo() {
displayCustomTypeInfo = true;
}

bool Debugger::RegisterTypeName(const std::string& typeName, std::string& err) {
int type = GetTypeFromName(typeName.c_str());
if (type == -1) {
err = "Unknown type name: " + typeName;
return false;
}
displayCustomTypeInfo = true;
Comment thread
zhangjiequan marked this conversation as resolved.
registeredTypes.set(type);
return true;
}
11 changes: 0 additions & 11 deletions emmy_debugger/src/debugger/emmy_debugger_lib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,17 +117,6 @@ int stop(lua_State* L)
return 0;
}

// emmy.enableDisplayCustomTypeInfo(): bool
int enableDisplayCustomTypeInfo(lua_State* L)
{
std::string err;
const auto suc = EmmyFacade::Get().EnableDisplayCustomTypeInfo(L, err);
lua_pushboolean(L, suc);
if (suc) return 1;
lua_pushstring(L, err.c_str());
return 2;
}

// emmy.registerTypeName(typeName: string): bool
int registerTypeName(lua_State* L)
{
Expand Down
10 changes: 0 additions & 10 deletions emmy_debugger/src/emmy_facade.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -397,16 +397,6 @@ void EmmyFacade::Attach(lua_State *L) {
lua_sethook(L, EmmyFacade::HookLua, LUA_MASKCALL | LUA_MASKLINE | LUA_MASKRET, 0);
}

bool EmmyFacade::EnableDisplayCustomTypeInfo(lua_State *L, std::string &err) {
auto debugger = GetDebugger(L);
if (!debugger) {
err = "Debugger does not exist";
return false;
}
debugger->EnableDisplayCustomTypeInfo();
return true;
}

bool EmmyFacade::RegisterTypeName(lua_State *L, const std::string &typeName, std::string &err) {
auto debugger = GetDebugger(L);
if (!debugger) {
Expand Down