Subclassed Float/DoubleRange from iterable (for uniformity).

This commit is contained in:
Evgeny Gerashchenko
2013-01-24 01:17:29 +04:00
parent 000fc55035
commit 79d3440c92
3 changed files with 18 additions and 4 deletions
+6 -2
View File
@@ -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 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 class object {
+6 -1
View File
@@ -19,7 +19,7 @@ package jet;
import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
@AssertInvisibleInResolver
public final class DoubleRange implements Range<Double> {
public final class DoubleRange implements Range<Double>, DoubleIterable {
private final double start;
private final double end;
@@ -74,4 +74,9 @@ public final class DoubleRange implements Range<Double> {
public Double getEnd() {
return end;
}
@Override
public DoubleIterator iterator() {
return new DoubleSequenceIterator(getStart(), getEnd(), 1);
}
}
+6 -1
View File
@@ -19,7 +19,7 @@ package jet;
import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
@AssertInvisibleInResolver
public final class FloatRange implements Range<Float> {
public final class FloatRange implements Range<Float>, FloatIterable {
private final float start;
private final float end;
@@ -70,4 +70,9 @@ public final class FloatRange implements Range<Float> {
public Float getEnd() {
return end;
}
@Override
public FloatIterator iterator() {
return new FloatSequenceIterator(getStart(), getEnd(), 1);
}
}