generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get ChaiScript ported to MSVC 2013. See Notes in code.

Browse Source
This commit is contained in:
Jason Turner
2013-11-02 07:42:06 -06:00
parent 1708024372
commit 73b3762f7a
20 changed files with 166 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/chaiscript/dispatchkit/any.hpp
View File

@@ -19,15 +19,15 @@ namespace chaiscript {
class bad_any_cast : public std::bad_cast
{
public:
bad_any_cast() noexcept
bad_any_cast() CHAISCRIPT_NOEXCEPT
: m_what("bad any cast")
{
}
virtual ~bad_any_cast() noexcept {}
virtual ~bad_any_cast() CHAISCRIPT_NOEXCEPT {}
/// \brief Description of what error occured
virtual const char * what() const noexcept
virtual const char * what() const CHAISCRIPT_NOEXCEPT
{
return m_what.c_str();
}
@@ -71,6 +71,8 @@ namespace chaiscript {
return std::shared_ptr<Data>(new Data_Impl<T>(m_data));
}
Data_Impl &operator=(const Data_Impl&) = delete;
const std::type_info &m_type;
T m_data;
};

10
include/chaiscript/dispatchkit/bad_boxed_cast.hpp
View File

@@ -22,25 +22,25 @@ namespace chaiscript
{
public:
bad_boxed_cast(const Type_Info &t_from, const std::type_info &t_to,
const std::string &t_what) noexcept
const std::string &t_what) CHAISCRIPT_NOEXCEPT
: from(t_from), to(&t_to), m_what(t_what)
{
}
bad_boxed_cast(const Type_Info &t_from, const std::type_info &t_to) noexcept
bad_boxed_cast(const Type_Info &t_from, const std::type_info &t_to) CHAISCRIPT_NOEXCEPT
: from(t_from), to(&t_to), m_what("Cannot perform boxed_cast")
{
}
bad_boxed_cast(const std::string &t_what) noexcept
bad_boxed_cast(const std::string &t_what) CHAISCRIPT_NOEXCEPT
: to(0), m_what(t_what)
{
}
virtual ~bad_boxed_cast() noexcept {}
virtual ~bad_boxed_cast() CHAISCRIPT_NOEXCEPT {}
/// \brief Description of what error occured
virtual const char * what() const noexcept
virtual const char * what() const CHAISCRIPT_NOEXCEPT
{
return m_what.c_str();
}

10
include/chaiscript/dispatchkit/bootstrap_stl.hpp
View File

@@ -149,6 +149,12 @@ namespace chaiscript
namespace detail {
template<typename T>
size_t count(T &t_target, const typename T::key_type &t_key)
{
return t_target.count(t_key);
}
template<typename T>
void insert(T &t_target, const T &t_other)
{
@@ -405,11 +411,11 @@ namespace chaiscript
template<typename ContainerType>
ModulePtr unique_associative_container_type(const std::string &/*type*/, ModulePtr m = ModulePtr(new Module()))
{
m->add(fun<int (const ContainerType *, const typename ContainerType::key_type &)>(&ContainerType::count), "count");
m->add(fun(detail::count<ContainerType>), "count");
typedef size_t (ContainerType::*erase_ptr)(const typename ContainerType::key_type &);
m->add(fun<int (ContainerType *, const typename ContainerType::key_type &)>(static_cast<erase_ptr>(&ContainerType::erase)), "erase");
m->add(fun(static_cast<erase_ptr>(&ContainerType::erase)), "erase");
m->add(fun(&detail::insert<ContainerType>), "insert");

6
include/chaiscript/dispatchkit/boxed_number.hpp
View File

@@ -10,11 +10,13 @@
#include "boxed_value.hpp"
#include "../language/chaiscript_algebraic.hpp"
#include <sstream>
#include <cstdint>
namespace chaiscript
{
#ifdef BOOST_MSVC
#ifdef CHAISCRIPT_MSVC
#pragma warning(push)
#pragma warning(disable : 4244 4018 4389 4146)
#endif
@@ -846,7 +848,7 @@ namespace chaiscript
};
}
#ifdef BOOST_MSVC
#ifdef CHAISCRIPT_MSVC
#pragma warning(pop)
#endif

8
include/chaiscript/dispatchkit/dispatchkit.hpp
View File

@@ -39,12 +39,12 @@ namespace chaiscript
class reserved_word_error : public std::runtime_error
{
public:
reserved_word_error(const std::string &t_word) noexcept
reserved_word_error(const std::string &t_word) CHAISCRIPT_NOEXCEPT
: std::runtime_error("Reserved word not allowed in object name: " + t_word), m_word(t_word)
{
}
virtual ~reserved_word_error() noexcept {}
virtual ~reserved_word_error() CHAISCRIPT_NOEXCEPT {}
std::string word() const
{
@@ -86,12 +86,12 @@ namespace chaiscript
class global_non_const : public std::runtime_error
{
public:
global_non_const() noexcept
global_non_const() CHAISCRIPT_NOEXCEPT
: std::runtime_error("a global object must be const")
{
}
virtual ~global_non_const() noexcept {}
virtual ~global_non_const() CHAISCRIPT_NOEXCEPT {}
};
}

8
include/chaiscript/dispatchkit/dynamic_cast_conversion.hpp
View File

@@ -20,22 +20,22 @@ namespace chaiscript
{
public:
bad_boxed_dynamic_cast(const Type_Info &t_from, const std::type_info &t_to,
const std::string &t_what) noexcept
const std::string &t_what) CHAISCRIPT_NOEXCEPT
: bad_boxed_cast(t_from, t_to, t_what)
{
}
bad_boxed_dynamic_cast(const Type_Info &t_from, const std::type_info &t_to) noexcept
bad_boxed_dynamic_cast(const Type_Info &t_from, const std::type_info &t_to) CHAISCRIPT_NOEXCEPT
: bad_boxed_cast(t_from, t_to)
{
}
bad_boxed_dynamic_cast(const std::string &w) noexcept
bad_boxed_dynamic_cast(const std::string &w) CHAISCRIPT_NOEXCEPT
: bad_boxed_cast(w)
{
}
virtual ~bad_boxed_dynamic_cast() noexcept {}
virtual ~bad_boxed_dynamic_cast() CHAISCRIPT_NOEXCEPT {}
};
}

6
include/chaiscript/dispatchkit/proxy_functions.hpp
View File

@@ -176,11 +176,11 @@ namespace chaiscript
class guard_error : public std::runtime_error
{
public:
guard_error() noexcept
guard_error() CHAISCRIPT_NOEXCEPT
: std::runtime_error("Guard evaluation failed")
{ }
virtual ~guard_error() noexcept
virtual ~guard_error() CHAISCRIPT_NOEXCEPT
{ }
};
}
@@ -579,7 +579,7 @@ namespace chaiscript
{
}
virtual ~dispatch_error() noexcept {}
virtual ~dispatch_error() CHAISCRIPT_NOEXCEPT {}
std::vector<Boxed_Value> parameters;
std::vector<Const_Proxy_Function> functions;

33
include/chaiscript/dispatchkit/proxy_functions_detail.hpp
View File

@@ -32,7 +32,7 @@ namespace chaiscript
{
}
virtual ~arity_error() noexcept {}
virtual ~arity_error() CHAISCRIPT_NOEXCEPT {}
int got;
int expected;
@@ -43,6 +43,29 @@ namespace chaiscript
{
namespace detail
{
template<typename ... Rest>
struct Build_Param_Type_List;
template<typename Param, typename ... Rest>
struct Build_Param_Type_List<Param, Rest...>
{
static void build(std::vector<Type_Info> &t_params)
{
t_params.push_back(chaiscript::detail::Get_Type_Info<Param>::get());
Build_Param_Type_List<Rest...>::build(t_params);
}
};
// 0th case
template<>
struct Build_Param_Type_List<>
{
static void build(std::vector<Type_Info> &)
{
}
};
/**
* Used by Proxy_Function_Impl to return a list of all param types
* it contains.
@@ -50,8 +73,12 @@ namespace chaiscript
template<typename Ret, typename ... Params>
std::vector<Type_Info> build_param_type_list(Ret (*)(Params...))
{
return std::vector<Type_Info> { chaiscript::detail::Get_Type_Info<Ret>::get(),
chaiscript::detail::Get_Type_Info<Params>::get()... };
/// \todo this code was previously using { chaiscript::detail::Get_Type_Info<Ret>::get()... }
/// but this seems to indicate another bug with MSVC's uniform initializer lists
std::vector<Type_Info> params;
params.push_back(chaiscript::detail::Get_Type_Info<Ret>::get());
Build_Param_Type_List<Params...>::build(params);
return params;
}

9
include/chaiscript/dispatchkit/register_function.hpp
View File

@@ -36,13 +36,17 @@ namespace chaiscript
template<typename Ret, typename Class, typename ... Args>
std::function<Ret (Class &, Args...) > to_function(Ret (Class::*func)(Args...))
{
return std::function<Ret (Class &, Args...)>(func);
/// \todo this std::mem_fn wrap shouldn't be necessary but type conversions for
/// std::function for member function pointers seems to be broken in MSVC
return std::function<Ret(Class &, Args...)>(std::mem_fn(func));
}
template<typename Ret, typename Class, typename ... Args>
std::function<Ret (const Class &, Args...) > to_function(Ret (Class::*func)(Args...) const)
{
return std::function<Ret (const Class &, Args...)>(func);
/// \todo this std::mem_fn wrap shouldn't be necessary but type conversions for
/// std::function for member function pointers seems to be broken in MSVC
return std::function<Ret (const Class &, Args...)>(std::mem_fn(func));
}
template<bool Object>
@@ -51,6 +55,7 @@ namespace chaiscript
template<typename T>
static Proxy_Function go(T t)
{
/// \todo is it possible to reduce the number of templates generated here?
return Proxy_Function(
new Proxy_Function_Impl<typename FunctionSignature<decltype(to_function(t)) >::Signature>(to_function(t)));
}

16
include/chaiscript/dispatchkit/type_info.hpp
View File

@@ -28,7 +28,7 @@ namespace chaiscript
class Type_Info
{
public:
constexpr Type_Info(bool t_is_const, bool t_is_reference, bool t_is_pointer, bool t_is_void,
CHAISCRIPT_CONSTEXPR Type_Info(bool t_is_const, bool t_is_reference, bool t_is_pointer, bool t_is_void,
bool t_is_arithmetic, const std::type_info *t_ti, const std::type_info *t_bareti)
: m_type_info(t_ti), m_bare_type_info(t_bareti),
m_is_const(t_is_const), m_is_reference(t_is_reference), m_is_pointer(t_is_pointer),
@@ -144,7 +144,7 @@ namespace chaiscript
{
typedef T type;
constexpr static Type_Info get()
CHAISCRIPT_CONSTEXPR static Type_Info get()
{
return Type_Info(std::is_const<typename std::remove_pointer<typename std::remove_reference<T>::type>::type>::value, std::is_reference<T>::value, std::is_pointer<T>::value,
std::is_void<T>::value,
@@ -159,7 +159,7 @@ namespace chaiscript
{
typedef T type;
constexpr static Type_Info get()
CHAISCRIPT_CONSTEXPR static Type_Info get()
{
return Type_Info(std::is_const<T>::value, std::is_reference<T>::value, std::is_pointer<T>::value,
std::is_void<T>::value,
@@ -174,7 +174,7 @@ namespace chaiscript
{
typedef T type;
constexpr static Type_Info get()
CHAISCRIPT_CONSTEXPR static Type_Info get()
{
return Type_Info(std::is_const<T>::value, std::is_reference<T>::value, std::is_pointer<T>::value,
std::is_void<T>::value,
@@ -189,7 +189,7 @@ namespace chaiscript
{
typedef T type;
constexpr static Type_Info get()
CHAISCRIPT_CONSTEXPR static Type_Info get()
{
return Type_Info(std::is_const<T>::value, std::is_reference<T>::value, std::is_pointer<T>::value,
std::is_void<T>::value,
@@ -204,7 +204,7 @@ namespace chaiscript
{
typedef T type;
constexpr static Type_Info get()
CHAISCRIPT_CONSTEXPR static Type_Info get()
{
return Type_Info(std::is_const<T>::value, std::is_reference<T>::value, std::is_pointer<T>::value,
std::is_void<T>::value,
@@ -231,7 +231,7 @@ namespace chaiscript
/// chaiscript::Type_Info ti = chaiscript::user_type(i);
/// \endcode
template<typename T>
constexpr Type_Info user_type(const T &/*t*/)
CHAISCRIPT_CONSTEXPR Type_Info user_type(const T &/*t*/)
{
return detail::Get_Type_Info<T>::get();
}
@@ -246,7 +246,7 @@ namespace chaiscript
/// chaiscript::Type_Info ti = chaiscript::user_type<int>();
/// \endcode
template<typename T>
constexpr Type_Info user_type()
CHAISCRIPT_CONSTEXPR Type_Info user_type()
{
return detail::Get_Type_Info<T>::get();
}