2014-04-25 12:05:42 +08:00
|
|
|
// The MIT License (MIT)
|
|
|
|
|
2016-02-27 15:43:53 +08:00
|
|
|
// Copyright (c) 2013-2016 Rapptz, ThePhD and contributors
|
2014-04-25 12:05:42 +08:00
|
|
|
|
|
|
|
// 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_DEMANGLE_HPP
|
|
|
|
#define SOL_DEMANGLE_HPP
|
|
|
|
|
|
|
|
#include <string>
|
2014-04-26 12:19:36 +08:00
|
|
|
#include <array>
|
2014-08-05 04:56:23 +08:00
|
|
|
#include <cstdlib>
|
2016-03-12 06:47:15 +08:00
|
|
|
#include <cctype>
|
2014-04-25 12:05:42 +08:00
|
|
|
|
2014-04-26 08:19:31 +08:00
|
|
|
#if defined(__GNUC__) || defined(__clang__)
|
2014-04-25 12:05:42 +08:00
|
|
|
#include <cxxabi.h>
|
2014-04-26 08:19:31 +08:00
|
|
|
#endif
|
2014-04-25 12:05:42 +08:00
|
|
|
|
|
|
|
namespace sol {
|
|
|
|
namespace detail {
|
2016-03-12 00:34:44 +08:00
|
|
|
#ifndef SOL_NO_RTTI
|
2014-04-26 08:19:31 +08:00
|
|
|
#ifdef _MSC_VER
|
Fix lack of inline in functions.
diff --git a/bootstrap.py b/bootstrap.py
index c24f6e5..1d6a0b3 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -37,6 +37,7 @@ parser = argparse.ArgumentParser()
parser.add_argument('--debug', action='store_true', help='compile with debug flags')
parser.add_argument('--cxx', metavar='<compiler>', help='compiler name to use (default: g++)', default='g++')
parser.add_argument('--ci', action='store_true', help=argparse.SUPPRESS)
+parser.add_argument('--testing', action='store_true', help=argparse.SUPPRESS)
parser.add_argument('--lua-dir', metavar='<dir>', help='directory lua is in with include and lib subdirectories')
parser.add_argument('--install-dir', metavar='<dir>', help='directory to install the headers to', default=install_dir);
parser.epilog = """In order to install sol, administrative privileges might be required.
@@ -80,6 +81,9 @@ if args.ci:
else:
ldflags.extend(libraries(['lua']))
+if args.testing:
+ cxxflags.append('-Wmissing-declarations')
+
if 'linux' in sys.platform:
ldflags.extend(libraries(['dl']))
diff --git a/sol/demangle.hpp b/sol/demangle.hpp
index 694a2be..78f4dd4 100644
--- a/sol/demangle.hpp
+++ b/sol/demangle.hpp
@@ -33,12 +33,12 @@
namespace sol {
namespace detail {
#ifdef _MSC_VER
-std::string get_type_name(const std::type_info& id) {
+inline std::string get_type_name(const std::type_info& id) {
return id.name();
}
#elif defined(__GNUC__) || defined(__clang__)
-std::string get_type_name(const std::type_info& id) {
+inline std::string get_type_name(const std::type_info& id) {
int status;
char* unmangled = abi::__cxa_demangle(id.name(), 0, 0, &status);
std::string realname = unmangled;
@@ -50,7 +50,7 @@ std::string get_type_name(const std::type_info& id) {
#error Compiler not supported for demangling
#endif // compilers
-std::string demangle(const std::type_info& id) {
+inline std::string demangle(const std::type_info& id) {
std::string realname = get_type_name(id);
const static std::array<std::string, 2> removals = {{ "struct ", "class " }};
const static std::array<std::string, 2> replacements = {{ "::", "_" }};
diff --git a/sol/resolve.hpp b/sol/resolve.hpp
index 0d849d0..1f6f606 100644
--- a/sol/resolve.hpp
+++ b/sol/resolve.hpp
@@ -28,66 +28,67 @@
namespace sol {
namespace detail {
template<typename R, typename... Args, typename F, typename = typename std::result_of<Unqualified<F>(Args...)>::type>
-auto resolve_i(types<R(Args...)>, F&&)->R(Unqualified<F>::*)(Args...) {
+inline auto resolve_i(types<R(Args...)>, F&&) -> R(Unqualified<F>::*)(Args...) {
using Sig = R(Args...);
typedef Unqualified<F> Fu;
return static_cast<Sig Fu::*>(&Fu::operator());
}
template<typename F, typename U = Unqualified<F>>
-auto resolve_f(std::true_type, F&& f) -> decltype(resolve_i(types<function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f))) {
+inline auto resolve_f(std::true_type, F&& f)
+-> decltype(resolve_i(types<function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f))) {
return resolve_i(types<function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f));
}
template<typename F>
-void resolve_f(std::false_type, F&&) {
+inline void resolve_f(std::false_type, F&&) {
static_assert(has_deducible_signature<F>::value,
"Cannot use no-template-parameter call with an overloaded functor: specify the signature");
}
template<typename F, typename U = Unqualified<F>>
-auto resolve_i(types<>, F&& f) -> decltype(resolve_f(has_deducible_signature<U> {}, std::forward<F>(f))) {
+inline auto resolve_i(types<>, F&& f) -> decltype(resolve_f(has_deducible_signature<U> {}, std::forward<F>(f))) {
return resolve_f(has_deducible_signature<U> {}, std::forward<F>(f));
}
template<typename... Args, typename F, typename R = typename std::result_of<F&(Args...)>::type>
-auto resolve_i(types<Args...>, F&& f) -> decltype( resolve_i(types<R(Args...)>(), std::forward<F>(f))) {
+inline auto resolve_i(types<Args...>, F&& f) -> decltype( resolve_i(types<R(Args...)>(), std::forward<F>(f))) {
return resolve_i(types<R(Args...)>(), std::forward<F>(f));
}
template<typename Sig, typename C>
-Sig C::* resolve_v(std::false_type, Sig C::* mem_func_ptr) {
+inline Sig C::* resolve_v(std::false_type, Sig C::* mem_func_ptr) {
return mem_func_ptr;
}
template<typename Sig, typename C>
-Sig C::* resolve_v(std::true_type, Sig C::* mem_variable_ptr) {
+inline Sig C::* resolve_v(std::true_type, Sig C::* mem_variable_ptr) {
return mem_variable_ptr;
}
} // detail
template<typename... Args, typename R>
-auto resolve(R fun_ptr(Args...)) -> R(*)(Args...) {
+inline auto resolve(R fun_ptr(Args...)) -> R(*)(Args...) {
return fun_ptr;
}
template<typename Sig>
-Sig* resolve(Sig* fun_ptr) {
+inline Sig* resolve(Sig* fun_ptr) {
return fun_ptr;
}
template<typename... Args, typename R, typename C>
-auto resolve(R(C::*mem_ptr)(Args...)) -> R(C::*)(Args...) {
+inline auto resolve(R(C::*mem_ptr)(Args...)) -> R(C::*)(Args...) {
return mem_ptr;
}
template<typename Sig, typename C>
-Sig C::* resolve(Sig C::* mem_ptr) {
+inline Sig C::* resolve(Sig C::* mem_ptr) {
return detail::resolve_v(std::is_member_object_pointer<Sig C::*>(), mem_ptr);
}
template<typename... Sig, typename F>
-auto resolve(F&& f) -> decltype(detail::resolve_i(types<Sig...>(), std::forward<F>(f))) {
+inline auto resolve(F&& f) -> decltype(detail::resolve_i(types<Sig...>(), std::forward<F>(f))) {
return detail::resolve_i(types<Sig...>(), std::forward<F>(f));
}
} // sol
2014-08-11 09:07:19 +08:00
|
|
|
inline std::string get_type_name(const std::type_info& id) {
|
2014-05-31 07:58:47 +08:00
|
|
|
return id.name();
|
|
|
|
}
|
|
|
|
|
|
|
|
#elif defined(__GNUC__) || defined(__clang__)
|
Fix lack of inline in functions.
diff --git a/bootstrap.py b/bootstrap.py
index c24f6e5..1d6a0b3 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -37,6 +37,7 @@ parser = argparse.ArgumentParser()
parser.add_argument('--debug', action='store_true', help='compile with debug flags')
parser.add_argument('--cxx', metavar='<compiler>', help='compiler name to use (default: g++)', default='g++')
parser.add_argument('--ci', action='store_true', help=argparse.SUPPRESS)
+parser.add_argument('--testing', action='store_true', help=argparse.SUPPRESS)
parser.add_argument('--lua-dir', metavar='<dir>', help='directory lua is in with include and lib subdirectories')
parser.add_argument('--install-dir', metavar='<dir>', help='directory to install the headers to', default=install_dir);
parser.epilog = """In order to install sol, administrative privileges might be required.
@@ -80,6 +81,9 @@ if args.ci:
else:
ldflags.extend(libraries(['lua']))
+if args.testing:
+ cxxflags.append('-Wmissing-declarations')
+
if 'linux' in sys.platform:
ldflags.extend(libraries(['dl']))
diff --git a/sol/demangle.hpp b/sol/demangle.hpp
index 694a2be..78f4dd4 100644
--- a/sol/demangle.hpp
+++ b/sol/demangle.hpp
@@ -33,12 +33,12 @@
namespace sol {
namespace detail {
#ifdef _MSC_VER
-std::string get_type_name(const std::type_info& id) {
+inline std::string get_type_name(const std::type_info& id) {
return id.name();
}
#elif defined(__GNUC__) || defined(__clang__)
-std::string get_type_name(const std::type_info& id) {
+inline std::string get_type_name(const std::type_info& id) {
int status;
char* unmangled = abi::__cxa_demangle(id.name(), 0, 0, &status);
std::string realname = unmangled;
@@ -50,7 +50,7 @@ std::string get_type_name(const std::type_info& id) {
#error Compiler not supported for demangling
#endif // compilers
-std::string demangle(const std::type_info& id) {
+inline std::string demangle(const std::type_info& id) {
std::string realname = get_type_name(id);
const static std::array<std::string, 2> removals = {{ "struct ", "class " }};
const static std::array<std::string, 2> replacements = {{ "::", "_" }};
diff --git a/sol/resolve.hpp b/sol/resolve.hpp
index 0d849d0..1f6f606 100644
--- a/sol/resolve.hpp
+++ b/sol/resolve.hpp
@@ -28,66 +28,67 @@
namespace sol {
namespace detail {
template<typename R, typename... Args, typename F, typename = typename std::result_of<Unqualified<F>(Args...)>::type>
-auto resolve_i(types<R(Args...)>, F&&)->R(Unqualified<F>::*)(Args...) {
+inline auto resolve_i(types<R(Args...)>, F&&) -> R(Unqualified<F>::*)(Args...) {
using Sig = R(Args...);
typedef Unqualified<F> Fu;
return static_cast<Sig Fu::*>(&Fu::operator());
}
template<typename F, typename U = Unqualified<F>>
-auto resolve_f(std::true_type, F&& f) -> decltype(resolve_i(types<function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f))) {
+inline auto resolve_f(std::true_type, F&& f)
+-> decltype(resolve_i(types<function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f))) {
return resolve_i(types<function_signature_t<decltype(&U::operator())>>(), std::forward<F>(f));
}
template<typename F>
-void resolve_f(std::false_type, F&&) {
+inline void resolve_f(std::false_type, F&&) {
static_assert(has_deducible_signature<F>::value,
"Cannot use no-template-parameter call with an overloaded functor: specify the signature");
}
template<typename F, typename U = Unqualified<F>>
-auto resolve_i(types<>, F&& f) -> decltype(resolve_f(has_deducible_signature<U> {}, std::forward<F>(f))) {
+inline auto resolve_i(types<>, F&& f) -> decltype(resolve_f(has_deducible_signature<U> {}, std::forward<F>(f))) {
return resolve_f(has_deducible_signature<U> {}, std::forward<F>(f));
}
template<typename... Args, typename F, typename R = typename std::result_of<F&(Args...)>::type>
-auto resolve_i(types<Args...>, F&& f) -> decltype( resolve_i(types<R(Args...)>(), std::forward<F>(f))) {
+inline auto resolve_i(types<Args...>, F&& f) -> decltype( resolve_i(types<R(Args...)>(), std::forward<F>(f))) {
return resolve_i(types<R(Args...)>(), std::forward<F>(f));
}
template<typename Sig, typename C>
-Sig C::* resolve_v(std::false_type, Sig C::* mem_func_ptr) {
+inline Sig C::* resolve_v(std::false_type, Sig C::* mem_func_ptr) {
return mem_func_ptr;
}
template<typename Sig, typename C>
-Sig C::* resolve_v(std::true_type, Sig C::* mem_variable_ptr) {
+inline Sig C::* resolve_v(std::true_type, Sig C::* mem_variable_ptr) {
return mem_variable_ptr;
}
} // detail
template<typename... Args, typename R>
-auto resolve(R fun_ptr(Args...)) -> R(*)(Args...) {
+inline auto resolve(R fun_ptr(Args...)) -> R(*)(Args...) {
return fun_ptr;
}
template<typename Sig>
-Sig* resolve(Sig* fun_ptr) {
+inline Sig* resolve(Sig* fun_ptr) {
return fun_ptr;
}
template<typename... Args, typename R, typename C>
-auto resolve(R(C::*mem_ptr)(Args...)) -> R(C::*)(Args...) {
+inline auto resolve(R(C::*mem_ptr)(Args...)) -> R(C::*)(Args...) {
return mem_ptr;
}
template<typename Sig, typename C>
-Sig C::* resolve(Sig C::* mem_ptr) {
+inline Sig C::* resolve(Sig C::* mem_ptr) {
return detail::resolve_v(std::is_member_object_pointer<Sig C::*>(), mem_ptr);
}
template<typename... Sig, typename F>
-auto resolve(F&& f) -> decltype(detail::resolve_i(types<Sig...>(), std::forward<F>(f))) {
+inline auto resolve(F&& f) -> decltype(detail::resolve_i(types<Sig...>(), std::forward<F>(f))) {
return detail::resolve_i(types<Sig...>(), std::forward<F>(f));
}
} // sol
2014-08-11 09:07:19 +08:00
|
|
|
inline std::string get_type_name(const std::type_info& id) {
|
2014-05-31 07:58:47 +08:00
|
|
|
int status;
|
|
|
|
char* unmangled = abi::__cxa_demangle(id.name(), 0, 0, &status);
|
|
|
|
std::string realname = unmangled;
|
2014-08-05 04:56:23 +08:00
|
|
|
std::free(unmangled);
|
2014-05-31 07:58:47 +08:00
|
|
|
return realname;
|
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
|
|
|
#error Compiler not supported for demangling
|
|
|
|
#endif // compilers
|
2016-03-12 00:34:44 +08:00
|
|
|
#else
|
|
|
|
#ifdef _MSC_VER
|
|
|
|
template <typename T>
|
|
|
|
inline std::string get_type_name() {
|
|
|
|
std::string name = __FUNCSIG__;
|
2016-03-13 20:30:14 +08:00
|
|
|
std::size_t start = name.find("get_type_name");
|
2016-03-12 00:34:44 +08:00
|
|
|
if (start == std::string::npos)
|
2016-03-13 20:30:14 +08:00
|
|
|
start = 0;
|
|
|
|
else
|
|
|
|
start += 13;
|
2016-03-12 00:34:44 +08:00
|
|
|
if (start < name.size() - 1)
|
|
|
|
start += 1;
|
2016-03-13 20:30:14 +08:00
|
|
|
std::size_t end = name.find_last_of('>');
|
|
|
|
if (end == std::string::npos)
|
|
|
|
end = name.size();
|
2016-03-12 00:34:44 +08:00
|
|
|
name = name.substr(start, end - start);
|
2016-03-12 06:47:15 +08:00
|
|
|
if (name.find("struct", 0) == 0)
|
|
|
|
name.replace(0, 6, "", 0);
|
|
|
|
if (name.find("class", 0) == 0)
|
|
|
|
name.replace(0, 5, "", 0);
|
|
|
|
while (name.size() > 0 && std::isblank(name.front())) name.erase(name.begin(), ++name.begin());
|
|
|
|
while (name.size() > 0 && std::isblank(name.back())) name.erase(--name.end(), name.end());
|
2016-03-12 00:34:44 +08:00
|
|
|
return name;
|
|
|
|
}
|
|
|
|
|
|
|
|
#elif defined(__GNUC__)
|
|
|
|
template <typename T>
|
|
|
|
inline std::string get_type_name() {
|
|
|
|
std::string name = __PRETTY_FUNCTION__;
|
|
|
|
std::size_t start = name.find_first_of('=');
|
|
|
|
std::size_t end = name.find_last_of(';');
|
|
|
|
if (end == std::string::npos)
|
|
|
|
end = name.size();
|
|
|
|
if (start == std::string::npos)
|
|
|
|
start = 0;
|
|
|
|
if (start < name.size() - 1)
|
|
|
|
start += 2;
|
|
|
|
name = name.substr(start, end - start);
|
|
|
|
return name;
|
|
|
|
}
|
|
|
|
#elif defined(__clang__)
|
|
|
|
template <typename T>
|
|
|
|
inline std::string get_type_name() {
|
|
|
|
std::string name = __PRETTY_FUNCTION__;
|
|
|
|
std::size_t start = name.find_last_of('[');
|
|
|
|
start = name.find_first_of('=', start);
|
|
|
|
std::size_t end = name.find_last_of(']');
|
|
|
|
if (end == std::string::npos)
|
|
|
|
end = name.size();
|
|
|
|
if (start == std::string::npos)
|
|
|
|
start = 0;
|
|
|
|
if (start < name.size() - 1)
|
|
|
|
start += 1;
|
|
|
|
name = name.substr(start, end - start);
|
|
|
|
return name;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
#error Compiler not supported for demangling
|
|
|
|
#endif // compilers
|
|
|
|
#endif // No Runtime Type information
|
2014-05-31 07:58:47 +08:00
|
|
|
|
2016-03-12 00:34:44 +08:00
|
|
|
template <typename T>
|
|
|
|
inline std::string demangle() {
|
|
|
|
#ifndef SOL_NO_RTTI
|
|
|
|
std::string realname = get_type_name(typeid(T));
|
|
|
|
#else
|
|
|
|
std::string realname = get_type_name<T>();
|
|
|
|
#endif // No Runtime Type Information
|
2014-05-31 18:06:47 +08:00
|
|
|
const static std::array<std::string, 2> removals = {{ "struct ", "class " }};
|
|
|
|
const static std::array<std::string, 2> replacements = {{ "::", "_" }};
|
2014-04-26 12:19:36 +08:00
|
|
|
for(std::size_t r = 0; r < removals.size(); ++r) {
|
2014-04-26 08:19:31 +08:00
|
|
|
auto found = realname.find(removals[r]);
|
2014-05-31 18:06:47 +08:00
|
|
|
while(found != std::string::npos) {
|
2014-04-26 12:19:36 +08:00
|
|
|
realname.erase(found, removals[r].size());
|
2014-04-27 06:23:56 +08:00
|
|
|
found = realname.find(removals[r]);
|
|
|
|
}
|
2014-04-26 12:19:36 +08:00
|
|
|
}
|
2014-05-31 18:06:47 +08:00
|
|
|
|
2014-04-26 12:19:36 +08:00
|
|
|
for(std::size_t r = 0; r < replacements.size(); r+=2) {
|
|
|
|
auto found = realname.find(replacements[r]);
|
2014-05-31 18:06:47 +08:00
|
|
|
while(found != std::string::npos) {
|
|
|
|
realname.replace(found, replacements[r].size(), replacements[r + 1]);
|
2014-04-27 09:38:37 +08:00
|
|
|
found = realname.find(replacements[r], found);
|
2014-04-26 08:19:31 +08:00
|
|
|
}
|
2014-04-26 07:41:03 +08:00
|
|
|
}
|
2014-05-31 18:06:47 +08:00
|
|
|
|
2014-04-26 08:19:31 +08:00
|
|
|
return realname;
|
|
|
|
}
|
2014-04-25 12:05:42 +08:00
|
|
|
} // detail
|
|
|
|
} // sol
|
|
|
|
|
2014-05-31 07:58:47 +08:00
|
|
|
#endif // SOL_DEMANGLE_HPP
|