Skip to content

Make TSeq iterator standard-compliant #471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dpiparo merged 1 commit into from
Mar 29, 2017
Merged

Make TSeq iterator standard-compliant #471

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 31 additions & 18 deletions core/cont/inc/ROOT/TSeq.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,33 +92,37 @@ namespace ROOT {
T operator*() const {
return fCounter;
}
iterator &operator++() {
fCounter += fStep;
return *this;
};
iterator operator++(int) {
iterator tmp(*this);
operator++();
return tmp;
}
// equality
bool operator==(const iterator &other) const {
return fCounter == other.fCounter;
}
// inequality
bool operator!=(const iterator &other) const {
return fCounter != other.fCounter;
}
T operator+(int v) const {
return fCounter + v;
// sum with integer
iterator operator+(difference_type v) const {
return iterator(fCounter + v * fStep, fStep);
}
T operator-(int v) const {
return fCounter - v;
// difference with integer
iterator operator-(difference_type v) const {
return iterator(fCounter - v * fStep, fStep);
}
T operator+(const iterator &other) const {
return fCounter + other.fCounter;
// distance
difference_type operator-(const iterator &other) const {
return (fCounter - other.fCounter) / fStep;
}
// increments
iterator &operator++() {
fCounter += fStep;
return *this;
}
T operator-(const iterator &other) const {
return fCounter - other.fCounter;
iterator operator++(int) {
iterator tmp(*this);
operator++();
return tmp;
}
// decrements
iterator &operator--() {
fCounter -= fStep;
return *this;
Expand All @@ -128,14 +132,23 @@ namespace ROOT {
operator--();
return tmp;
}
// compound assignments
iterator &operator+=(const difference_type& v) {
*this = *this + v;
return *this;
}
iterator &operator-=(const difference_type& v) {
*this = *this - v;
return *this;
}
};

iterator begin() const {
return iterator(fBegin, fStep);
}
iterator end() const {
auto isStepMultiple = (fEnd - fBegin) % fStep == 0;
auto theEnd = isStepMultiple ? fEnd : fStep * ((T)((fEnd - fBegin) / fStep) + 1) + fBegin;
auto theEnd = isStepMultiple ? fEnd : fStep * (((fEnd - fBegin) / fStep) + 1) + fBegin;
return iterator(theEnd, fStep);
}

Expand Down