10000 Reimplement pair_conversion() helper by totalgee · Pull Request #570 · ChaiScript/ChaiScript · GitHub
[go: up one dir, main page]
Skip to content

Reimplement pair_conversion() helper #570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Reimplement pair_conversion() helper #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions include/chaiscript/dispatchkit/type_conversions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,24 @@ namespace chaiscript {
return chaiscript::make_shared<detail::Type_Conversion_Base, detail::Type_Conversion_Impl<decltype(func)>>(
user_type<std::map<std::string, Boxed_Value>>(), user_type<To>(), func);
}

template<typename Left, typename Right>
Type_Conversion pair_conversion() {
auto func = [](const Boxed_Value &t_bv) -> Boxed_Value {
const std::pair<Boxed_Value, Boxed_Value> &from_pair
= detail::Cast_Helper<const std::pair<Boxed_Value, Boxed_Value> &>::cast(t_bv, nullptr);

auto pair = std::make_pair(
detail::Cast_Helper<Left>::cast(from_pair.first, nullptr),
detail::Cast_Helper<Right>::cast(from_pair.second, nullptr)
);

return Boxed_Value(std::move(pair));
};

return chaiscript::make_shared<detail::Type_Conversion_Base, detail::Type_Conversion_Impl<decltype(func)>>(
user_type<std::pair<Boxed_Value, Boxed_Value>>(), user_type<std::pair<Left, Right>>(), func);
}
} // namespace chaiscript

#endif
21 changes: 21 additions & 0 deletions unittests/compiled_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,6 +866,27 @@ TEST_CASE("Map conversions") {
CHECK(c == 42);
}

TEST_CASE("Pair conversions") {
chaiscript::ChaiScript_Basic chai(create_chaiscript_stdlib(), create_chaiscript_parser());
chai.add(chaiscript::pair_conversion<std::string, std::string>());
chai.add(chaiscript::pair_conversion<int, double>());

{
const auto p = chai.eval<std::pair<std::string, std::string>>(R"cs(
Pair("chai", "script");
)cs");
CHECK(p.first == std::string{ "chai" });
CHECK(p.second == "script");
}
{
const auto p = chai.eval<std::pair<int, double>>(R"cs(
Pair(5, 3.14);
)cs");
CHECK(p.first == 5);
CHECK(p.second == Approx(3.14));
}
}

TEST_CASE("Parse floats with non-posix locale") {
#ifdef CHAISCRIPT_MSVC
std::setlocale(LC_ALL, "en-ZA");
Expand Down
0