diff --git a/ext/ghoul b/ext/ghoul index 79b09090ae..0282811937 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 79b09090ae31f960ead48870a948af348323a287 +Subproject commit 0282811937bc5102ac4dad3a0b53bf72c28aac77 diff --git a/src/scripting/scriptengine_lua.inl b/src/scripting/scriptengine_lua.inl index f43ae6e365..1cdc5882f9 100644 --- a/src/scripting/scriptengine_lua.inl +++ b/src/scripting/scriptengine_lua.inl @@ -30,41 +30,10 @@ namespace openspace::luascriptfunctions { int printInternal(ghoul::logging::LogLevel level, lua_State* L) { - using ghoul::lua::luaTypeToString; - const int nArguments = lua_gettop(L); for (int i = 1; i <= nArguments; i++) { - const int type = lua_type(L, i); - switch (type) { - case LUA_TNONE: - case LUA_TLIGHTUSERDATA: - case LUA_TTABLE: - case LUA_TFUNCTION: - case LUA_TUSERDATA: - case LUA_TTHREAD: - log( - level, - "print", - fmt::format( - "Function parameter was of type '{}'", luaTypeToString(type) - ) - ); - break; - case LUA_TNIL: - break; - case LUA_TBOOLEAN: - log(level, "print", std::to_string(ghoul::lua::value(L, i))); - break; - case LUA_TNUMBER: - log(level, "print", std::to_string(ghoul::lua::value(L, i))); - break; - case LUA_TSTRING: - log(level, "print", ghoul::lua::value(L, i)); - break; - } + log(level, "print", ghoul::lua::luaValueToString(L, i)); } - - lua_pop(L, nArguments); ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");