squiid/llvm
1
0
Fork 0
Code Issues Pull requests Activity

Add variants of interleave that take separator

Browse source 
Make the common case of string separator easier to specify.

PiperOrigin-RevId: 270697581
This commit is contained in:
Jacques Pienaar 2019-09-23 09:49:43 -07:00 committed by A. Unique TensorFlower
parent b8676da1fc
commit 59e3b30af0
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
mlir/include/mlir/Support/STLExtras.h
View file

@ -46,7 +46,10 @@ using ValueOfRange = typename std::remove_reference<decltype(
/// [&] { os << ", "; });
/// \endcode
template <typename ForwardIterator, typename UnaryFunctor,
typename NullaryFunctor>
typename NullaryFunctor,
typename = typename std::enable_if<
!std::is_constructible<StringRef, UnaryFunctor>::value &&
!std::is_constructible<StringRef, NullaryFunctor>::value>::type>
inline void interleave(ForwardIterator begin, ForwardIterator end,
UnaryFunctor each_fn, NullaryFunctor between_fn) {
if (begin == end)
@ -59,17 +62,35 @@ inline void interleave(ForwardIterator begin, ForwardIterator end,
}
}
template <typename Container, typename UnaryFunctor, typename NullaryFunctor>
template <typename Container, typename UnaryFunctor, typename NullaryFunctor,
typename = typename std::enable_if<
!std::is_constructible<StringRef, UnaryFunctor>::value &&
!std::is_constructible<StringRef, NullaryFunctor>::value>::type>
inline void interleave(const Container &c, UnaryFunctor each_fn,
NullaryFunctor between_fn) {
interleave(c.begin(), c.end(), each_fn, between_fn);
}
/// Overload of interleave for the common case of string separator.
template <typename Container, typename UnaryFunctor, typename raw_ostream,
typename T = detail::ValueOfRange<Container>>
inline void interleave(const Container &c, raw_ostream &os,
UnaryFunctor each_fn, const StringRef &separator) {
interleave(c.begin(), c.end(), each_fn, [&] { os << separator; });
}
template <typename Container, typename raw_ostream,
typename T = detail::ValueOfRange<Container>>
inline void interleave(const Container &c, raw_ostream &os,
const StringRef &separator) {
interleave(
c, os, [&](const T &a) { os << a; }, separator);
}
template <typename Container, typename UnaryFunctor, typename raw_ostream,
typename T = detail::ValueOfRange<Container>>
inline void interleaveComma(const Container &c, raw_ostream &os,
UnaryFunctor each_fn) {
interleave(c.begin(), c.end(), each_fn, [&] { os << ", "; });
interleave(c, os, each_fn, ", ");
}
template <typename Container, typename raw_ostream,
typename T = detail::ValueOfRange<Container>>

4
mlir/lib/Dialect/SPIRV/SPIRVDialect.cpp
View file

@ -642,12 +642,10 @@ static void print(StructType type, llvm::raw_ostream &os) {
if (!decorations.empty())
os << " ";
}
auto between_fn = [&os]() { os << " "; };
auto each_fn = [&os](spirv::Decoration decoration) {
os << stringifyDecoration(decoration);
};
mlir::interleave(decorations.begin(), decorations.end(), each_fn,
between_fn);
mlir::interleave(decorations, os, each_fn, " ");
os << "]";
}
};