33bcee7d6d
In case of start==end hasNext was always false, which resulted in iterators over one-element progressions not iterating that element
52 lines
1.4 KiB
Java
52 lines
1.4 KiB
Java
/*
|
|
* Copyright 2010-2013 JetBrains s.r.o.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package jet;
|
|
|
|
import jet.runtime.ProgressionUtil;
|
|
|
|
class IntProgressionIterator extends IntIterator {
|
|
private int next;
|
|
private final int increment;
|
|
private final int finalElement;
|
|
private boolean hasNext;
|
|
|
|
public IntProgressionIterator(int start, int end, int increment) {
|
|
this.next = start;
|
|
this.increment = increment;
|
|
|
|
this.finalElement = ProgressionUtil.getProgressionFinalElement(start, end, increment);
|
|
this.hasNext = increment > 0 ? start <= end : start >= end;
|
|
}
|
|
|
|
@Override
|
|
public boolean hasNext() {
|
|
return hasNext;
|
|
}
|
|
|
|
@Override
|
|
public int nextInt() {
|
|
int value = next;
|
|
if (value == finalElement) {
|
|
hasNext = false;
|
|
}
|
|
else {
|
|
next += increment;
|
|
}
|
|
return value;
|
|
}
|
|
}
|