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

EnableIf and DisableIf back in place, type trait fixed for MSVC. Bleh, this is a lot of work. Removed functional header, because nobody's using it.

Browse Source
This commit is contained in:
ThePhD 2013-12-13 14:59:46 -05:00
parent dc6935553b
commit 856d28ab70
4 changed files with 83 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
sol/functional.hpp
View File

@ -1,125 +0,0 @@
// The MIT License (MIT)
// Copyright (c) 2013 Danny Y., Rapptz
// 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_FUNCTIONAL_HPP
#define SOL_FUNCTIONAL_HPP
#include "tuple.hpp"
namespace sol {
namespace detail {
template<typename TFuncSignature>
struct function_traits;
template<typename T, typename R, typename... Args>
struct function_traits<R(T::*)(Args...)> {
static const std::size_t arity = sizeof...(Args);
static const bool is_member_function = true;
typedef std::tuple<Args...> arg_tuple_type;
typedef types<Args...> args_type;
typedef R(T::* function_pointer_type)(Args...);
typedef typename std::remove_pointer<function_pointer_type>::type function_type;
typedef R(* free_function_pointer_type)(Args...);
typedef R return_type;
template<std::size_t i>
using arg = typename std::tuple_element<i, arg_tuple_type>::type;
};
template<typename T, typename R, typename... Args>
struct function_traits<R(T::*)(Args...) const> {
static const std::size_t arity = sizeof...(Args);
static const bool is_member_function = true;
typedef std::tuple<Args...> arg_tuple_type;
typedef types<Args...> args_type;
typedef R(T::* function_pointer_type)(Args...);
typedef typename std::remove_pointer<function_pointer_type>::type function_type;
typedef R(* free_function_pointer_type)(Args...);
typedef R return_type;
template<std::size_t i>
using arg = typename std::tuple_element<i, arg_tuple_type>::type;
};
template<typename R, typename... Args>
struct function_traits<R(Args...)> {
static const std::size_t arity = sizeof...(Args);
static const bool is_member_function = false;
typedef std::tuple<Args...> arg_tuple_type;
typedef types<Args...> args_type;
typedef R(function_type)(Args...);
typedef R(*function_pointer_type)(Args...);
typedef R(* free_function_pointer_type)(Args...);
typedef R return_type;
template<std::size_t i>
using arg = typename std::tuple_element<i, arg_tuple_type>::type;
};
template<typename R, typename... Args>
struct function_traits<R(*)(Args...)> {
static const std::size_t arity = sizeof...(Args);
static const bool is_member_function = false;
typedef std::tuple<Args...> arg_tuple_type;
typedef types<Args...> args_type;
typedef R(function_type)(Args...);
typedef R(*function_pointer_type)(Args...);
typedef R(* free_function_pointer_type)(Args...);
typedef R return_type;
template<std::size_t i>
using arg = typename std::tuple_element<i, arg_tuple_type>::type;
};
using std::get;
template<typename Function, typename Tuple, size_t... Indices>
inline auto call(Function&& f, const Tuple& t, indices<Indices...>) -> decltype(f(get<Indices>(t)...)) {
return f(get<Indices>(t)...);
}
} // detail
template<typename... Ret>
struct lua_return_type {
typedef std::tuple<Ret...> type;
};
template<typename Ret>
struct lua_return_type<Ret> {
typedef Ret type;
};
template<>
struct lua_return_type<> {
typedef void type;
};
template<>
struct lua_return_type<void> {
typedef void type;
};
template<typename Function, typename... Args>
inline auto call(Function&& f, const std::tuple<Args...>& t) -> decltype(detail::call(std::forward<Function>(f), t, build_indices<sizeof...(Args)>{})) {
return call(std::forward<Function>(f), t, build_indices<sizeof...(Args)>{});
}
} // sol
#endif // SOL_FUNCTIONAL_HPP

11
sol/lua_function.hpp
View File

