mirror of
https://github.com/ThePhD/sol2.git
synced 2024-03-22 13:10:44 +08:00
Fix in_place and optional usage here
Add `has_begin_end` getters for standard things
This commit is contained in:
parent
7903e1ec05
commit
4c2748eaef
2
Optional
2
Optional
|
@ -1 +1 @@
|
||||||
Subproject commit 717f86cc20e5602d1c5b7a380b1b68a4a85d0653
|
Subproject commit c386acbdf2d6ae368de7cba55801b06d362bdaac
|
50
sol/in_place.hpp
Normal file
50
sol/in_place.hpp
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
// The MIT License (MIT)
|
||||||
|
|
||||||
|
// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors
|
||||||
|
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
|
// this software and associated documentation files (the "Software"), to deal in
|
||||||
|
// the Software without restriction, including without limitation the rights to
|
||||||
|
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||||
|
// the Software, and to permit persons to whom the Software is furnished to do so,
|
||||||
|
// subject to the following conditions:
|
||||||
|
|
||||||
|
// The above copyright notice and this permission notice shall be included in all
|
||||||
|
// copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||||
|
// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||||
|
// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||||
|
// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||||
|
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
|
#ifndef SOL_IN_PLACE_HPP
|
||||||
|
#define SOL_IN_PLACE_HPP
|
||||||
|
|
||||||
|
namespace sol {
|
||||||
|
|
||||||
|
namespace detail {
|
||||||
|
struct in_place_of {};
|
||||||
|
template <std::size_t I>
|
||||||
|
struct in_place_of_i {};
|
||||||
|
template <typename T>
|
||||||
|
struct in_place_of_t {};
|
||||||
|
} // detail
|
||||||
|
|
||||||
|
struct in_place_tag { struct init {}; constexpr in_place_tag(init) {} in_place_tag() = delete; };
|
||||||
|
constexpr inline in_place_tag in_place(detail::in_place_of) { return in_place_tag(in_place_tag::init()); }
|
||||||
|
template <typename T>
|
||||||
|
constexpr inline in_place_tag in_place(detail::in_place_of_t<T>) { return in_place_tag(in_place_tag::init()); }
|
||||||
|
template <std::size_t I>
|
||||||
|
constexpr inline in_place_tag in_place(detail::in_place_of_i<I>) { return in_place_tag(in_place_tag::init()); }
|
||||||
|
|
||||||
|
using in_place_t = in_place_tag(&)(detail::in_place_of);
|
||||||
|
template <typename T>
|
||||||
|
using in_place_type_t = in_place_tag(&)(detail::in_place_of_t<T>);
|
||||||
|
template <std::size_t I>
|
||||||
|
using in_place_index_t = in_place_tag(&)(detail::in_place_of_i<I>);
|
||||||
|
|
||||||
|
} // sol
|
||||||
|
|
||||||
|
#endif // SOL_IN_PLACE_HPP
|
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
#if defined(SOL_USE_BOOST)
|
#if defined(SOL_USE_BOOST)
|
||||||
#include <boost/optional.hpp>
|
#include <boost/optional.hpp>
|
||||||
|
#include "../sol/in_place.hpp"
|
||||||
#else
|
#else
|
||||||
#include "../Optional/optional.hpp"
|
#include "../Optional/optional.hpp"
|
||||||
#endif // Boost vs. Better optional
|
#endif // Boost vs. Better optional
|
||||||
|
@ -35,33 +36,8 @@ namespace sol {
|
||||||
using optional = boost::optional<T>;
|
using optional = boost::optional<T>;
|
||||||
using nullopt_t = boost::none_t;
|
using nullopt_t = boost::none_t;
|
||||||
const nullopt_t nullopt = boost::none;
|
const nullopt_t nullopt = boost::none;
|
||||||
|
|
||||||
namespace detail {
|
|
||||||
struct in_place_of {};
|
|
||||||
} // detail
|
|
||||||
|
|
||||||
struct in_place_tag { struct init {}; constexpr in_place_tag(init) {} in_place_tag() = delete; };
|
|
||||||
constexpr inline in_place_tag in_place(detail::in_place_of) { return in_place_tag(in_place_tag::init()); }
|
|
||||||
using in_place_t = in_place_tag(&)(detail::in_place_of);
|
|
||||||
#endif // Boost vs. Better optional
|
#endif // Boost vs. Better optional
|
||||||
|
|
||||||
namespace detail {
|
|
||||||
template <std::size_t I>
|
|
||||||
struct in_place_of_i {};
|
|
||||||
template <typename T>
|
|
||||||
struct in_place_of_t {};
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
constexpr inline in_place_tag in_place(detail::in_place_of_t<T>) { return in_place_tag(in_place_tag::init()); }
|
|
||||||
template <std::size_t I>
|
|
||||||
constexpr inline in_place_tag in_place(detail::in_place_of_i<I>) { return in_place_tag(in_place_tag::init()); }
|
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
using in_place_type_t = in_place_tag(&)(detail::in_place_of_t<T>);
|
|
||||||
template <std::size_t I>
|
|
||||||
using in_place_index_t = in_place_tag(&)(detail::in_place_of_i<I>);
|
|
||||||
|
|
||||||
} // sol
|
} // sol
|
||||||
|
|
||||||
#endif // SOL_OPTIONAL_HPP
|
#endif // SOL_OPTIONAL_HPP
|
||||||
|
|
|
@ -77,6 +77,54 @@ namespace sol {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
struct getter<T, std::enable_if_t<meta::all<meta::has_begin_end<T>, meta::neg<meta::has_key_value_pair<T>>, meta::neg<meta::any<std::is_base_of<reference, T>, std::is_base_of<stack_reference, T>>>>::value>> {
|
||||||
|
static T get(lua_State* L, int index, record& tracking) {
|
||||||
|
typedef typename T::value_type V;
|
||||||
|
tracking.use(1);
|
||||||
|
|
||||||
|
T arr;
|
||||||
|
index = lua_absindex(L, index);
|
||||||
|
lua_pushnil(L);
|
||||||
|
while (lua_next(L, index) != 0) {
|
||||||
|
int isint = 0;
|
||||||
|
lua_Integer li = lua_tointegerx(L, -2, &isint);
|
||||||
|
if (isint == 0) {
|
||||||
|
lua_pop(L, 1);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
std::size_t i = static_cast<std::size_t>(li);
|
||||||
|
arr.push_back(stack::get<V>(L, -1));
|
||||||
|
lua_pop(L, 1);
|
||||||
|
}
|
||||||
|
return arr;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
struct getter<T, std::enable_if_t<meta::all<meta::has_begin_end<T>, meta::has_key_value_pair<T>, meta::neg<meta::any<std::is_base_of<reference, T>, std::is_base_of<stack_reference, T>>>>::value>> {
|
||||||
|
static T get(lua_State* L, int index, record& tracking) {
|
||||||
|
typedef typename T::value_type P;
|
||||||
|
typedef typename P::first_type K;
|
||||||
|
typedef typename P::second_type V;
|
||||||
|
tracking.use(1);
|
||||||
|
|
||||||
|
T associative;
|
||||||
|
index = lua_absindex(L, index);
|
||||||
|
lua_pushnil(L);
|
||||||
|
while (lua_next(L, index) != 0) {
|
||||||
|
decltype(auto) key = stack::check_get<K>(L, -1);
|
||||||
|
if (!key) {
|
||||||
|
lua_pop(L, 1);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
arr.emplace(std::forward<decltype(key)>(key), stack::get<V>(L, -1));
|
||||||
|
lua_pop(L, 1);
|
||||||
|
}
|
||||||
|
return associative;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
struct getter<T, std::enable_if_t<std::is_base_of<reference, T>::value || std::is_base_of<stack_reference, T>::value>> {
|
struct getter<T, std::enable_if_t<std::is_base_of<reference, T>::value || std::is_base_of<stack_reference, T>::value>> {
|
||||||
static T get(lua_State* L, int index, record& tracking) {
|
static T get(lua_State* L, int index, record& tracking) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user