steven/TinySTL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决const_reverse_iterator的bug

Browse Source
This commit is contained in:
邹晓航
2014-10-24 16:50:33 +08:00
parent f8220473ef
commit 7b2f3b0b4f
5 changed files with 71 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
TinySTL/Deque.h
View File

@@ -40,7 +40,9 @@ namespace TinySTL{
//TinySTL::swap(container_, it.container_); //TinySTL::swap(container_, it.container_);
} }
reference operator *(){ return *cur_; } reference operator *(){ return *cur_; }
const reference operator *()const{ return *cur_; }
pointer operator ->(){ return &(operator*()); } pointer operator ->(){ return &(operator*()); }
const pointer operator ->()const{ return &(operator*()); }
dq_iter& operator ++(){ dq_iter& operator ++(){
if (cur_ != getBuckTail(mapIndex_))//+1<><31><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͬһ<CDAC><D2BB>Ͱ<EFBFBD><CDB0> if (cur_ != getBuckTail(mapIndex_))//+1<><31><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͬһ<CDAC><D2BB>Ͱ<EFBFBD><CDB0>
++cur_; ++cur_;
@@ -166,7 +168,6 @@ namespace TinySTL{
public: public:
typedef T value_type; typedef T value_type;
typedef dq_iter<T> iterator; typedef dq_iter<T> iterator;
typedef const iterator const_iterator;
typedef T& reference; typedef T& reference;
typedef const reference const_reference; typedef const reference const_reference;
typedef size_t size_type; typedef size_t size_type;
@@ -197,11 +198,7 @@ namespace TinySTL{
deque& operator= (deque&& x); deque& operator= (deque&& x);
iterator begin(){ return beg_; } iterator begin(){ return beg_; }
const_iterator begin() const{ return beg_; }
iterator end(){ return end_; } iterator end(){ return end_; }
const_iterator end() const{ return end_; }
const_iterator cbegin() const{ return beg_; }
const_iterator cend() const{ return end_; }
size_type size() const{ return end() - begin(); } size_type size() const{ return end() - begin(); }
bool empty() const{ return begin() == end(); } bool empty() const{ return begin() == end(); }

102
TinySTL/ReverseIterator.h
View File

@@ -5,7 +5,7 @@
namespace TinySTL{ namespace TinySTL{
template<class Iterator> template<class Iterator>
class reverse_iterator{ class reverse_iterator_t{
public: public:
typedef Iterator iterator_type; typedef Iterator iterator_type;
typedef typename iterator_traits<Iterator>::iterator_category iterator_category; typedef typename iterator_traits<Iterator>::iterator_category iterator_category;
@@ -20,10 +20,10 @@ namespace TinySTL{
Iterator cur_; Iterator cur_;
public: public:
//<2F><><EFBFBD>졣<EFBFBD><ECA1A3><EFBFBD>ƣ<EFBFBD><C6A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> //<2F><><EFBFBD>졣<EFBFBD><ECA1A3><EFBFBD>ƣ<EFBFBD><C6A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
reverse_iterator() :base_(0), cur_(0){} reverse_iterator_t() :base_(0), cur_(0){}
explicit reverse_iterator(const iterator_type& it) :base_(it), cur_(it - 1){} explicit reverse_iterator_t(const iterator_type& it) :base_(it), cur_(it - 1){}
template <class Iter> template <class Iter>
reverse_iterator(const reverse_iterator<Iter>& rev_it){ reverse_iterator_t(const reverse_iterator_t<Iter>& rev_it){
base_ = (iterator_type)rev_it.base(); base_ = (iterator_type)rev_it.base();
cur_ = base_ - 1; cur_ = base_ - 1;
}; };
@@ -34,33 +34,33 @@ namespace TinySTL{
const_reference operator*()const{ return(*cur_); } const_reference operator*()const{ return(*cur_); }
pointer operator->(){ return &(operator *()); } pointer operator->(){ return &(operator *()); }
const_pointer operator->()const{ return &(operator*()); } const_pointer operator->()const{ return &(operator*()); }
reverse_iterator& operator ++(){ reverse_iterator_t& operator ++(){
--base_; --base_;
--cur_; --cur_;
return *this; return *this;
} }
reverse_iterator& operator ++(int){ reverse_iterator_t& operator ++(int){
reverse_iterator temp = *this; reverse_iterator_t temp = *this;
++(*this); ++(*this);
return temp; return temp;
} }
reverse_iterator& operator--(){ reverse_iterator_t& operator--(){
++base_; ++base_;
++cur_; ++cur_;
return *this; return *this;
} }
reverse_iterator operator--(int){ reverse_iterator_t operator--(int){
reverse_iterator temp = *this; reverse_iterator_t temp = *this;
--(*this); --(*this);
return temp; return temp;
} }
reference operator[] (difference_type n){ reference operator[] (difference_type n){
return base()[-n - 1]; return base()[-n - 1];
} }
reverse_iterator operator + (difference_type n)const; reverse_iterator_t operator + (difference_type n)const;
reverse_iterator& operator += (difference_type n); reverse_iterator_t& operator += (difference_type n);
reverse_iterator operator - (difference_type n)const; reverse_iterator_t operator - (difference_type n)const;
reverse_iterator& operator -= (difference_type n); reverse_iterator_t& operator -= (difference_type n);
private: private:
Iterator advanceNStep(Iterator it, Iterator advanceNStep(Iterator it,
difference_type n, difference_type n,
@@ -93,94 +93,94 @@ namespace TinySTL{
} }
public: public:
template <class Iterator> template <class Iterator>
friend bool operator == (const reverse_iterator<Iterator>& lhs, friend bool operator == (const reverse_iterator_t<Iterator>& lhs,
const reverse_iterator<Iterator>& rhs); const reverse_iterator_t<Iterator>& rhs);
template <class Iterator> template <class Iterator>
friend bool operator != (const reverse_iterator<Iterator>& lhs, friend bool operator != (const reverse_iterator_t<Iterator>& lhs,
const reverse_iterator<Iterator>& rhs); const reverse_iterator_t<Iterator>& rhs);
template <class Iterator> template <class Iterator>
friend bool operator < (const reverse_iterator<Iterator>& lhs, friend bool operator < (const reverse_iterator_t<Iterator>& lhs,
const reverse_iterator<Iterator>& rhs); const reverse_iterator_t<Iterator>& rhs);
template <class Iterator> template <class Iterator>
friend bool operator <= (const reverse_iterator<Iterator>& lhs, friend bool operator <= (const reverse_iterator_t<Iterator>& lhs,
const reverse_iterator<Iterator>& rhs); const reverse_iterator_t<Iterator>& rhs);
template <class Iterator> template <class Iterator>
friend bool operator > (const reverse_iterator<Iterator>& lhs, friend bool operator > (const reverse_iterator_t<Iterator>& lhs,
const reverse_iterator<Iterator>& rhs); const reverse_iterator_t<Iterator>& rhs);
template <class Iterator> template <class Iterator>
friend bool operator >= (const reverse_iterator<Iterator>& lhs, friend bool operator >= (const reverse_iterator_t<Iterator>& lhs,
const reverse_iterator<Iterator>& rhs); const reverse_iterator_t<Iterator>& rhs);
template <class Iterator> template <class Iterator>
friend reverse_iterator<Iterator> operator + ( friend reverse_iterator_t<Iterator> operator + (
typename reverse_iterator<Iterator>::difference_type n, typename reverse_iterator_t<Iterator>::difference_type n,
const reverse_iterator<Iterator>& rev_it); const reverse_iterator_t<Iterator>& rev_it);
template <class Iterator> template <class Iterator>
friend typename reverse_iterator<Iterator>::difference_type operator- ( friend typename reverse_iterator_t<Iterator>::difference_type operator- (
const reverse_iterator<Iterator>& lhs, const reverse_iterator_t<Iterator>& lhs,
const reverse_iterator<Iterator>& rhs); const reverse_iterator_t<Iterator>& rhs);
};// end of reverse_iterator };// end of reverse_iterator_t
template<class Iterator> template<class Iterator>
reverse_iterator<Iterator>& reverse_iterator<Iterator>::operator += (difference_type n){ reverse_iterator_t<Iterator>& reverse_iterator_t<Iterator>::operator += (difference_type n){
base_ = advanceNStep(base_, n, false, iterator_category()); base_ = advanceNStep(base_, n, false, iterator_category());
cur_ = advanceNStep(cur_, n, false, iterator_category()); cur_ = advanceNStep(cur_, n, false, iterator_category());
return *this; return *this;
} }
template<class Iterator> template<class Iterator>
reverse_iterator<Iterator>& reverse_iterator<Iterator>::operator -= (difference_type n){ reverse_iterator_t<Iterator>& reverse_iterator_t<Iterator>::operator -= (difference_type n){
base_ = advanceNStep(base_, n, true, iterator_category()); base_ = advanceNStep(base_, n, true, iterator_category());
cur_ = advanceNStep(cur_, n, true, iterator_category()); cur_ = advanceNStep(cur_, n, true, iterator_category());
return *this; return *this;
} }
template<class Iterator> template<class Iterator>
reverse_iterator<Iterator> reverse_iterator<Iterator>::operator + (difference_type n)const{ reverse_iterator_t<Iterator> reverse_iterator_t<Iterator>::operator + (difference_type n)const{
reverse_iterator<Iterator> res = *this; reverse_iterator_t<Iterator> res = *this;
res += n; res += n;
return res; return res;
} }
template<class Iterator> template<class Iterator>
reverse_iterator<Iterator> reverse_iterator<Iterator>::operator - (difference_type n)const{ reverse_iterator_t<Iterator> reverse_iterator_t<Iterator>::operator - (difference_type n)const{
reverse_iterator<Iterator> res = *this; reverse_iterator_t<Iterator> res = *this;
res -= n; res -= n;
return res; return res;
} }
template <class Iterator> template <class Iterator>
bool operator == (const reverse_iterator<Iterator>& lhs, const reverse_iterator<Iterator>& rhs){ bool operator == (const reverse_iterator_t<Iterator>& lhs, const reverse_iterator_t<Iterator>& rhs){
return lhs.cur_ == rhs.cur_; return lhs.cur_ == rhs.cur_;
} }
template <class Iterator> template <class Iterator>
bool operator != (const reverse_iterator<Iterator>& lhs, const reverse_iterator<Iterator>& rhs){ bool operator != (const reverse_iterator_t<Iterator>& lhs, const reverse_iterator_t<Iterator>& rhs){
return !(lhs == rhs); return !(lhs == rhs);
} }
template <class Iterator> template <class Iterator>
bool operator < (const reverse_iterator<Iterator>& lhs, const reverse_iterator<Iterator>& rhs){ bool operator < (const reverse_iterator_t<Iterator>& lhs, const reverse_iterator_t<Iterator>& rhs){
return lhs.cur_ < rhs.cur_; return lhs.cur_ < rhs.cur_;
} }
template <class Iterator> template <class Iterator>
bool operator > (const reverse_iterator<Iterator>& lhs, const reverse_iterator<Iterator>& rhs){ bool operator > (const reverse_iterator_t<Iterator>& lhs, const reverse_iterator_t<Iterator>& rhs){
return lhs.cur_ > rhs.cur_; return lhs.cur_ > rhs.cur_;
} }
template <class Iterator> template <class Iterator>
bool operator >= (const reverse_iterator<Iterator>& lhs, const reverse_iterator<Iterator>& rhs){ bool operator >= (const reverse_iterator_t<Iterator>& lhs, const reverse_iterator_t<Iterator>& rhs){
return !(lhs < rhs); return !(lhs < rhs);
} }
template <class Iterator> template <class Iterator>
bool operator <= (const reverse_iterator<Iterator>& lhs, const reverse_iterator<Iterator>& rhs){ bool operator <= (const reverse_iterator_t<Iterator>& lhs, const reverse_iterator_t<Iterator>& rhs){
return !(lhs > rhs); return !(lhs > rhs);
} }
template <class Iterator> template <class Iterator>
reverse_iterator<Iterator> operator + ( reverse_iterator_t<Iterator> operator + (
typename reverse_iterator<Iterator>::difference_type n, typename reverse_iterator_t<Iterator>::difference_type n,
const reverse_iterator<Iterator>& rev_it){ const reverse_iterator_t<Iterator>& rev_it){
return rev_it + n; return rev_it + n;
} }
template <class Iterator> template <class Iterator>
typename reverse_iterator<Iterator>::difference_type operator - ( typename reverse_iterator_t<Iterator>::difference_type operator - (
const reverse_iterator<Iterator>& lhs, const reverse_iterator_t<Iterator>& lhs,
const reverse_iterator<Iterator>& rhs){ const reverse_iterator_t<Iterator>& rhs){
return lhs.cur_ - rhs.cur_; return lhs.cur_ - rhs.cur_;
} }
} }

4
TinySTL/String.h
View File

@@ -17,8 +17,8 @@ namespace TinySTL{
typedef char value_type; typedef char value_type;
typedef char * iterator; typedef char * iterator;
typedef const char * const_iterator; typedef const char * const_iterator;
typedef reverse_iterator<char*> reverse_iterator; typedef reverse_iterator_t<char*> reverse_iterator;
typedef const reverse_iterator const_reverse_iterator; typedef reverse_iterator_t<const char*> const_reverse_iterator;
typedef char& reference; typedef char& reference;
typedef const char& const_reference; typedef const char& const_reference;
typedef size_t size_type; typedef size_t size_type;

4
TinySTL/Vector.h
View File

@@ -24,8 +24,8 @@ namespace TinySTL{
typedef T value_type; typedef T value_type;
typedef T* iterator; typedef T* iterator;
typedef const iterator const_iterator; typedef const iterator const_iterator;
typedef reverse_iterator<T*> reverse_iterator; typedef reverse_iterator_t<T*> reverse_iterator;
typedef const reverse_iterator const_reverse_iterator; typedef reverse_iterator_t<const T*> const_reverse_iterator;
typedef iterator pointer; typedef iterator pointer;
typedef T& reference; typedef T& reference;
typedef const T& const_reference; typedef const T& const_reference;

31
TinySTL/main.cpp
View File

@@ -1,9 +1,11 @@
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <cassert> #include <cassert>
#include <cctype>
#include <condition_variable> #include <condition_variable>
#include <iostream> #include <iostream>
#include <list> #include <list>
#include <new>
#include <mutex> #include <mutex>
#include <memory> #include <memory>
#include <string> #include <string>
@@ -29,24 +31,19 @@
using namespace std; using namespace std;
using namespace TinySTL::Profiler; using namespace TinySTL::Profiler;
bool comp_case_insensitive(char c1, char c2) {
int main(){ return (std::tolower(c1) == std::tolower(c2));
//TinySTL::deque<int> dq;
//int array[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20 };
int array[] = { 5, 3, 2, 7, 6, 8, 8 };
TinySTL::binary_search_tree<int> bst;
bst.insert(array, array + 7);
//std::vector<int> vec;
TinySTL::vector<int> vec;
ProfilerInstance::start();
int i = 0;
for (; i != 1000000; ++i){
vec.push_back(i);
} }
ProfilerInstance::finish(); int main(){
ProfilerInstance::dumpDuringTime(); TinySTL::deque<int> dq;
cout << ProfilerInstance::millisecond() << endl; for (int i = 0; i != 10; ++i)
dq.push_front(i);
/*for (auto x : dq)
cout << x << endl;*/
for (auto rit = dq.begin(); rit != dq.end(); ++rit)
cout << *rit << endl;
for (auto x : dq)
cout << x << endl;
system("pause"); system("pause");
return 0; return 0;
} }