@ -22,7 +22,6 @@
#ifndef SOL_LUA_FUNC_HPP #ifndef SOL_LUA_FUNC_HPP
#define SOL_LUA_FUNC_HPP #define SOL_LUA_FUNC_HPP
#include "functional.hpp"
#include "stack.hpp" #include "stack.hpp"
#include <memory> #include <memory>
@ -62,7 +61,7 @@ void get_upvalue(lua_State* L, T& data, int& upvalue) {
template<typename TFx> template<typename TFx>
struct static_lua_func { struct static_lua_func {
typedef typename std::remove_pointer<typename std::decay<TFx>::type>::type fx_t; typedef typename std::remove_pointer<typename std::decay<TFx>::type>::type fx_t;
typedef detail::function_traits<fx_t> fx_traits; typedef function_traits<fx_t> fx_traits;
template<typename... Args> template<typename... Args>
static int typed_call(types<void>, types<Args...> t, fx_t* fx, lua_State* L) { static int typed_call(types<void>, types<Args...> t, fx_t* fx, lua_State* L) {
@ -93,7 +92,7 @@ struct static_lua_func {
template<typename T, typename TFx> template<typename T, typename TFx>
struct static_object_lua_func { struct static_object_lua_func {
typedef typename std::decay<TFx>::type fx_t; typedef typename std::decay<TFx>::type fx_t;
typedef detail::function_traits<fx_t> fx_traits; typedef function_traits<fx_t> fx_traits;
template<typename... Args> template<typename... Args>
static int typed_call(types<void>, types<Args...>, T& item, fx_t& ifx, lua_State* L) { static int typed_call(types<void>, types<Args...>, T& item, fx_t& ifx, lua_State* L) {
@ -173,7 +172,7 @@ struct lua_func {
template<typename TFx> template<typename TFx>
struct lambda_lua_func : public lua_func { struct lambda_lua_func : public lua_func {
typedef decltype(&TFx::operator()) fx_t; typedef decltype(&TFx::operator()) fx_t;
typedef detail::function_traits<fx_t> fx_traits; typedef function_traits<fx_t> fx_traits;
TFx fx; TFx fx;
template<typename... FxArgs> template<typename... FxArgs>
@ -200,7 +199,7 @@ struct lambda_lua_func : public lua_func {
template<typename TFx, typename T = TFx, bool is_member_pointer = std::is_member_function_pointer<TFx>::value> template<typename TFx, typename T = TFx, bool is_member_pointer = std::is_member_function_pointer<TFx>::value>
struct explicit_lua_func : public lua_func { struct explicit_lua_func : public lua_func {
typedef typename std::remove_pointer<typename std::decay<TFx>::type>::type fx_t; typedef typename std::remove_pointer<typename std::decay<TFx>::type>::type fx_t;
typedef detail::function_traits<fx_t> fx_traits; typedef function_traits<fx_t> fx_traits;
TFx fx; TFx fx;
template<typename... FxArgs> template<typename... FxArgs>
@ -227,7 +226,7 @@ struct explicit_lua_func : public lua_func {
template<typename TFx, typename T> template<typename TFx, typename T>
struct explicit_lua_func<TFx, T, true> : public lua_func { struct explicit_lua_func<TFx, T, true> : public lua_func {
typedef typename std::remove_pointer<typename std::decay<TFx>::type>::type fx_t; typedef typename std::remove_pointer<typename std::decay<TFx>::type>::type fx_t;
typedef detail::function_traits<fx_t> fx_traits; typedef function_traits<fx_t> fx_traits;
struct lambda { struct lambda {
T member; T member;
TFx invocation; TFx invocation;

28
sol/table.hpp
View File

@ -24,7 +24,6 @@
#include "stack.hpp" #include "stack.hpp"
#include "lua_function.hpp" #include "lua_function.hpp"
#include "function.hpp"
#include <array> #include <array>
#include <cstring> #include <cstring>
@ -101,28 +100,21 @@ private:
proxy(table& t, T& key) : t(t), key(key) {} proxy(table& t, T& key) : t(t), key(key) {}
template<typename U> template<typename U>
void operator=(U&& other) { EnableIf<Function<Unqualified<U>>> operator=(U&& other) {
typedef Function<Unqualified<U>> isfunction; t.set_function(key, std::forward<U>(other));
assign(std::forward<U>(other), isfunction()); }
template<typename U>
DisableIf<Function<Unqualified<U>>> operator=(U&& other) {
t.set(key, std::forward<U>(other));
} }
template<typename U> template<typename U>
operator U() const { operator U() const {
return t.get<U>(key); return t.get<U>(key);
} }
private:
template<typename U>
void assign(U&& other, std::true_type) {
t.set_function(key, std::forward<U>(other));
}
template<typename U>
void assign(U&& other, std::false_type) {
t.set(key, std::forward<U>(other));
}
}; };
private:
template<typename T, typename TFx> template<typename T, typename TFx>
table& set_isfunction_fx(std::true_type, T&& key, TFx&& fx) { table& set_isfunction_fx(std::true_type, T&& key, TFx&& fx) {
return set_fx(std::false_type(), std::forward<T>(key), std::forward<TFx>(fx)); return set_fx(std::false_type(), std::forward<T>(key), std::forward<TFx>(fx));
@ -131,7 +123,7 @@ private:
template<typename T, typename TFx> template<typename T, typename TFx>
table& set_isfunction_fx(std::false_type, T&& key, TFx&& fx) { table& set_isfunction_fx(std::false_type, T&& key, TFx&& fx) {
typedef Decay<TFx> clean_lambda; typedef Decay<TFx> clean_lambda;
typedef typename detail::function_traits<decltype(&clean_lambda::operator())>::free_function_pointer_type raw_func_t; typedef typename function_traits<decltype(&clean_lambda::operator())>::free_function_pointer_type raw_func_t;
typedef std::is_convertible<clean_lambda, raw_func_t> isconvertible; typedef std::is_convertible<clean_lambda, raw_func_t> isconvertible;
return set_isconvertible_fx(isconvertible(), std::forward<T>(key), std::forward<TFx>(fx)); return set_isconvertible_fx(isconvertible(), std::forward<T>(key), std::forward<TFx>(fx));
} }
@ -139,7 +131,7 @@ private:
template<typename T, typename TFx> template<typename T, typename TFx>
table& set_isconvertible_fx(std::true_type, T&& key, TFx&& fx) { table& set_isconvertible_fx(std::true_type, T&& key, TFx&& fx) {
typedef Decay<TFx> clean_lambda; typedef Decay<TFx> clean_lambda;
typedef typename detail::function_traits<decltype(&clean_lambda::operator())>::free_function_pointer_type raw_func_t; typedef typename function_traits<decltype(&clean_lambda::operator())>::free_function_pointer_type raw_func_t;
return set_isfunction_fx(std::true_type(), std::forward<T>(key), raw_func_t(std::forward<TFx>(fx))); return set_isfunction_fx(std::true_type(), std::forward<T>(key), raw_func_t(std::forward<TFx>(fx)));
} }

59
sol/traits.hpp
View File

@ -67,6 +67,65 @@ using Bool = std::integral_constant<bool, B>;
template<typename T> template<typename T>
struct Function : Bool<detail::is_function_impl<T>::value> {}; struct Function : Bool<detail::is_function_impl<T>::value> {};
template<typename TFuncSignature>
struct function_traits;
template<typename T, typename R, typename... Args>
struct function_traits<R( T::* )( Args... )> {
static const std::size_t arity = sizeof...( Args );
static const bool is_member_function = true;
typedef std::tuple<Args...> arg_tuple_type;
typedef types<Args...> args_type;
typedef R( T::* function_pointer_type )( Args... );
typedef typename std::remove_pointer<function_pointer_type>::type function_type;
typedef R( *free_function_pointer_type )( Args... );
typedef R return_type;
template<std::size_t i>
using arg = typename std::tuple_element<i, arg_tuple_type>::type;
};
template<typename T, typename R, typename... Args>
struct function_traits<R( T::* )( Args... ) const> {
static const std::size_t arity = sizeof...( Args );
static const bool is_member_function = true;
typedef std::tuple<Args...> arg_tuple_type;
typedef types<Args...> args_type;
typedef R( T::* function_pointer_type )( Args... );
typedef typename std::remove_pointer<function_pointer_type>::type function_type;
typedef R( *free_function_pointer_type )( Args... );
typedef R return_type;
template<std::size_t i>
using arg = typename std::tuple_element<i, arg_tuple_type>::type;
};
template<typename R, typename... Args>
struct function_traits<R( Args... )> {
static const std::size_t arity = sizeof...( Args );
static const bool is_member_function = false;
typedef std::tuple<Args...> arg_tuple_type;
typedef types<Args...> args_type;
typedef R( function_type )( Args... );
typedef R( *function_pointer_type )( Args... );
typedef R( *free_function_pointer_type )( Args... );
typedef R return_type;
template<std::size_t i>
using arg = typename std::tuple_element<i, arg_tuple_type>::type;
};
template<typename R, typename... Args>
struct function_traits<R( *)( Args... )> {
static const std::size_t arity = sizeof...( Args );
static const bool is_member_function = false;
typedef std::tuple<Args...> arg_tuple_type;
typedef types<Args...> args_type;
typedef R( function_type )( Args... );
typedef R( *function_pointer_type )( Args... );
typedef R( *free_function_pointer_type )( Args... );
typedef R return_type;
template<std::size_t i>
using arg = typename std::tuple_element<i, arg_tuple_type>::type;
};
} // sol } // sol
#endif // SOL_TRAITS_HPP #endif // SOL_TRAITS_HPP