From 0767823618ce9c0a9ef1f0de24d72c1402490681 Mon Sep 17 00:00:00 2001 From: Pelanyo Kamara Date: Mon, 22 Nov 2021 10:47:29 +0000 Subject: [PATCH] change return type for luaL_(opt/check)boolean & use in conformance tests --- VM/include/lualib.h | 4 ++-- VM/src/laux.cpp | 4 ++-- tests/Conformance.test.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VM/include/lualib.h b/VM/include/lualib.h index 0237096b..33427cf4 100644 --- a/VM/include/lualib.h +++ b/VM/include/lualib.h @@ -25,8 +25,8 @@ LUALIB_API const char* luaL_optlstring(lua_State* L, int numArg, const char* def LUALIB_API double luaL_checknumber(lua_State* L, int numArg); LUALIB_API double luaL_optnumber(lua_State* L, int nArg, double def); -LUALIB_API bool luaL_checkboolean(lua_State* L, int narg); -LUALIB_API bool luaL_optboolean(lua_State* L, int narg, bool def); +LUALIB_API int luaL_checkboolean(lua_State* L, int narg); +LUALIB_API int luaL_optboolean(lua_State* L, int narg, bool def); LUALIB_API int luaL_checkinteger(lua_State* L, int numArg); LUALIB_API int luaL_optinteger(lua_State* L, int nArg, int def); diff --git a/VM/src/laux.cpp b/VM/src/laux.cpp index af7f218f..82648863 100644 --- a/VM/src/laux.cpp +++ b/VM/src/laux.cpp @@ -183,7 +183,7 @@ LUALIB_API double luaL_optnumber(lua_State* L, int narg, double def) return luaL_opt(L, luaL_checknumber, narg, def); } -LUALIB_API bool luaL_checkboolean(lua_State* L, int narg) +LUALIB_API int luaL_checkboolean(lua_State* L, int narg) { // This checks specifically for boolean values, ignoring // all other truthy/falsy values. If the desired result @@ -194,7 +194,7 @@ LUALIB_API bool luaL_checkboolean(lua_State* L, int narg) return lua_toboolean(L, narg); } -LUALIB_API bool luaL_optboolean(lua_State* L, int narg, bool def) +LUALIB_API int luaL_optboolean(lua_State* L, int narg, bool def) { return luaL_opt(L, luaL_checkboolean, narg, def); } diff --git a/tests/Conformance.test.cpp b/tests/Conformance.test.cpp index e495a213..22977219 100644 --- a/tests/Conformance.test.cpp +++ b/tests/Conformance.test.cpp @@ -524,7 +524,7 @@ TEST_CASE("Debugger") L, [](lua_State* L) -> int { int line = luaL_checkinteger(L, 1); - bool enabled = lua_isboolean(L, 2) ? lua_toboolean(L, 2) : true; + bool enabled = luaL_optboolean(L, 2, true); lua_Debug ar = {}; lua_getinfo(L, 1, "f", &ar);