Skip to content

X3: Improve situation with move only types #472

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

Merged
Kojoley merged 5 commits into from
Feb 27, 2019
Merged

X3: Improve situation with move only types #472

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f371ccf
X3: push_back has to forward actual reference type
Kojoley Feb 25, 2019
8bd9b6e
X3: Fixed container of move only types with sequence
Kojoley Feb 25, 2019
793d896
X3: Move only types with optional
Kojoley Feb 25, 2019
660d8ac
X3.Tests: Fix odd temporary attribute creation
Kojoley Feb 25, 2019
5d80257
X3.Tests: MSVC14.0 have problems with variable templates
Kojoley Feb 27, 2019
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
Prev Previous commit
Next Next commit
X3.Tests: Fix odd temporary attribute creation
  • Loading branch information
@Kojoley
Kojoley committed Feb 26, 2019
commit 660d8ac3c160852672230ecdaf49811b10a34123
50 changes: 28 additions & 22 deletions test/x3/container_support.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ auto const string_rule_def = x3::lexeme[*x3::alnum];
BOOST_SPIRIT_DEFINE(pair_rule, string_rule);

template <typename Container>
void test_map_support(Container&& container)
void test_map_support()
{
using spirit_test::test_attr;

Container container;
Container const compare {{"k1", "v1"}, {"k2", "v2"}};
auto const rule = pair_rule % x3::lit(',');

Expand All @@ -56,10 +57,11 @@ void test_map_support(Container&& container)
}

template <typename Container>
void test_multimap_support(Container&& container)
void test_multimap_support()
{
using spirit_test::test_attr;

Container container;
Container const compare {{"k1", "v1"}, {"k2", "v2"}, {"k2", "v3"}};
auto const rule = pair_rule % x3::lit(',');

Expand All @@ -79,10 +81,11 @@ void test_multimap_support(Container&& container)
}

template <typename Container>
void test_sequence_support(Container&& container)
void test_sequence_support()
{
using spirit_test::test_attr;

Container container;
Container const compare {"e1", "e2", "e2"};
auto const rule = string_rule % x3::lit(',');

Expand All @@ -102,10 +105,11 @@ void test_sequence_support(Container&& container)
}

template <typename Container>
void test_set_support(Container&& container)
void test_set_support()
{
using spirit_test::test_attr;

Container container;
Container const compare {"e1", "e2"};
auto const rule = string_rule % x3::lit(',');

Expand All @@ -125,10 +129,11 @@ void test_set_support(Container&& container)
}

template <typename Container>
void test_multiset_support(Container&& container)
void test_multiset_support()
{
using spirit_test::test_attr;

Container container;
Container const compare {"e1", "e2", "e2"};
auto const rule = string_rule % x3::lit(',');

Expand All @@ -148,10 +153,11 @@ void test_multiset_support(Container&& container)
}

template <typename Container>
void test_string_support(Container&& container)
void test_string_support()
{
using spirit_test::test_attr;

Container container;
Container const compare {"e1e2e2"};
auto const rule = string_rule % x3::lit(',');

Expand Down Expand Up @@ -216,27 +222,27 @@ main()

// ------------------------------------------------------------------

test_string_support(std::string());
test_string_support<std::string>();

test_sequence_support(std::vector<std::string>());
test_sequence_support(std::list<std::string>());
test_sequence_support(std::deque<std::string>());
test_sequence_support<std::vector<std::string>>();
test_sequence_support<std::list<std::string>>();
test_sequence_support<std::deque<std::string>>();

test_set_support(std::set<std::string>());
test_set_support(std::unordered_set<std::string>());
test_set_support(boost::unordered_set<std::string>());
test_set_support<std::set<std::string>>();
test_set_support<std::unordered_set<std::string>>();
test_set_support<boost::unordered_set<std::string>>();

test_multiset_support(std::multiset<std::string>());
test_multiset_support(std::unordered_multiset<std::string>());
test_multiset_support(boost::unordered_multiset<std::string>());
test_multiset_support<std::multiset<std::string>>();
test_multiset_support<std::unordered_multiset<std::string>>();
test_multiset_support<boost::unordered_multiset<std::string>>();

test_map_support(std::map<std::string,std::string>());
test_map_support(std::unordered_map<std::string,std::string>());
test_map_support(boost::unordered_map<std::string,std::string>());
test_map_support<std::map<std::string,std::string>>();
test_map_support<std::unordered_map<std::string,std::string>>();
test_map_support<boost::unordered_map<std::string,std::string>>();

test_multimap_support(std::multimap<std::string,std::string>());
test_multimap_support(std::unordered_multimap<std::string,std::string>());
test_multimap_support(boost::unordered_multimap<std::string,std::string>());
test_multimap_support<std::multimap<std::string,std::string>>();
test_multimap_support<std::unordered_multimap<std::string,std::string>>();
test_multimap_support<boost::unordered_multimap<std::string,std::string>>();

return boost::report_errors();
}