From 6877722f812983eba26ad4cc64bf5aececb3b467 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 29 Jan 2013 23:14:37 +0400 Subject: [PATCH] Extracted progressions to separate source file. --- compiler/frontend/src/jet/Progressions.jet | 70 +++++++++++++++++++ compiler/frontend/src/jet/Ranges.jet | 70 ------------------- .../jet/lang/types/lang/KotlinBuiltIns.java | 1 + 3 files changed, 71 insertions(+), 70 deletions(-) create mode 100644 compiler/frontend/src/jet/Progressions.jet diff --git a/compiler/frontend/src/jet/Progressions.jet b/compiler/frontend/src/jet/Progressions.jet new file mode 100644 index 00000000000..7feb39eec41 --- /dev/null +++ b/compiler/frontend/src/jet/Progressions.jet @@ -0,0 +1,70 @@ +package jet + +public trait Progression: Iterable { + public val start: N + public val end: N + public val increment: Number +} + +public class IntProgression( + public override val start: Int, + public override val end: Int, + public override val increment: Int +): Progression { + + override fun iterator(): IntIterator +} + +public class LongProgression( + public override val start: Long, + public override val end: Long, + public override val increment: Long +): Progression { + + override fun iterator(): LongIterator +} + +public class ByteProgression( + public override val start: Byte, + public override val end: Byte, + public override val increment: Int +): Progression { + + override fun iterator(): ByteIterator +} + +public class ShortProgression( + public override val start: Short, + public override val end: Short, + public override val increment: Int +): Progression { + + override fun iterator(): ShortIterator +} + +public class CharProgression( + public override val start: Char, + public override val end: Char, + public override val increment: Int +): Progression { + + override fun iterator(): CharIterator +} + +public class FloatProgression( + public override val start: Float, + public override val end: Float, + public override val increment: Float +): Progression { + + override fun iterator(): FloatIterator +} + +public class DoubleProgression( + public override val start: Double, + public override val end: Double, + public override val increment: Double +): Progression { + + override fun iterator(): DoubleIterator +} diff --git a/compiler/frontend/src/jet/Ranges.jet b/compiler/frontend/src/jet/Ranges.jet index bdb11b37253..e9fe4b0c6a5 100644 --- a/compiler/frontend/src/jet/Ranges.jet +++ b/compiler/frontend/src/jet/Ranges.jet @@ -117,73 +117,3 @@ public class DoubleRange( public val EMPTY: DoubleRange } } - - -public trait Progression: Iterable { - public val start: N - public val end: N - public val increment: Number -} - -public class IntProgression( - public override val start: Int, - public override val end: Int, - public override val increment: Int -): Progression { - - override fun iterator(): IntIterator -} - -public class LongProgression( - public override val start: Long, - public override val end: Long, - public override val increment: Long -): Progression { - - override fun iterator(): LongIterator -} - -public class ByteProgression( - public override val start: Byte, - public override val end: Byte, - public override val increment: Int -): Progression { - - override fun iterator(): ByteIterator -} - -public class ShortProgression( - public override val start: Short, - public override val end: Short, - public override val increment: Int -): Progression { - - override fun iterator(): ShortIterator -} - -public class CharProgression( - public override val start: Char, - public override val end: Char, - public override val increment: Int -): Progression { - - override fun iterator(): CharIterator -} - -public class FloatProgression( - public override val start: Float, - public override val end: Float, - public override val increment: Float -): Progression { - - override fun iterator(): FloatIterator -} - -public class DoubleProgression( - public override val start: Double, - public override val end: Double, - public override val increment: Double -): Progression { - - override fun iterator(): DoubleIterator -} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java index 841d41c599e..0ba6278510f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java @@ -69,6 +69,7 @@ public class KotlinBuiltIns { BUILT_INS_DIR + "/Library.jet", BUILT_INS_DIR + "/Numbers.jet", BUILT_INS_DIR + "/Ranges.jet", + BUILT_INS_DIR + "/Progressions.jet", BUILT_INS_DIR + "/Iterators.jet", BUILT_INS_DIR + "/Arrays.jet", BUILT_INS_DIR + "/Enum.jet",