Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 16:31:49 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try to work around the uninitialised member warning in sol::optional.

Browse Source
This commit is contained in:
Vas Crabb 2022-04-03 05:02:27 +10:00
parent 530c5abb5d
commit 3394ce4f2d
4 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/sound/sidvoice.h
View File

@ -77,7 +77,7 @@ struct sidOperator
int noiseIsLocked = 0;
uint8_t ADSRctrl = 0;
// int gateOnCtrl, gateOffCtrl;
// int gateOnCtrl = 0, gateOffCtrl = 0;
uint16_t (*ADSRproc)(sidOperator *) = nullptr;
#ifdef SID_FPUENVE

2
src/frontend/mame/luaengine.ipp
View File

@ -546,7 +546,7 @@ auto lua_engine::make_simple_callback_setter(void (T::*setter)(delegate<R ()> &&
}
else
{
auto result(invoke(cbfunc).get<sol::optional<R> >());
auto result(invoke(cbfunc).get<std::optional<R> >());
if (result)
{
return *result;

67
src/frontend/mame/luaengine_debug.cpp
View File

@ -101,6 +101,29 @@ public:
symbol_entry &add(char const *name) { return m_table.add(name, symbol_table::READ_WRITE); }
symbol_entry &add(char const *name, u64 value) { return m_table.add(name, value); }
symbol_entry &add(char const *name, sol::protected_function getter, std::optional<sol::protected_function> setter, std::optional<char const *> format)
{
symbol_table::setter_func setfun;
if (setter)
setfun = [cbfunc = std::move(*setter)] (u64 value) { invoke(cbfunc, value); };
return m_table.add(
name,
[cbfunc = std::move(getter)] () -> u64
{
auto result = invoke(cbfunc).get<std::optional<u64> >();
if (result)
{
return *result;
}
else
{
osd_printf_error("[LUA EROR] invalid return from symbol value getter callback\n");
return 0;
}
},
std::move(setfun),
(format && *format) ? *format : "");
};
symbol_entry *find(char const *name) const { return m_table.find(name); }
symbol_entry *find_deep(char const *name) { return m_table.find_deep(name); }
@ -181,30 +204,6 @@ void lua_engine::initialize_debug(sol::table &emu)
{ "m", EXPSPACE_REGION }
};
auto const do_add_symbol = [] (symbol_table_wrapper &st, char const *name, sol::protected_function getter, std::optional<sol::protected_function> setter, std::optional<char const *> format) -> symbol_entry &
{
symbol_table::setter_func setfun;
if (setter)
setfun = [cbfunc = std::move(*setter)] (u64 value) { invoke(cbfunc, value); };
return st.table().add(
name,
[cbfunc = std::move(getter)] () -> u64
{
auto result = invoke(cbfunc).get<sol::optional<u64> >();
if (result)
{
return *result;
}
else
{
osd_printf_error("[LUA EROR] invalid return from symbol value getter callback\n");
return 0;
}
},
std::move(setfun),
(format && *format) ? *format : "");
};
auto symbol_table_type = emu.new_usertype<symbol_table_wrapper>(
"symbol_table",
sol::call_constructor, sol::factories(
@ -229,22 +228,22 @@ void lua_engine::initialize_debug(sol::table &emu)
symbol_table_type["add"] = sol::overload(
static_cast<symbol_entry &(symbol_table_wrapper::*)(char const *)>(&symbol_table_wrapper::add),
static_cast<symbol_entry &(symbol_table_wrapper::*)(char const *, u64)>(&symbol_table_wrapper::add),
do_add_symbol,
[do_add_symbol] (symbol_table_wrapper &st, char const *name, sol::protected_function getter, sol::lua_nil_t, char const *format) -> symbol_entry &
static_cast<symbol_entry &(symbol_table_wrapper::*)(char const *, sol::protected_function, std::optional<sol::protected_function>, std::optional<char const *>)>(&symbol_table_wrapper::add),
[] (symbol_table_wrapper &st, char const *name, sol::protected_function getter, sol::lua_nil_t, char const *format) -> symbol_entry &
{
return do_add_symbol(st, name, getter, std::nullopt, format);
return st.add(name, getter, std::nullopt, format);
},
[do_add_symbol] (symbol_table_wrapper &st, char const *name, sol::protected_function getter, std::optional<sol::protected_function> setter) -> symbol_entry &
[] (symbol_table_wrapper &st, char const *name, sol::protected_function getter, std::optional<sol::protected_function> setter) -> symbol_entry &
{
return do_add_symbol(st, name, getter, setter, nullptr);
return st.add(name, getter, setter, nullptr);
},
[do_add_symbol] (symbol_table_wrapper &st, char const *name, sol::protected_function getter, char const *format) -> symbol_entry &
[] (symbol_table_wrapper &st, char const *name, sol::protected_function getter, char const *format) -> symbol_entry &
{
return do_add_symbol(st, name, getter, std::nullopt, format);
return st.add(name, getter, std::nullopt, format);
},
[do_add_symbol] (symbol_table_wrapper &st, char const *name, sol::protected_function getter) -> symbol_entry &
[] (symbol_table_wrapper &st, char const *name, sol::protected_function getter) -> symbol_entry &
{
return do_add_symbol(st, name, getter, std::nullopt, nullptr);
return st.add(name, getter, std::nullopt, nullptr);
},
[] (symbol_table_wrapper &st, sol::this_state s, char const *name, int minparams, int maxparams, sol::protected_function execute) -> symbol_entry &
{
@ -259,7 +258,7 @@ void lua_engine::initialize_debug(sol::table &emu)
sol::stack_aligned_stack_handler_function func(L, -1, traceback);
for (int i = 0; numparams > i; ++i)
lua_pushinteger(L, paramlist[i]);
auto result = func(sol::stack_count(numparams)).get<sol::optional<u64> >();
auto result = func(sol::stack_count(numparams)).get<std::optional<u64> >();
traceback.pop();
return result ? *result : 0;
});

4
src/frontend/mame/luaengine_mem.cpp
View File

@ -268,7 +268,7 @@ private:
m_name,
[this] (offs_t offset, T &data, T mem_mask)
{
auto result = invoke(m_callback, offset, data, mem_mask).template get<sol::optional<T> >();
auto result = invoke(m_callback, offset, data, mem_mask).template get<std::optional<T> >();
if (result)
data = *result;
},
@ -281,7 +281,7 @@ private:
m_name,
[this] (offs_t offset, T &data, T mem_mask)
{
auto result = invoke(m_callback, offset, data, mem_mask).template get<sol::optional<T> >();
auto result = invoke(m_callback, offset, data, mem_mask).template get<std::optional<T> >();
if (result)
data = *result;
},