From 643afb3b01318f9ce20558ffef374b377b1f1df7 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 7 Sep 2001 16:30:28 +0000 Subject: [PATCH] * Fixed mapped_iterator to actually work with functors * Implement mapto function that works like map in a functional programming language git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@439 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/STLExtras.h | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/include/llvm/Support/STLExtras.h b/include/llvm/Support/STLExtras.h index 867e1128196..44d789dcf22 100644 --- a/include/llvm/Support/STLExtras.h +++ b/include/llvm/Support/STLExtras.h @@ -68,6 +68,7 @@ static inline void deleter(T *Ptr) { template class mapped_iterator { RootIt current; + UnaryFunc Fn; public: typedef typename iterator_traits::iterator_category iterator_category; @@ -82,11 +83,13 @@ public: inline RootIt &getCurrent() const { return current; } - inline explicit mapped_iterator(const RootIt &I) : current(I) {} - inline mapped_iterator(const mapped_iterator &It) : current(It.current) {} + inline explicit mapped_iterator(const RootIt &I, UnaryFunc F) + : current(I), Fn(F) {} + inline mapped_iterator(const mapped_iterator &It) + : current(It.current), Fn(It.Fn) {} inline value_type operator*() const { // All this work to do this - return UnaryFunc()(*current); // little change + return Fn(*current); // little change } _Self& operator++() { ++current; return *this; } @@ -120,6 +123,7 @@ operator+(typename mapped_iterator<_Iterator, Func>::difference_type N, // vector iterators are commonly value_type **'s template class mapped_iterator : public RootIt { + UnaryFunc Fn; public: typedef typename UnaryFunc::result_type value_type; typedef typename UnaryFunc::result_type *pointer; @@ -131,7 +135,7 @@ public: inline mapped_iterator(const super &It) : super(It) {} inline value_type operator*() const { // All this work to do - return UnaryFunc(super::operator*()); // this little thing + return Fn(super::operator*()); // this little thing } }; #endif @@ -141,7 +145,7 @@ public: // template inline mapped_iterator map_iterator(const ItTy &I, FuncTy F) { - return mapped_iterator(I); + return mapped_iterator(I, F); } @@ -207,4 +211,12 @@ inline bool reduce_apply_bool(InputIt First, InputIt Last, Function Func) { return reduce_apply(First, Last, bitwise_or(), false, Func); } + +// map - This function maps the specified input sequence into the specified +// output iterator, applying a unary function in between. +// +template +inline OutIt mapto(InIt Begin, InIt End, OutIt Dest, Functor F) { + return copy(map_iterator(Begin, F), map_iterator(End, F), Dest); +} #endif -- 2.34.1