StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

objc define to keep code clean on that platform

Browse Source
This commit is contained in:
ThePhD 2016-12-03 07:33:18 -05:00
parent 20b951d551
commit d0a36c9657
18 changed files with 168 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
single/sol/sol.hpp
View File

@ -20,8 +20,8 @@
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// This file was generated with a script.
// Generated 2016-12-02 10:47:03.358052 UTC
// This header was generated with sol v2.15.3 (revision 7bef50d)
// Generated 2016-12-03 12:32:47.121440 UTC
// This header was generated with sol v2.15.3 (revision 20b951d)
// https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_HPP
@ -3058,10 +3058,14 @@ namespace sol {
};
} // detail
struct nil_t {};
struct lua_nil_t {};
const lua_nil_t lua_nil{};
inline bool operator==(lua_nil_t, lua_nil_t) { return true; }
inline bool operator!=(lua_nil_t, lua_nil_t) { return false; }
#ifndef __OBJC__
typedef lua_nil_t nil_t;
const nil_t nil{};
inline bool operator==(nil_t, nil_t) { return true; }
inline bool operator!=(nil_t, nil_t) { return false; }
#endif
struct metatable_key_t {};
const metatable_key_t metatable_key = {};
@ -3298,7 +3302,10 @@ namespace sol {
enum class type : int {
none = LUA_TNONE,
nil = LUA_TNIL,
lua_nil = LUA_TNIL,
#ifndef __OBJC__
nil = lua_nil,
#endif // Objective C++ Keyword
string = LUA_TSTRING,
number = LUA_TNUMBER,
thread = LUA_TTHREAD,
@ -3307,7 +3314,7 @@ namespace sol {
userdata = LUA_TUSERDATA,
lightuserdata = LUA_TLIGHTUSERDATA,
table = LUA_TTABLE,
poly = none | nil | string | number | thread |
poly = none | lua_nil | string | number | thread |
table | boolean | function | userdata | lightuserdata
};
@ -3514,13 +3521,13 @@ namespace sol {
struct lua_type_of<bool> : std::integral_constant<type, type::boolean> {};
template <>
struct lua_type_of<nil_t> : std::integral_constant<type, type::nil> { };
struct lua_type_of<lua_nil_t> : std::integral_constant<type, type::lua_nil> { };
template <>
struct lua_type_of<nullopt_t> : std::integral_constant<type, type::nil> { };
struct lua_type_of<nullopt_t> : std::integral_constant<type, type::lua_nil> { };
template <>
struct lua_type_of<std::nullptr_t> : std::integral_constant<type, type::nil> { };
struct lua_type_of<std::nullptr_t> : std::integral_constant<type, type::lua_nil> { };
template <>
struct lua_type_of<sol::error> : std::integral_constant<type, type::string> { };
@ -3742,7 +3749,7 @@ namespace sol {
public:
stack_reference() noexcept = default;
stack_reference(nil_t) noexcept : stack_reference() {};
stack_reference(lua_nil_t) noexcept : stack_reference() {};
stack_reference(lua_State* L, int i) noexcept : L(L), index(lua_absindex(L, i)) {}
stack_reference(lua_State* L, absolute_index i) noexcept : L(L), index(i) {}
stack_reference(lua_State* L, raw_index i) noexcept : L(L), index(i) {}
@ -3775,7 +3782,7 @@ namespace sol {
bool valid() const noexcept {
type t = get_type();
return t != type::nil && t != type::none;
return t != type::lua_nil && t != type::none;
}
};
@ -3852,7 +3859,7 @@ namespace sol {
public:
reference() noexcept = default;
reference(nil_t) noexcept : reference() {}
reference(lua_nil_t) noexcept : reference() {}
reference(const stack_reference& r) noexcept : reference(r.lua_state(), r.stack_index()) {}
reference(stack_reference&& r) noexcept : reference(r.lua_state(), r.stack_index()) {}
reference(lua_State* L, int index = -1) noexcept : luastate(L) {
@ -4773,7 +4780,7 @@ namespace sol {
const auto& metakey = usertype_traits<T>::metatable();
luaL_getmetatable(L, &metakey[0]);
const type expectedmetatabletype = static_cast<type>(lua_type(L, -1));
if (expectedmetatabletype != type::nil) {
if (expectedmetatabletype != type::lua_nil) {
if (lua_rawequal(L, -1, index) == 1) {
lua_pop(L, 1 + static_cast<int>(poptable));
return true;
@ -4842,7 +4849,7 @@ namespace sol {
};
template <type expected, typename C>
struct checker<nil_t, expected, C> {
struct checker<lua_nil_t, expected, C> {
template <typename Handler>
static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
bool success = lua_isnil(L, index);
@ -4861,7 +4868,7 @@ namespace sol {
};
template <type expected, typename C>
struct checker<nullopt_t, expected, C> : checker<nil_t> {};
struct checker<nullopt_t, expected, C> : checker<lua_nil_t> {};
template <typename C>
struct checker<this_state, type::poly, C> {
@ -4953,8 +4960,8 @@ namespace sol {
static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
tracking.use(1);
type t = type_of(L, index);
if (t == type::nil || t == type::none || t == type::function) {
// allow for nil to be returned
if (t == type::lua_nil || t == type::none || t == type::function) {
// allow for lua_nil to be returned
return true;
}
if (t != type::userdata && t != type::table) {
@ -5028,7 +5035,7 @@ namespace sol {
auto pn = stack::pop_n(L, 1);
lua_pushstring(L, &detail::base_class_check_key()[0]);
lua_rawget(L, metatableindex);
if (type_of(L, -1) != type::nil) {
if (type_of(L, -1) != type::lua_nil) {
void* basecastdata = lua_touserdata(L, -1);
detail::inheritance_check_function ic = (detail::inheritance_check_function)basecastdata;
success = ic(detail::id_for<T>::value);
@ -5058,8 +5065,8 @@ namespace sol {
template <typename Handler>
static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
const type indextype = type_of(L, index);
// Allow nil to be transformed to nullptr
if (indextype == type::nil) {
// Allow lua_nil to be transformed to nullptr
if (indextype == type::lua_nil) {
tracking.use(1);
return true;
}
@ -5108,7 +5115,7 @@ namespace sol {
tracking.use(0);
return true;
}
if (t == type::nil) {
if (t == type::lua_nil) {
tracking.use(1);
return true;
}
@ -5211,7 +5218,7 @@ namespace sol {
for (lua_Integer i = 0; ; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
for (int vi = 0; vi < lua_size<V>::value; ++vi) {
type t = static_cast<type>(lua_geti(L, index, i + vi));
if (t == type::nil) {
if (t == type::lua_nil) {
if (i == 0) {
continue;
}
@ -5230,7 +5237,7 @@ namespace sol {
lua_pushinteger(L, i);
lua_gettable(L, index);
type t = type_of(L, -1);
if (t == type::nil) {
if (t == type::lua_nil) {
if (i == 0) {
continue;
}
@ -5482,10 +5489,10 @@ namespace sol {
};
template<>
struct getter<nil_t> {
static nil_t get(lua_State*, int, record& tracking) {
struct getter<lua_nil_t> {
static lua_nil_t get(lua_State*, int, record& tracking) {
tracking.use(1);
return nil;
return lua_nil;
}
};
@ -5552,14 +5559,14 @@ namespace sol {
template<typename T>
struct getter<detail::as_value_tag<T>> {
static T* get_no_nil(lua_State* L, int index, record& tracking) {
static T* get_no_lua_nil(lua_State* L, int index, record& tracking) {
tracking.use(1);
void** pudata = static_cast<void**>(lua_touserdata(L, index));
void* udata = *pudata;
return get_no_nil_from(L, udata, index, tracking);
return get_no_lua_nil_from(L, udata, index, tracking);
}
static T* get_no_nil_from(lua_State* L, void* udata, int index, record&) {
static T* get_no_lua_nil_from(lua_State* L, void* udata, int index, record&) {
if (detail::has_derived<T>::value && luaL_getmetafield(L, index, &detail::base_class_cast_key()[0]) != 0) {
void* basecastdata = lua_touserdata(L, -1);
detail::inheritance_cast_function ic = (detail::inheritance_cast_function)basecastdata;
@ -5572,7 +5579,7 @@ namespace sol {
}
static T& get(lua_State* L, int index, record& tracking) {
return *get_no_nil(L, index, tracking);
return *get_no_lua_nil(L, index, tracking);
}
};
@ -5580,18 +5587,18 @@ namespace sol {
struct getter<detail::as_pointer_tag<T>> {
static T* get(lua_State* L, int index, record& tracking) {
type t = type_of(L, index);
if (t == type::nil) {
if (t == type::lua_nil) {
tracking.use(1);
return nullptr;
}
return getter<detail::as_value_tag<T>>::get_no_nil(L, index, tracking);
return getter<detail::as_value_tag<T>>::get_no_lua_nil(L, index, tracking);
}
};
template<typename T>
struct getter<non_null<T*>> {
static T* get(lua_State* L, int index, record& tracking) {
return getter<detail::as_value_tag<T>>::get_no_nil(L, index, tracking);
return getter<detail::as_value_tag<T>>::get_no_lua_nil(L, index, tracking);
}
};
@ -5905,7 +5912,7 @@ namespace sol {
template <typename F>
static int push_fx(lua_State* L, F&& f, T* obj) {
if (obj == nullptr)
return stack::push(L, nil);
return stack::push(L, lua_nil);
T** pref = static_cast<T**>(lua_newuserdata(L, sizeof(T*)));
*pref = obj;
f();
@ -5957,7 +5964,7 @@ namespace sol {
template <typename Arg, meta::enable<std::is_base_of<Real, meta::unqualified_t<Arg>>> = meta::enabler>
static int push(lua_State* L, Arg&& arg) {
if (unique_usertype_traits<T>::is_null(arg))
return stack::push(L, nil);
return stack::push(L, lua_nil);
return push_deep(L, std::forward<Arg>(arg));
}
@ -6095,8 +6102,8 @@ namespace sol {
};
template<>
struct pusher<nil_t> {
static int push(lua_State* L, nil_t) {
struct pusher<lua_nil_t> {
static int push(lua_State* L, lua_nil_t) {
lua_pushnil(L);
return 1;
}
@ -6250,7 +6257,7 @@ namespace sol {
static int push(lua_State* L, const char* str) {
if (str == nullptr)
return stack::push(L, nil);
return stack::push(L, lua_nil);
return push_sized(L, str, std::char_traits<char>::length(str));
}
@ -6505,14 +6512,14 @@ namespace sol {
template<>
struct pusher<nullopt_t> {
static int push(lua_State* L, nullopt_t) {
return stack::push(L, nil);
return stack::push(L, lua_nil);
}
};
template<>
struct pusher<std::nullptr_t> {
static int push(lua_State* L, std::nullptr_t) {
return stack::push(L, nil);
return stack::push(L, lua_nil);
}
};
@ -6576,7 +6583,7 @@ namespace sol {
struct field_getter<metatable_key_t, b, raw, C> {
void get(lua_State* L, metatable_key_t, int tableindex = -1) {
if (lua_getmetatable(L, tableindex) == 0)
push(L, nil);
push(L, lua_nil);
}
};
@ -6797,7 +6804,7 @@ namespace sol {
return probe(false, 0);
}
get_field<b, raw>(L, std::forward<Key>(key), tableindex);
return probe(!check<nil_t>(L), 1);
return probe(!check<lua_nil_t>(L), 1);
}
};
@ -6813,7 +6820,7 @@ namespace sol {
return probe(false, 1);
}
get_field<false, raw>(L, std::get<1>(keys), tableindex);
return probe(!check<nil_t>(L), 2);
return probe(!check<lua_nil_t>(L), 2);
}
};
@ -6822,7 +6829,7 @@ namespace sol {
template <std::size_t I, typename Keys>
probe apply(std::index_sequence<I>, int sofar, lua_State* L, Keys&& keys, int tableindex) {
get_field < I < 1 && b, raw>(L, std::get<I>(keys), tableindex);
return probe(!check<nil_t>(L), sofar);
return probe(!check<lua_nil_t>(L), sofar);
}
template <std::size_t I, std::size_t I1, std::size_t... In, typename Keys>
@ -7642,7 +7649,7 @@ namespace sol {
userdataref.push();
luaL_getmetatable(L, &meta[0]);
if (type_of(L, -1) == type::nil) {
if (type_of(L, -1) == type::lua_nil) {
lua_pop(L, 1);
return luaL_error(L, "sol: unable to get usertype metatable");
}
@ -7759,7 +7766,7 @@ namespace sol {
#ifdef SOL_SAFE_USERTYPE
auto maybeo = stack::check_get<Ta*>(L, 1);
if (!maybeo || maybeo.value() == nullptr) {
return luaL_error(L, "sol: received null for 'self' argument (use ':' for accessing member functions, make sure member variables are preceeded by the actual object with '.' syntax)");
return luaL_error(L, "sol: received nil for 'self' argument (use ':' for accessing member functions, make sure member variables are preceeded by the actual object with '.' syntax)");
}
object_type* o = static_cast<object_type*>(maybeo.value());
return call(L, std::forward<Fx>(f), *o);
@ -7849,9 +7856,9 @@ namespace sol {
auto maybeo = stack::check_get<Ta*>(L, 1);
if (!maybeo || maybeo.value() == nullptr) {
if (is_variable) {
return luaL_error(L, "sol: 'self' argument is nil (bad '.' access?)");
return luaL_error(L, "sol: 'self' argument is lua_nil (bad '.' access?)");
}
return luaL_error(L, "sol: 'self' argument is nil (pass 'self' as first argument)");
return luaL_error(L, "sol: 'self' argument is lua_nil (pass 'self' as first argument)");
}
object_type* o = static_cast<object_type*>(maybeo.value());
return call(L, f, *o);
@ -7882,7 +7889,7 @@ namespace sol {
userdataref.push();
luaL_getmetatable(L, &metakey[0]);
if (type_of(L, -1) == type::nil) {
if (type_of(L, -1) == type::lua_nil) {
lua_pop(L, 1);
return luaL_error(L, "sol: unable to get usertype metatable");
}
@ -7911,7 +7918,7 @@ namespace sol {
userdataref.push();
luaL_getmetatable(L, &metakey[0]);
if (type_of(L, -1) == type::nil) {
if (type_of(L, -1) == type::lua_nil) {
lua_pop(L, 1);
std::string err = "sol: unable to get usertype metatable for ";
err += usertype_traits<T>::name();
@ -8002,9 +8009,9 @@ namespace sol {
auto maybeo = stack::check_get<Ta*>(L, 1);
if (!maybeo || maybeo.value() == nullptr) {
if (is_variable) {
return luaL_error(L, "sol: 'self' argument is nil (bad '.' access?)");
return luaL_error(L, "sol: 'self' argument is lua_nil (bad '.' access?)");
}
return luaL_error(L, "sol: 'self' argument is nil (pass 'self' as first argument)");
return luaL_error(L, "sol: 'self' argument is lua_nil (pass 'self' as first argument)");
}
object_type* o = static_cast<object_type*>(maybeo.value());
#else
@ -9015,7 +9022,7 @@ namespace sol {
tracking.last = 1;
tracking.used += 1;
type t = type_of(L, index);
if (t == type::none || t == type::nil) {
if (t == type::none || t == type::lua_nil) {
return nullptr;
}
return get_std_func(return_types(), args_lists(), L, index);
@ -9659,7 +9666,7 @@ namespace sol {
basic_object() noexcept = default;
template <typename T, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_object>>, meta::neg<std::is_same<base_t, stack_reference>>, std::is_base_of<base_t, meta::unqualified_t<T>>> = meta::enabler>
basic_object(T&& r) : base_t(std::forward<T>(r)) {}
basic_object(nil_t r) : base_t(r) {}
basic_object(lua_nil_t r) : base_t(r) {}
basic_object(const basic_object&) = default;
basic_object(basic_object&&) = default;
basic_object& operator=(const basic_object&) = default;
@ -9705,19 +9712,19 @@ namespace sol {
return make_reference<T, object, true>(L, std::forward<Args>(args)...);
}
inline bool operator==(const object& lhs, const nil_t&) {
inline bool operator==(const object& lhs, const lua_nil_t&) {
return !lhs.valid();
}
inline bool operator==(const nil_t&, const object& rhs) {
inline bool operator==(const lua_nil_t&, const object& rhs) {
return !rhs.valid();
}
inline bool operator!=(const object& lhs, const nil_t&) {
inline bool operator!=(const object& lhs, const lua_nil_t&) {
return lhs.valid();
}
inline bool operator!=(const nil_t&, const object& rhs) {
inline bool operator!=(const lua_nil_t&, const object& rhs) {
return rhs.valid();
}
} // sol
@ -9842,22 +9849,22 @@ namespace sol {
}
template<typename Table, typename Key>
inline bool operator==(nil_t, const proxy<Table, Key>& right) {
inline bool operator==(lua_nil_t, const proxy<Table, Key>& right) {
return !right.valid();
}
template<typename Table, typename Key>
inline bool operator==(const proxy<Table, Key>& right, nil_t) {
inline bool operator==(const proxy<Table, Key>& right, lua_nil_t) {
return !right.valid();
}
template<typename Table, typename Key>
inline bool operator!=(nil_t, const proxy<Table, Key>& right) {
inline bool operator!=(lua_nil_t, const proxy<Table, Key>& right) {
return right.valid();
}
template<typename Table, typename Key>
inline bool operator!=(const proxy<Table, Key>& right, nil_t) {
inline bool operator!=(const proxy<Table, Key>& right, lua_nil_t) {
return right.valid();
}
@ -9977,9 +9984,9 @@ namespace sol {
auto maybeaccessor = stack::get<optional<string_detail::string_shim>>(L, is_index ? -1 : -2);
string_detail::string_shim accessor = maybeaccessor.value_or(string_detail::string_shim("(unknown)"));
if (is_index)
return luaL_error(L, "sol: attempt to index (get) nil value \"%s\" on userdata (bad (misspelled?) key name or does not exist)", accessor.c_str());
return luaL_error(L, "sol: attempt to index (get) lua_nil value \"%s\" on userdata (bad (misspelled?) key name or does not exist)", accessor.c_str());
else
return luaL_error(L, "sol: attempt to index (set) nil value \"%s\" on userdata (bad (misspelled?) key name or does not exist)", accessor.c_str());
return luaL_error(L, "sol: attempt to index (set) lua_nil value \"%s\" on userdata (bad (misspelled?) key name or does not exist)", accessor.c_str());
}
template <bool is_index, typename Base>
@ -9991,13 +9998,13 @@ namespace sol {
const char* basewalkkey = is_index ? detail::base_class_index_propogation_key() : detail::base_class_new_index_propogation_key();
luaL_getmetatable(L, metakey);
if (type_of(L, -1) == type::nil) {
if (type_of(L, -1) == type::lua_nil) {
lua_pop(L, 1);
return;
}
stack::get_field(L, basewalkkey);
if (type_of(L, -1) == type::nil) {
if (type_of(L, -1) == type::lua_nil) {
lua_pop(L, 2);
return;
}
@ -10533,7 +10540,7 @@ namespace sol {
}
luaL_getmetatable(L, metakey);
int tableindex = lua_gettop(L);
if (type_of(L, tableindex) == type::nil) {
if (type_of(L, tableindex) == type::lua_nil) {
continue;
}
stack::set_field<false, true>(L, stack_reference(L, 2), stack_reference(L, 3), tableindex);
@ -10574,9 +10581,9 @@ namespace sol {
}
// Check table storage first for a method that works
luaL_getmetatable(L, sm.metakey);
if (type_of(L, -1) != type::nil) {
if (type_of(L, -1) != type::lua_nil) {
stack::get_field<false, true>(L, accessor.c_str(), lua_gettop(L));
if (type_of(L, -1) != type::nil) {
if (type_of(L, -1) != type::lua_nil) {
// Woo, we found it?
lua_remove(L, -2);
return 1;
@ -10745,7 +10752,7 @@ namespace sol {
private:
template<std::size_t... I, typename Tuple>
simple_usertype_metatable(usertype_detail::verified_tag, std::index_sequence<I...>, lua_State* L, Tuple&& args)
: callconstructfunc(nil),
: callconstructfunc(lua_nil),
indexfunc(&usertype_detail::indexing_fail<true>), newindexfunc(&usertype_detail::indexing_fail<false>),
indexbase(&usertype_detail::simple_core_indexing_call<true>), newindexbase(&usertype_detail::simple_core_indexing_call<false>),
indexbaseclasspropogation(usertype_detail::walk_all_bases<true>), newindexbaseclasspropogation(&usertype_detail::walk_all_bases<false>),
@ -11140,7 +11147,7 @@ namespace sol {
}
}
}
return stack::push(L, nil);
return stack::push(L, lua_nil);
}
static int real_index_call_associative(std::false_type, lua_State* L) {
@ -11152,7 +11159,7 @@ namespace sol {
K k = *maybek;
#ifdef SOL_SAFE_USERTYPE
if (k > src.size() || k < 1) {
return stack::push(L, nil);
return stack::push(L, lua_nil);
}
#else
#endif // Safety
@ -11176,7 +11183,7 @@ namespace sol {
}
}
return stack::push(L, nil);
return stack::push(L, lua_nil);
}
static int real_index_call(lua_State* L) {
@ -11213,7 +11220,7 @@ namespace sol {
#ifdef SOL_SAFE_USERTYPE
auto maybek = stack::check_get<K>(L, 2);
if (!maybek) {
return stack::push(L, nil);
return stack::push(L, lua_nil);
}
K k = *maybek;
#else
@ -11593,7 +11600,7 @@ namespace sol {
basic_table_iterator(reference_type x) : ref(std::move(x)) {
ref.push();
tableidx = lua_gettop(ref.lua_state());
stack::push(ref.lua_state(), nil);
stack::push(ref.lua_state(), lua_nil);
this->operator++();
if (idx == -1) {
return;
@ -11676,7 +11683,7 @@ namespace sol {
template<typename Fx>
void for_each(std::true_type, Fx&& fx) const {
auto pp = stack::push_pop(*this);
stack::push(base_t::lua_state(), nil);
stack::push(base_t::lua_state(), lua_nil);
while (lua_next(base_t::lua_state(), -2)) {
sol::object key(base_t::lua_state(), -2);
sol::object value(base_t::lua_state(), -1);
@ -11689,7 +11696,7 @@ namespace sol {
template<typename Fx>
void for_each(std::false_type, Fx&& fx) const {
auto pp = stack::push_pop(*this);
stack::push(base_t::lua_state(), nil);
stack::push(base_t::lua_state(), lua_nil);
while (lua_next(base_t::lua_state(), -2)) {
sol::object key(base_t::lua_state(), -2);
sol::object value(base_t::lua_state(), -1);

16
sol/call.hpp
View File

@ -161,7 +161,7 @@ namespace sol {
userdataref.push();
luaL_getmetatable(L, &meta[0]);
if (type_of(L, -1) == type::nil) {
if (type_of(L, -1) == type::lua_nil) {
lua_pop(L, 1);
return luaL_error(L, "sol: unable to get usertype metatable");
}
@ -278,7 +278,7 @@ namespace sol {
#ifdef SOL_SAFE_USERTYPE
auto maybeo = stack::check_get<Ta*>(L, 1);
if (!maybeo || maybeo.value() == nullptr) {
return luaL_error(L, "sol: received null for 'self' argument (use ':' for accessing member functions, make sure member variables are preceeded by the actual object with '.' syntax)");
return luaL_error(L, "sol: received nil for 'self' argument (use ':' for accessing member functions, make sure member variables are preceeded by the actual object with '.' syntax)");
}
object_type* o = static_cast<object_type*>(maybeo.value());
return call(L, std::forward<Fx>(f), *o);
@ -368,9 +368,9 @@ namespace sol {
auto maybeo = stack::check_get<Ta*>(L, 1);
if (!maybeo || maybeo.value() == nullptr) {
if (is_variable) {
return luaL_error(L, "sol: 'self' argument is nil (bad '.' access?)");
return luaL_error(L, "sol: 'self' argument is lua_nil (bad '.' access?)");
}
return luaL_error(L, "sol: 'self' argument is nil (pass 'self' as first argument)");
return luaL_error(L, "sol: 'self' argument is lua_nil (pass 'self' as first argument)");
}
object_type* o = static_cast<object_type*>(maybeo.value());
return call(L, f, *o);
@ -401,7 +401,7 @@ namespace sol {
userdataref.push();
luaL_getmetatable(L, &metakey[0]);
if (type_of(L, -1) == type::nil) {
if (type_of(L, -1) == type::lua_nil) {
lua_pop(L, 1);
return luaL_error(L, "sol: unable to get usertype metatable");
}
@ -430,7 +430,7 @@ namespace sol {
userdataref.push();
luaL_getmetatable(L, &metakey[0]);
if (type_of(L, -1) == type::nil) {
if (type_of(L, -1) == type::lua_nil) {
lua_pop(L, 1);
std::string err = "sol: unable to get usertype metatable for ";
err += usertype_traits<T>::name();
@ -521,9 +521,9 @@ namespace sol {
auto maybeo = stack::check_get<Ta*>(L, 1);
if (!maybeo || maybeo.value() == nullptr) {
if (is_variable) {
return luaL_error(L, "sol: 'self' argument is nil (bad '.' access?)");
return luaL_error(L, "sol: 'self' argument is lua_nil (bad '.' access?)");
}
return luaL_error(L, "sol: 'self' argument is nil (pass 'self' as first argument)");
return luaL_error(L, "sol: 'self' argument is lua_nil (pass 'self' as first argument)");
}
object_type* o = static_cast<object_type*>(maybeo.value());
#else

8
sol/container_usertype_metatable.hpp
View File

@ -161,7 +161,7 @@ namespace sol {
}
}
}
return stack::push(L, nil);
return stack::push(L, lua_nil);
}
static int real_index_call_associative(std::false_type, lua_State* L) {
@ -173,7 +173,7 @@ namespace sol {
K k = *maybek;
#ifdef SOL_SAFE_USERTYPE
if (k > src.size() || k < 1) {
return stack::push(L, nil);
return stack::push(L, lua_nil);
}
#else
#endif // Safety
@ -197,7 +197,7 @@ namespace sol {
}
}
return stack::push(L, nil);
return stack::push(L, lua_nil);
}
static int real_index_call(lua_State* L) {
@ -234,7 +234,7 @@ namespace sol {
#ifdef SOL_SAFE_USERTYPE
auto maybek = stack::check_get<K>(L, 2);
if (!maybek) {
return stack::push(L, nil);
return stack::push(L, lua_nil);
}
K k = *maybek;
#else

2
sol/function.hpp
View File

@ -139,7 +139,7 @@ namespace sol {
tracking.last = 1;
tracking.used += 1;
type t = type_of(L, index);
if (t == type::none || t == type::nil) {
if (t == type::none || t == type::lua_nil) {
return nullptr;
}
return get_std_func(return_types(), args_lists(), L, index);

10
sol/object.hpp
View File

@ -87,7 +87,7 @@ namespace sol {
basic_object() noexcept = default;
template <typename T, meta::enable<meta::neg<std::is_same<meta::unqualified_t<T>, basic_object>>, meta::neg<std::is_same<base_t, stack_reference>>, std::is_base_of<base_t, meta::unqualified_t<T>>> = meta::enabler>
basic_object(T&& r) : base_t(std::forward<T>(r)) {}
basic_object(nil_t r) : base_t(r) {}
basic_object(lua_nil_t r) : base_t(r) {}
basic_object(const basic_object&) = default;
basic_object(basic_object&&) = default;
basic_object& operator=(const basic_object&) = default;
@ -133,19 +133,19 @@ namespace sol {
return make_reference<T, object, true>(L, std::forward<Args>(args)...);
}
inline bool operator==(const object& lhs, const nil_t&) {
inline bool operator==(const object& lhs, const lua_nil_t&) {
return !lhs.valid();
}
inline bool operator==(const nil_t&, const object& rhs) {
inline bool operator==(const lua_nil_t&, const object& rhs) {
return !rhs.valid();
}
inline bool operator!=(const object& lhs, const nil_t&) {
inline bool operator!=(const object& lhs, const lua_nil_t&) {
return lhs.valid();
}
inline bool operator!=(const nil_t&, const object& rhs) {
inline bool operator!=(const lua_nil_t&, const object& rhs) {
return rhs.valid();
}
} // sol

8
sol/proxy.hpp
View File

@ -146,22 +146,22 @@ namespace sol {
}
template<typename Table, typename Key>
inline bool operator==(nil_t, const proxy<Table, Key>& right) {
inline bool operator==(lua_nil_t, const proxy<Table, Key>& right) {
return !right.valid();
}
template<typename Table, typename Key>
inline bool operator==(const proxy<Table, Key>& right, nil_t) {
inline bool operator==(const proxy<Table, Key>& right, lua_nil_t) {
return !right.valid();
}
template<typename Table, typename Key>
inline bool operator!=(nil_t, const proxy<Table, Key>& right) {
inline bool operator!=(lua_nil_t, const proxy<Table, Key>& right) {
return right.valid();
}
template<typename Table, typename Key>
inline bool operator!=(const proxy<Table, Key>& right, nil_t) {
inline bool operator!=(const proxy<Table, Key>& right, lua_nil_t) {
return right.valid();
}

2
sol/reference.hpp
View File

@ -87,7 +87,7 @@ namespace sol {
public:
reference() noexcept = default;
reference(nil_t) noexcept : reference() {}
reference(lua_nil_t) noexcept : reference() {}
reference(const stack_reference& r) noexcept : reference(r.lua_state(), r.stack_index()) {}
reference(stack_reference&& r) noexcept : reference(r.lua_state(), r.stack_index()) {}
reference(lua_State* L, int index = -1) noexcept : luastate(L) {

8
sol/simple_usertype_metatable.hpp
View File

@ -90,7 +90,7 @@ namespace sol {
}
luaL_getmetatable(L, metakey);
int tableindex = lua_gettop(L);
if (type_of(L, tableindex) == type::nil) {
if (type_of(L, tableindex) == type::lua_nil) {
continue;
}
stack::set_field<false, true>(L, stack_reference(L, 2), stack_reference(L, 3), tableindex);
@ -131,9 +131,9 @@ namespace sol {
}
// Check table storage first for a method that works
luaL_getmetatable(L, sm.metakey);
if (type_of(L, -1) != type::nil) {
if (type_of(L, -1) != type::lua_nil) {
stack::get_field<false, true>(L, accessor.c_str(), lua_gettop(L));
if (type_of(L, -1) != type::nil) {
if (type_of(L, -1) != type::lua_nil) {
// Woo, we found it?
lua_remove(L, -2);
return 1;
@ -302,7 +302,7 @@ namespace sol {
private:
template<std::size_t... I, typename Tuple>
simple_usertype_metatable(usertype_detail::verified_tag, std::index_sequence<I...>, lua_State* L, Tuple&& args)
: callconstructfunc(nil),
: callconstructfunc(lua_nil),
indexfunc(&usertype_detail::indexing_fail<true>), newindexfunc(&usertype_detail::indexing_fail<false>),
indexbase(&usertype_detail::simple_core_indexing_call<true>), newindexbase(&usertype_detail::simple_core_indexing_call<false>),
indexbaseclasspropogation(usertype_detail::walk_all_bases<true>), newindexbaseclasspropogation(&usertype_detail::walk_all_bases<false>),

18
sol/stack_check.hpp
View File

@ -37,7 +37,7 @@ namespace sol {
const auto& metakey = usertype_traits<T>::metatable();
luaL_getmetatable(L, &metakey[0]);
const type expectedmetatabletype = static_cast<type>(lua_type(L, -1));
if (expectedmetatabletype != type::nil) {
if (expectedmetatabletype != type::lua_nil) {
if (lua_rawequal(L, -1, index) == 1) {
lua_pop(L, 1 + static_cast<int>(poptable));
return true;
@ -106,7 +106,7 @@ namespace sol {
};
template <type expected, typename C>
struct checker<nil_t, expected, C> {
struct checker<lua_nil_t, expected, C> {
template <typename Handler>
static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
bool success = lua_isnil(L, index);
@ -125,7 +125,7 @@ namespace sol {
};
template <type expected, typename C>
struct checker<nullopt_t, expected, C> : checker<nil_t> {};
struct checker<nullopt_t, expected, C> : checker<lua_nil_t> {};
template <typename C>
struct checker<this_state, type::poly, C> {
@ -217,8 +217,8 @@ namespace sol {
static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
tracking.use(1);
type t = type_of(L, index);
if (t == type::nil || t == type::none || t == type::function) {
// allow for nil to be returned
if (t == type::lua_nil || t == type::none || t == type::function) {
// allow for lua_nil to be returned
return true;
}
if (t != type::userdata && t != type::table) {
@ -292,7 +292,7 @@ namespace sol {
auto pn = stack::pop_n(L, 1);
lua_pushstring(L, &detail::base_class_check_key()[0]);
lua_rawget(L, metatableindex);
if (type_of(L, -1) != type::nil) {
if (type_of(L, -1) != type::lua_nil) {
void* basecastdata = lua_touserdata(L, -1);
detail::inheritance_check_function ic = (detail::inheritance_check_function)basecastdata;
success = ic(detail::id_for<T>::value);
@ -322,8 +322,8 @@ namespace sol {
template <typename Handler>
static bool check(lua_State* L, int index, Handler&& handler, record& tracking) {
const type indextype = type_of(L, index);
// Allow nil to be transformed to nullptr
if (indextype == type::nil) {
// Allow lua_nil to be transformed to nullptr
if (indextype == type::lua_nil) {
tracking.use(1);
return true;
}
@ -372,7 +372,7 @@ namespace sol {
tracking.use(0);
return true;
}
if (t == type::nil) {
if (t == type::lua_nil) {
tracking.use(1);
return true;
}

2
sol/stack_field.hpp
View File

@ -51,7 +51,7 @@ namespace sol {
struct field_getter<metatable_key_t, b, raw, C> {
void get(lua_State* L, metatable_key_t, int tableindex = -1) {
if (lua_getmetatable(L, tableindex) == 0)
push(L, nil);
push(L, lua_nil);
}
};

24
sol/stack_get.hpp
View File

@ -97,7 +97,7 @@ namespace sol {
for (lua_Integer i = 0; ; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
for (int vi = 0; vi < lua_size<V>::value; ++vi) {
type t = static_cast<type>(lua_geti(L, index, i + vi));
if (t == type::nil) {
if (t == type::lua_nil) {
if (i == 0) {
continue;
}
@ -116,7 +116,7 @@ namespace sol {
lua_pushinteger(L, i);
lua_gettable(L, index);
type t = type_of(L, -1);
if (t == type::nil) {
if (t == type::lua_nil) {
if (i == 0) {
continue;
}
@ -368,10 +368,10 @@ namespace sol {
};
template<>
struct getter<nil_t> {
static nil_t get(lua_State*, int, record& tracking) {
struct getter<lua_nil_t> {
static lua_nil_t get(lua_State*, int, record& tracking) {
tracking.use(1);
return nil;
return lua_nil;
}
};
@ -438,14 +438,14 @@ namespace sol {
template<typename T>
struct getter<detail::as_value_tag<T>> {
static T* get_no_nil(lua_State* L, int index, record& tracking) {
static T* get_no_lua_nil(lua_State* L, int index, record& tracking) {
tracking.use(1);
void** pudata = static_cast<void**>(lua_touserdata(L, index));
void* udata = *pudata;
return get_no_nil_from(L, udata, index, tracking);
return get_no_lua_nil_from(L, udata, index, tracking);
}
static T* get_no_nil_from(lua_State* L, void* udata, int index, record&) {
static T* get_no_lua_nil_from(lua_State* L, void* udata, int index, record&) {
if (detail::has_derived<T>::value && luaL_getmetafield(L, index, &detail::base_class_cast_key()[0]) != 0) {
void* basecastdata = lua_touserdata(L, -1);
detail::inheritance_cast_function ic = (detail::inheritance_cast_function)basecastdata;
@ -458,7 +458,7 @@ namespace sol {
}
static T& get(lua_State* L, int index, record& tracking) {
return *get_no_nil(L, index, tracking);
return *get_no_lua_nil(L, index, tracking);
}
};
@ -466,18 +466,18 @@ namespace sol {
struct getter<detail::as_pointer_tag<T>> {
static T* get(lua_State* L, int index, record& tracking) {
type t = type_of(L, index);
if (t == type::nil) {
if (t == type::lua_nil) {
tracking.use(1);
return nullptr;
}
return getter<detail::as_value_tag<T>>::get_no_nil(L, index, tracking);
return getter<detail::as_value_tag<T>>::get_no_lua_nil(L, index, tracking);
}
};
template<typename T>
struct getter<non_null<T*>> {
static T* get(lua_State* L, int index, record& tracking) {
return getter<detail::as_value_tag<T>>::get_no_nil(L, index, tracking);
return getter<detail::as_value_tag<T>>::get_no_lua_nil(L, index, tracking);
}
};

6
sol/stack_probe.hpp
View File

@ -36,7 +36,7 @@ namespace sol {
return probe(false, 0);
}
get_field<b, raw>(L, std::forward<Key>(key), tableindex);
return probe(!check<nil_t>(L), 1);
return probe(!check<lua_nil_t>(L), 1);
}
};
@ -52,7 +52,7 @@ namespace sol {
return probe(false, 1);
}
get_field<false, raw>(L, std::get<1>(keys), tableindex);
return probe(!check<nil_t>(L), 2);
return probe(!check<lua_nil_t>(L), 2);
}
};
@ -61,7 +61,7 @@ namespace sol {
template <std::size_t I, typename Keys>
probe apply(std::index_sequence<I>, int sofar, lua_State* L, Keys&& keys, int tableindex) {
get_field < I < 1 && b, raw>(L, std::get<I>(keys), tableindex);
return probe(!check<nil_t>(L), sofar);
return probe(!check<lua_nil_t>(L), sofar);
}
template <std::size_t I, std::size_t I1, std::size_t... In, typename Keys>

14
sol/stack_push.hpp
View File

@ -71,7 +71,7 @@ namespace sol {
template <typename F>
static int push_fx(lua_State* L, F&& f, T* obj) {
if (obj == nullptr)
return stack::push(L, nil);
return stack::push(L, lua_nil);
T** pref = static_cast<T**>(lua_newuserdata(L, sizeof(T*)));
*pref = obj;
f();
@ -123,7 +123,7 @@ namespace sol {
template <typename Arg, meta::enable<std::is_base_of<Real, meta::unqualified_t<Arg>>> = meta::enabler>
static int push(lua_State* L, Arg&& arg) {
if (unique_usertype_traits<T>::is_null(arg))
return stack::push(L, nil);
return stack::push(L, lua_nil);
return push_deep(L, std::forward<Arg>(arg));
}
@ -261,8 +261,8 @@ namespace sol {
};
template<>
struct pusher<nil_t> {
static int push(lua_State* L, nil_t) {
struct pusher<lua_nil_t> {
static int push(lua_State* L, lua_nil_t) {
lua_pushnil(L);
return 1;
}
@ -416,7 +416,7 @@ namespace sol {
static int push(lua_State* L, const char* str) {
if (str == nullptr)
return stack::push(L, nil);
return stack::push(L, lua_nil);
return push_sized(L, str, std::char_traits<char>::length(str));
}
@ -671,14 +671,14 @@ namespace sol {
template<>
struct pusher<nullopt_t> {
static int push(lua_State* L, nullopt_t) {
return stack::push(L, nil);
return stack::push(L, lua_nil);
}
};
template<>
struct pusher<std::nullptr_t> {
static int push(lua_State* L, std::nullptr_t) {
return stack::push(L, nil);
return stack::push(L, lua_nil);
}
};

4
sol/stack_reference.hpp
View File

@ -35,7 +35,7 @@ namespace sol {
public:
stack_reference() noexcept = default;
stack_reference(nil_t) noexcept : stack_reference() {};
stack_reference(lua_nil_t) noexcept : stack_reference() {};
stack_reference(lua_State* L, int i) noexcept : L(L), index(lua_absindex(L, i)) {}
stack_reference(lua_State* L, absolute_index i) noexcept : L(L), index(i) {}
stack_reference(lua_State* L, raw_index i) noexcept : L(L), index(i) {}
@ -68,7 +68,7 @@ namespace sol {
bool valid() const noexcept {
type t = get_type();
return t != type::nil && t != type::none;
return t != type::lua_nil && t != type::none;
}
};

4
sol/table_core.hpp
View File

@ -49,7 +49,7 @@ namespace sol {
template<typename Fx>
void for_each(std::true_type, Fx&& fx) const {
auto pp = stack::push_pop(*this);
stack::push(base_t::lua_state(), nil);
stack::push(base_t::lua_state(), lua_nil);
while (lua_next(base_t::lua_state(), -2)) {
sol::object key(base_t::lua_state(), -2);
sol::object value(base_t::lua_state(), -1);
@ -62,7 +62,7 @@ namespace sol {
template<typename Fx>
void for_each(std::false_type, Fx&& fx) const {
auto pp = stack::push_pop(*this);
stack::push(base_t::lua_state(), nil);
stack::push(base_t::lua_state(), lua_nil);
while (lua_next(base_t::lua_state(), -2)) {
sol::object key(base_t::lua_state(), -2);
sol::object value(base_t::lua_state(), -1);

2
sol/table_iterator.hpp
View File

@ -57,7 +57,7 @@ namespace sol {
basic_table_iterator(reference_type x) : ref(std::move(x)) {
ref.push();
tableidx = lua_gettop(ref.lua_state());
stack::push(ref.lua_state(), nil);
stack::push(ref.lua_state(), lua_nil);
this->operator++();
if (idx == -1) {
return;

23
sol/types.hpp
View File

@ -106,10 +106,14 @@ namespace sol {
};
} // detail
struct nil_t {};
struct lua_nil_t {};
const lua_nil_t lua_nil{};
inline bool operator==(lua_nil_t, lua_nil_t) { return true; }
inline bool operator!=(lua_nil_t, lua_nil_t) { return false; }
#ifndef __OBJC__
typedef lua_nil_t nil_t;
const nil_t nil{};
inline bool operator==(nil_t, nil_t) { return true; }
inline bool operator!=(nil_t, nil_t) { return false; }
#endif
struct metatable_key_t {};
const metatable_key_t metatable_key = {};
@ -346,7 +350,10 @@ namespace sol {
enum class type : int {
none = LUA_TNONE,
nil = LUA_TNIL,
lua_nil = LUA_TNIL,
#ifndef __OBJC__
nil = lua_nil,
#endif // Objective C++ Keyword
string = LUA_TSTRING,
number = LUA_TNUMBER,
thread = LUA_TTHREAD,
@ -355,7 +362,7 @@ namespace sol {
userdata = LUA_TUSERDATA,
lightuserdata = LUA_TLIGHTUSERDATA,
table = LUA_TTABLE,
poly = none | nil | string | number | thread |
poly = none | lua_nil | string | number | thread |
table | boolean | function | userdata | lightuserdata
};
@ -562,13 +569,13 @@ namespace sol {
struct lua_type_of<bool> : std::integral_constant<type, type::boolean> {};
template <>
struct lua_type_of<nil_t> : std::integral_constant<type, type::nil> { };
struct lua_type_of<lua_nil_t> : std::integral_constant<type, type::lua_nil> { };
template <>
struct lua_type_of<nullopt_t> : std::integral_constant<type, type::nil> { };
struct lua_type_of<nullopt_t> : std::integral_constant<type, type::lua_nil> { };
template <>
struct lua_type_of<std::nullptr_t> : std::integral_constant<type, type::nil> { };
struct lua_type_of<std::nullptr_t> : std::integral_constant<type, type::lua_nil> { };
template <>
struct lua_type_of<sol::error> : std::integral_constant<type, type::string> { };

8
sol/usertype_metatable.hpp
View File

@ -107,9 +107,9 @@ namespace sol {
auto maybeaccessor = stack::get<optional<string_detail::string_shim>>(L, is_index ? -1 : -2);
string_detail::string_shim accessor = maybeaccessor.value_or(string_detail::string_shim("(unknown)"));
if (is_index)
return luaL_error(L, "sol: attempt to index (get) nil value \"%s\" on userdata (bad (misspelled?) key name or does not exist)", accessor.c_str());
return luaL_error(L, "sol: attempt to index (get) lua_nil value \"%s\" on userdata (bad (misspelled?) key name or does not exist)", accessor.c_str());
else
return luaL_error(L, "sol: attempt to index (set) nil value \"%s\" on userdata (bad (misspelled?) key name or does not exist)", accessor.c_str());
return luaL_error(L, "sol: attempt to index (set) lua_nil value \"%s\" on userdata (bad (misspelled?) key name or does not exist)", accessor.c_str());
}
template <bool is_index, typename Base>
@ -121,13 +121,13 @@ namespace sol {
const char* basewalkkey = is_index ? detail::base_class_index_propogation_key() : detail::base_class_new_index_propogation_key();
luaL_getmetatable(L, metakey);
if (type_of(L, -1) == type::nil) {
if (type_of(L, -1) == type::lua_nil) {
lua_pop(L, 1);
return;
}
stack::get_field(L, basewalkkey);
if (type_of(L, -1) == type::nil) {
if (type_of(L, -1) == type::lua_nil) {
lua_pop(L, 2);
return;
}