From 9cd67dfc5c4cf5a1f4f9c47dc036cc1c2dbb7f19 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Tue, 22 Jan 2013 21:14:10 +0400
Subject: [PATCH] Removed unnecessary iteratorStart property of ranges.

---
 compiler/frontend/src/jet/Ranges.jet  | 10 ----------
 compiler/testData/builtin-classes.txt |  5 -----
 runtime/src/jet/ByteRange.java        |  4 ----
 runtime/src/jet/CharRange.java        |  4 ----
 runtime/src/jet/IntRange.java         |  6 +-----
 runtime/src/jet/LongRange.java        |  4 ----
 runtime/src/jet/ShortRange.java       |  4 ----
 7 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/compiler/frontend/src/jet/Ranges.jet b/compiler/frontend/src/jet/Ranges.jet
index e4e3a01c092..b2e7207f701 100644
--- a/compiler/frontend/src/jet/Ranges.jet
+++ b/compiler/frontend/src/jet/Ranges.jet
@@ -11,8 +11,6 @@ public class IntRange(public val start : Int, public val size : Int) : Range<Int
 
     public val end : Int
 
-    public val iteratorStart : Int
-
     public fun step(step: Int) : IntIterator
 
     public val isReversed : Boolean
@@ -27,8 +25,6 @@ public class LongRange(public val start : Long, public val size : Long) : Range<
 
     public override fun contains (elem: Long) : Boolean
 
-    public val iteratorStart : Long
-
     public val end : Long
 
     public fun step(step: Long) : LongIterator
@@ -47,8 +43,6 @@ public class ByteRange(public val start : Byte, public val size : Int) : Range<B
 
     public val end : Byte
 
-    public val iteratorStart : Byte
-
     public fun step(step: Int) : ByteIterator
 
     public val isReversed : Boolean
@@ -63,8 +57,6 @@ public class ShortRange(public val start : Short, public val size : Int) : Range
 
     public override fun contains (elem: Short) : Boolean
 
-    public val iteratorStart : Short
-
     public val end : Short
 
     public fun step(step: Int) : ShortIterator
@@ -81,8 +73,6 @@ public class CharRange(public val start : Char, public val size : Int) : Range<C
 
     public override fun contains (elem: Char) : Boolean
 
-    public val iteratorStart : Char
-
     public val end : Char
 
     public fun step(step: Int) : CharIterator
diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt
index f739cf9b053..46dd9d13238 100644
--- a/compiler/testData/builtin-classes.txt
+++ b/compiler/testData/builtin-classes.txt
@@ -151,7 +151,6 @@ public final class ByteRange : jet.Range<jet.Byte>, jet.ByteIterable {
     public constructor ByteRange(/*0*/ start : jet.Byte, /*1*/ size : jet.Int)
     public final val end : jet.Byte
     public final val isReversed : jet.Boolean
-    public final val iteratorStart : jet.Byte
     public final val size : jet.Int
     public final val start : jet.Byte
     public open override /*1*/ fun contains(/*0*/ elem : jet.Byte) : jet.Boolean
@@ -244,7 +243,6 @@ public final class CharRange : jet.Range<jet.Char>, jet.CharIterable {
     public constructor CharRange(/*0*/ start : jet.Char, /*1*/ size : jet.Int)
     public final val end : jet.Char
     public final val isReversed : jet.Boolean
-    public final val iteratorStart : jet.Char
     public final val size : jet.Int
     public final val start : jet.Char
     public open override /*1*/ fun contains(/*0*/ elem : jet.Char) : jet.Boolean
@@ -818,7 +816,6 @@ public final class IntRange : jet.Range<jet.Int>, jet.IntIterable {
     public constructor IntRange(/*0*/ start : jet.Int, /*1*/ size : jet.Int)
     public final val end : jet.Int
     public final val isReversed : jet.Boolean
-    public final val iteratorStart : jet.Int
     public final val size : jet.Int
     public final val start : jet.Int
     public open override /*1*/ fun contains(/*0*/ elem : jet.Int) : jet.Boolean
@@ -964,7 +961,6 @@ public final class LongRange : jet.Range<jet.Long>, jet.LongIterable {
     public constructor LongRange(/*0*/ start : jet.Long, /*1*/ size : jet.Long)
     public final val end : jet.Long
     public final val isReversed : jet.Boolean
-    public final val iteratorStart : jet.Long
     public final val size : jet.Long
     public final val start : jet.Long
     public open override /*1*/ fun contains(/*0*/ elem : jet.Long) : jet.Boolean
@@ -1227,7 +1223,6 @@ public final class ShortRange : jet.Range<jet.Short>, jet.ShortIterable {
     public constructor ShortRange(/*0*/ start : jet.Short, /*1*/ size : jet.Int)
     public final val end : jet.Short
     public final val isReversed : jet.Boolean
-    public final val iteratorStart : jet.Short
     public final val size : jet.Int
     public final val start : jet.Short
     public open override /*1*/ fun contains(/*0*/ elem : jet.Short) : jet.Boolean
diff --git a/runtime/src/jet/ByteRange.java b/runtime/src/jet/ByteRange.java
index 97d68c543f9..8b059d73a1a 100644
--- a/runtime/src/jet/ByteRange.java
+++ b/runtime/src/jet/ByteRange.java
@@ -87,10 +87,6 @@ public final class ByteRange implements Range<Byte>, ByteIterable {
         return start;
     }
 
-    public byte getIteratorStart () {
-        return count == 0 ? 1 : start;
-    }
-
     public byte getEnd() {
         return (byte) (count < 0 ? start + count + 1: count == 0 ? 0 : start+count-1);
     }
diff --git a/runtime/src/jet/CharRange.java b/runtime/src/jet/CharRange.java
index 47359d9350a..24cf0929c8b 100644
--- a/runtime/src/jet/CharRange.java
+++ b/runtime/src/jet/CharRange.java
@@ -87,10 +87,6 @@ public final class CharRange implements Range<Character>, CharIterable {
         return start;
     }
 
-    public char getIteratorStart () {
-        return count == 0 ? 1 : start;
-    }
-
     public char getEnd() {
         return (char) (count < 0 ? start + count + 1: count == 0 ? 0 : start+count-1);
     }
diff --git a/runtime/src/jet/IntRange.java b/runtime/src/jet/IntRange.java
index abcc00fee18..4dd268c04bb 100644
--- a/runtime/src/jet/IntRange.java
+++ b/runtime/src/jet/IntRange.java
@@ -23,7 +23,7 @@ public final class IntRange implements Range<Integer>, IntIterable {
     private final int start;
     private final int count;
 
-    public static final IntRange EMPTY = new IntRange(0,0);
+    public static final IntRange EMPTY = new IntRange(0, 0);
 
     public IntRange(int startValue, int count) {
         this.start = startValue;
@@ -90,10 +90,6 @@ public final class IntRange implements Range<Integer>, IntIterable {
         return count < 0;
     }
 
-    public int getIteratorStart () {
-        return count == 0 ? 1 : start;
-    }
-    
     public int getStart() {
         return start;
     }
diff --git a/runtime/src/jet/LongRange.java b/runtime/src/jet/LongRange.java
index 837b79bdf0f..5ac02919f4e 100644
--- a/runtime/src/jet/LongRange.java
+++ b/runtime/src/jet/LongRange.java
@@ -95,10 +95,6 @@ public final class LongRange implements Range<Long>, LongIterable {
         return start;
     }
 
-    public long getIteratorStart () {
-        return count == 0 ? 1 : start;
-    }
-
     public long getEnd() {
         return count < 0 ? start + count + 1: count == 0 ? 0 : start+count-1;
     }
diff --git a/runtime/src/jet/ShortRange.java b/runtime/src/jet/ShortRange.java
index 61635a871a6..cc251f56710 100644
--- a/runtime/src/jet/ShortRange.java
+++ b/runtime/src/jet/ShortRange.java
@@ -94,10 +94,6 @@ public final class ShortRange implements Range<Short>, ShortIterable {
         return start;
     }
 
-    public int getIteratorStart () {
-        return count == 0 ? 1 : start;
-    }
-
     public short getEnd() {
         return (short) (count < 0 ? start + count + 1: count == 0 ? 0 : start+count-1);
     }