Subclassed Float/DoubleRange from iterable (for uniformity).
This commit is contained in:
@@ -56,7 +56,9 @@ public class CharRange(public override val start : Char, public override val end
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class FloatRange(public override val start : Float, public override val end : Float) : Range<Float> {
|
public class FloatRange(public override val start : Float, public override val end : Float) : Range<Float>, FloatIterable {
|
||||||
|
public override fun iterator () : FloatIterator
|
||||||
|
|
||||||
public override fun contains (elem: Float) : Boolean
|
public override fun contains (elem: Float) : Boolean
|
||||||
|
|
||||||
public class object {
|
public class object {
|
||||||
@@ -64,7 +66,9 @@ public class FloatRange(public override val start : Float, public override val e
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class DoubleRange(public override val start : Double, public override val end : Double) : Range<Double> {
|
public class DoubleRange(public override val start : Double, public override val end : Double) : Range<Double>, DoubleIterable {
|
||||||
|
public override fun iterator () : DoubleIterator
|
||||||
|
|
||||||
public override fun contains (elem: Double) : Boolean
|
public override fun contains (elem: Double) : Boolean
|
||||||
|
|
||||||
public class object {
|
public class object {
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ package jet;
|
|||||||
import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
|
import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
|
||||||
|
|
||||||
@AssertInvisibleInResolver
|
@AssertInvisibleInResolver
|
||||||
public final class DoubleRange implements Range<Double> {
|
public final class DoubleRange implements Range<Double>, DoubleIterable {
|
||||||
private final double start;
|
private final double start;
|
||||||
private final double end;
|
private final double end;
|
||||||
|
|
||||||
@@ -74,4 +74,9 @@ public final class DoubleRange implements Range<Double> {
|
|||||||
public Double getEnd() {
|
public Double getEnd() {
|
||||||
return end;
|
return end;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public DoubleIterator iterator() {
|
||||||
|
return new DoubleSequenceIterator(getStart(), getEnd(), 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ package jet;
|
|||||||
import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
|
import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
|
||||||
|
|
||||||
@AssertInvisibleInResolver
|
@AssertInvisibleInResolver
|
||||||
public final class FloatRange implements Range<Float> {
|
public final class FloatRange implements Range<Float>, FloatIterable {
|
||||||
private final float start;
|
private final float start;
|
||||||
private final float end;
|
private final float end;
|
||||||
|
|
||||||
@@ -70,4 +70,9 @@ public final class FloatRange implements Range<Float> {
|
|||||||
public Float getEnd() {
|
public Float getEnd() {
|
||||||
return end;
|
return end;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public FloatIterator iterator() {
|
||||||
|
return new FloatSequenceIterator(getStart(), getEnd(), 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user