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

Remove initializer_list conversion due to the issues mentioned here:

Browse Source 
http://stackoverflow.com/questions/18895583/convert-a-vectort-to-initializer-listt
This commit is contained in:
Jason Turner 2016-01-29 16:04:06 -07:00
parent 140a90f72a
commit b33f0a08bc
2 changed files with 0 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
include/chaiscript/dispatchkit/type_conversions.hpp
View File

@ -310,48 +310,6 @@ namespace chaiscript
private:
Callable m_func;
};
#ifndef CHAISCRIPT_MSVC_12
//http://stackoverflow.com/questions/18895583/convert-a-vectort-to-initializer-listt
constexpr size_t DEFAULT_MAX_LENGTH = 128;
template <typename V> struct backingValue { static V value; };
template <typename V> V backingValue<V>::value;
template <typename V, typename... Vcount> struct backingList { static std::initializer_list<V> list; };
template <typename V, typename... Vcount>
std::initializer_list<V> backingList<V, Vcount...>::list = { static_cast<Vcount>(backingValue<V>::value)... };
template <size_t maxLength, typename It, typename V = typename It::value_type, typename... Vcount>
static typename std::enable_if< sizeof...(Vcount) >= maxLength,
std::initializer_list<V> >::type generate_n(It begin, It end, It current)
{
throw std::length_error("More than maxLength elements in range.");
}
template <size_t maxLength = DEFAULT_MAX_LENGTH, typename It, typename V = typename It::value_type, typename... Vcount>
static typename std::enable_if< sizeof...(Vcount) < maxLength,
std::initializer_list<V> >::type generate_n(It begin, It end, It current)
{
if (current != end)
{
return generate_n<maxLength, It, V, V, Vcount...>(begin, end, ++current);
}
current = begin;
for (auto it = backingList<V, Vcount...>::list.begin();
it != backingList<V, Vcount...>::list.end();
++current, ++it)
*const_cast<V*>(&*it) = *current;
return backingList<V, Vcount...>::list;
}
template <typename It>
std::initializer_list<typename It::value_type> range_to_initializer_list(It begin, It end)
{
return detail::generate_n(begin, end, begin);
}
#endif
}
class Type_Conversions

42
unittests/compiled_tests.cpp
View File

@ -913,46 +913,4 @@ TEST_CASE("Return of converted type from script")
chai.add(chaiscript::user_type<Returned_Converted_Config>(), "Returned_Converted_Config");
}
#ifndef CHAISCRIPT_MSVC_12
TEST_CASE("Return initializer_list")
{
chaiscript::ChaiScript chai;
chai.add(chaiscript::initializer_list_conversion<std::initializer_list<int>>());
auto initlist = chai.eval<std::initializer_list<int>>(R"(
return [11, 22, 33, 44];
)");
CHECK(initlist.size() == 4);
CHECK(typeid(decltype(initlist)) == typeid(std::initializer_list<int>));
}
bool initializer_list_of_enums_interface(std::initializer_list<Utility_Test_Numbers> initlist)
{
return initlist.size() == 3 && *initlist.begin() == THREE;
}
TEST_CASE("Call from script with initializer_list argument")
{
chaiscript::ChaiScript chai;
chaiscript::ModulePtr m = chaiscript::ModulePtr(new chaiscript::Module());
chaiscript::utility::add_class<Utility_Test_Numbers>(*m,
"Utility_Test_Numbers",
{ { ONE, "ONE" },
{ TWO, "TWO" },
{ THREE, "THREE" }
}
);
chai.add(m);
chai.add(chaiscript::initializer_list_conversion<std::initializer_list<Utility_Test_Numbers>>());
chai.add(chaiscript::fun(&initializer_list_of_enums_interface), "initializer_list_of_enums_interface");
auto interface_result = chai.eval<bool>("return initializer_list_of_enums_interface([THREE, TWO, ONE]);");
CHECK(interface_result == true);
}
#endif