Merge branch 'main' into devtools
This commit is contained in:
commit
033f12d8e9
@ -21,8 +21,12 @@ namespace dynamic {
|
||||
using Map_sptr = std::shared_ptr<Map>;
|
||||
using List_sptr = std::shared_ptr<List>;
|
||||
|
||||
struct none {};
|
||||
|
||||
inline constexpr none NONE = {};
|
||||
|
||||
using Value = std::variant<
|
||||
std::monostate,
|
||||
none,
|
||||
Map_sptr,
|
||||
List_sptr,
|
||||
std::string,
|
||||
|
||||
@ -309,7 +309,7 @@ dynamic::Value lua::LuaState::tovalue(int idx) {
|
||||
switch (type) {
|
||||
case LUA_TNIL:
|
||||
case LUA_TNONE:
|
||||
return std::monostate();
|
||||
return dynamic::NONE;
|
||||
case LUA_TBOOLEAN:
|
||||
return lua_toboolean(L, idx) == 1;
|
||||
case LUA_TNUMBER: {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user