github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

container: allow sort_and_unique to have a comparator

Browse Source
This commit is contained in:
Justin Viiret 2017-02-16 11:03:05 +11:00 committed by Matthew Barr
parent cea8f452f2
commit dc50ab291b
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rose/rose_build_bytecode.cpp
View File

@ -3658,13 +3658,11 @@ void makeRoleInfixTriggers(RoseBuildImpl &build, build_context &bc,
}
// Order, de-dupe and add instructions to the end of program.
sort(begin(infix_program), end(infix_program),
[](const RoseInstrTriggerInfix &a, const RoseInstrTriggerInfix &b) {
sort_and_unique(infix_program, [](const RoseInstrTriggerInfix &a,
const RoseInstrTriggerInfix &b) {
return tie(a.cancel, a.queue, a.event) <
tie(b.cancel, b.queue, b.event);
});
infix_program.erase(unique(begin(infix_program), end(infix_program)),
end(infix_program));
for (const auto &ri : infix_program) {
program.add_before_end(make_unique<RoseInstrTriggerInfix>(ri));
}
@ -4163,13 +4161,10 @@ void makePushDelayedInstructions(const RoseBuildImpl &build,
}
}
sort(begin(delay_instructions), end(delay_instructions),
[](const RoseInstrPushDelayed &a, const RoseInstrPushDelayed &b) {
sort_and_unique(delay_instructions, [](const RoseInstrPushDelayed &a,
const RoseInstrPushDelayed &b) {
return tie(a.delay, a.index) < tie(b.delay, b.index);
});
delay_instructions.erase(
unique(begin(delay_instructions), end(delay_instructions)),
end(delay_instructions));
for (const auto &ri : delay_instructions) {
program.add_before_end(make_unique<RoseInstrPushDelayed>(ri));

6
src/util/container.h
View File

@ -90,9 +90,9 @@ auto make_vector_from(const std::pair<It, It> &range)
}
/** \brief Sort a sequence container and remove duplicates. */
template <typename C>
void sort_and_unique(C &container) {
std::sort(std::begin(container), std::end(container));
template <typename C, typename Compare = std::less<typename C::value_type>>
void sort_and_unique(C &container, Compare comp = Compare()) {
std::sort(std::begin(container), std::end(container), comp);
container.erase(std::unique(std::begin(container), std::end(container)),
std::end(container));
}