From 6030ea63bd792f9dad1e951986114a92c9701d0e Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Mon, 24 May 2021 09:19:47 -0400 Subject: [PATCH] Revert "Add pair_conversion registration helper with unit test" --- .../dispatchkit/type_conversions.hpp | 17 -------------- unittests/compiled_tests.cpp | 23 ------------------- 2 files changed, 40 deletions(-) diff --git a/include/chaiscript/dispatchkit/type_conversions.hpp b/include/chaiscript/dispatchkit/type_conversions.hpp index ab146b61..b4ad2177 100644 --- a/include/chaiscript/dispatchkit/type_conversions.hpp +++ b/include/chaiscript/dispatchkit/type_conversions.hpp @@ -654,23 +654,6 @@ namespace chaiscript return chaiscript::make_shared>(user_type>(), user_type(), func); } - - template - Type_Conversion pair_conversion() - { - auto func = [](const Boxed_Value &t_bv) -> Boxed_Value { - const std::pair &from_pair = detail::Cast_Helper &>::cast(t_bv, nullptr); - - auto pair = std::make_pair( - detail::Cast_Helper::cast(from_pair.first, nullptr), - detail::Cast_Helper::cast(from_pair.second, nullptr) - ); - - return Boxed_Value(std::move(pair)); - }; - - return chaiscript::make_shared>(user_type>(), user_type>(), func); - } } diff --git a/unittests/compiled_tests.cpp b/unittests/compiled_tests.cpp index 4b4fc5b1..52cfe959 100644 --- a/unittests/compiled_tests.cpp +++ b/unittests/compiled_tests.cpp @@ -1009,29 +1009,6 @@ TEST_CASE("Map conversions") } -TEST_CASE("Pair conversions") -{ - chaiscript::ChaiScript_Basic chai(create_chaiscript_stdlib(),create_chaiscript_parser()); - chai.add(chaiscript::pair_conversion()); - chai.add(chaiscript::pair_conversion()); - - { - const auto p = chai.eval>(R"cs( - Pair("chai", "script"); - )cs"); - CHECK(p.first == std::string{"chai"}); - CHECK(p.second == "script"); - } - { - const auto p = chai.eval>(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