replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use C++, not C++-standard-library-internals-ese. 

llvm-svn: 101245
This commit is contained in:
Dan Gohman 2010-04-14 15:41:50 +00:00
parent f1f0c9ded8
commit 7947f03a07
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
llvm/include/llvm/Support/CFG.h
View File

@ -25,12 +25,12 @@ namespace llvm {
// BasicBlock pred_iterator definition // BasicBlock pred_iterator definition
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
template <class _Ptr, class _USE_iterator> // Predecessor Iterator template <class Ptr, class USE_iterator> // Predecessor Iterator
class PredIterator : public std::iterator<std::forward_iterator_tag, class PredIterator : public std::iterator<std::forward_iterator_tag,
_Ptr, ptrdiff_t> { Ptr, ptrdiff_t> {
typedef std::iterator<std::forward_iterator_tag, _Ptr, ptrdiff_t> super; typedef std::iterator<std::forward_iterator_tag, Ptr, ptrdiff_t> super;
typedef PredIterator<_Ptr,_USE_iterator> _Self; typedef PredIterator<Ptr, USE_iterator> Self;
_USE_iterator It; USE_iterator It;
inline void advancePastNonTerminators() { inline void advancePastNonTerminators() {
// Loop to ignore non terminator uses (for example PHI nodes)... // Loop to ignore non terminator uses (for example PHI nodes)...
@ -41,13 +41,13 @@ class PredIterator : public std::iterator<std::forward_iterator_tag,
public: public:
typedef typename super::pointer pointer; typedef typename super::pointer pointer;
inline PredIterator(_Ptr *bb) : It(bb->use_begin()) { inline PredIterator(Ptr *bb) : It(bb->use_begin()) {
advancePastNonTerminators(); advancePastNonTerminators();
} }
inline PredIterator(_Ptr *bb, bool) : It(bb->use_end()) {} inline PredIterator(Ptr *bb, bool) : It(bb->use_end()) {}
inline bool operator==(const _Self& x) const { return It == x.It; } inline bool operator==(const Self& x) const { return It == x.It; }
inline bool operator!=(const _Self& x) const { return !operator==(x); } inline bool operator!=(const Self& x) const { return !operator==(x); }
inline pointer operator*() const { inline pointer operator*() const {
assert(!It.atEnd() && "pred_iterator out of range!"); assert(!It.atEnd() && "pred_iterator out of range!");
@ -55,14 +55,14 @@ public:
} }
inline pointer *operator->() const { return &(operator*()); } inline pointer *operator->() const { return &(operator*()); }
inline _Self& operator++() { // Preincrement inline Self& operator++() { // Preincrement
assert(!It.atEnd() && "pred_iterator out of range!"); assert(!It.atEnd() && "pred_iterator out of range!");
++It; advancePastNonTerminators(); ++It; advancePastNonTerminators();
return *this; return *this;
} }
inline _Self operator++(int) { // Postincrement inline Self operator++(int) { // Postincrement
_Self tmp = *this; ++*this; return tmp; Self tmp = *this; ++*this; return tmp;
} }
}; };
@ -91,7 +91,7 @@ class SuccIterator : public std::iterator<std::bidirectional_iterator_tag,
const Term_ Term; const Term_ Term;
unsigned idx; unsigned idx;
typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t> super; typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t> super;
typedef SuccIterator<Term_, BB_> _Self; typedef SuccIterator<Term_, BB_> Self;
inline bool index_is_valid(int idx) { inline bool index_is_valid(int idx) {
return idx >= 0 && (unsigned) idx < Term->getNumSuccessors(); return idx >= 0 && (unsigned) idx < Term->getNumSuccessors();
@ -109,7 +109,7 @@ public:
assert(T && "getTerminator returned null!"); assert(T && "getTerminator returned null!");
} }
inline const _Self &operator=(const _Self &I) { inline const Self &operator=(const Self &I) {
assert(Term == I.Term &&"Cannot assign iterators to two different blocks!"); assert(Term == I.Term &&"Cannot assign iterators to two different blocks!");
idx = I.idx; idx = I.idx;
return *this; return *this;
@ -119,64 +119,64 @@ public:
/// operate on terminator instructions directly. /// operate on terminator instructions directly.
unsigned getSuccessorIndex() const { return idx; } unsigned getSuccessorIndex() const { return idx; }
inline bool operator==(const _Self& x) const { return idx == x.idx; } inline bool operator==(const Self& x) const { return idx == x.idx; }
inline bool operator!=(const _Self& x) const { return !operator==(x); } inline bool operator!=(const Self& x) const { return !operator==(x); }
inline pointer operator*() const { return Term->getSuccessor(idx); } inline pointer operator*() const { return Term->getSuccessor(idx); }
inline pointer operator->() const { return operator*(); } inline pointer operator->() const { return operator*(); }
inline _Self& operator++() { ++idx; return *this; } // Preincrement inline Self& operator++() { ++idx; return *this; } // Preincrement
inline _Self operator++(int) { // Postincrement inline Self operator++(int) { // Postincrement
_Self tmp = *this; ++*this; return tmp; Self tmp = *this; ++*this; return tmp;
} }
inline _Self& operator--() { --idx; return *this; } // Predecrement inline Self& operator--() { --idx; return *this; } // Predecrement
inline _Self operator--(int) { // Postdecrement inline Self operator--(int) { // Postdecrement
_Self tmp = *this; --*this; return tmp; Self tmp = *this; --*this; return tmp;
} }
inline bool operator<(const _Self& x) const { inline bool operator<(const Self& x) const {
assert(Term == x.Term && "Cannot compare iterators of different blocks!"); assert(Term == x.Term && "Cannot compare iterators of different blocks!");
return idx < x.idx; return idx < x.idx;
} }
inline bool operator<=(const _Self& x) const { inline bool operator<=(const Self& x) const {
assert(Term == x.Term && "Cannot compare iterators of different blocks!"); assert(Term == x.Term && "Cannot compare iterators of different blocks!");
return idx <= x.idx; return idx <= x.idx;
} }
inline bool operator>=(const _Self& x) const { inline bool operator>=(const Self& x) const {
assert(Term == x.Term && "Cannot compare iterators of different blocks!"); assert(Term == x.Term && "Cannot compare iterators of different blocks!");
return idx >= x.idx; return idx >= x.idx;
} }
inline bool operator>(const _Self& x) const { inline bool operator>(const Self& x) const {
assert(Term == x.Term && "Cannot compare iterators of different blocks!"); assert(Term == x.Term && "Cannot compare iterators of different blocks!");
return idx > x.idx; return idx > x.idx;
} }
inline _Self& operator+=(int Right) { inline Self& operator+=(int Right) {
unsigned new_idx = idx + Right; unsigned new_idx = idx + Right;
assert(index_is_valid(new_idx) && "Iterator index out of bound"); assert(index_is_valid(new_idx) && "Iterator index out of bound");
idx = new_idx; idx = new_idx;
return *this; return *this;
} }
inline _Self operator+(int Right) { inline Self operator+(int Right) {
_Self tmp = *this; Self tmp = *this;
tmp += Right; tmp += Right;
return tmp; return tmp;
} }
inline _Self& operator-=(int Right) { inline Self& operator-=(int Right) {
return operator+=(-Right); return operator+=(-Right);
} }
inline _Self operator-(int Right) { inline Self operator-(int Right) {
return operator+(-Right); return operator+(-Right);
} }
inline int operator-(const _Self& x) { inline int operator-(const Self& x) {
assert(Term == x.Term && "Cannot work on iterators of different blocks!"); assert(Term == x.Term && "Cannot work on iterators of different blocks!");
int distance = idx - x.idx; int distance = idx - x.idx;
return distance; return distance;
@ -187,7 +187,7 @@ public:
// be modified are not available. // be modified are not available.
// //
// inline pointer operator[](int offset) { // inline pointer operator[](int offset) {
// _Self tmp = *this; // Self tmp = *this;
// tmp += offset; // tmp += offset;
// return tmp.operator*(); // return tmp.operator*();
// } // }