Merge branch 'master' of git+ssh://git.labs.intellij.net/jet

stdlib/src/jet/BooleanIterable.java

@@ -0,0 +1,9 @@
+package jet;
+
+/**
+ * @author alex.tkachman
+ */
+public interface BooleanIterable extends Iterable<Boolean> {
+    @Override
+    BooleanIterator iterator();
+}

stdlib/src/jet/ByteIterable.java

@@ -0,0 +1,9 @@
+package jet;
+
+/**
+ * @author alex.tkachman
+ */
+public interface ByteIterable extends Iterable<Byte> {
+    @Override
+    ByteIterator iterator();
+}

stdlib/src/jet/CharIterable.java

@@ -0,0 +1,9 @@
+package jet;
+
+/**
+ * @author alex.tkachman
+ */
+public interface CharIterable extends Iterable<Character> {
+    @Override
+    CharIterator iterator();
+}

stdlib/src/jet/DoubleIterable.java

@@ -0,0 +1,9 @@
+package jet;
+
+/**
+ * @author alex.tkachman
+ */
+public interface DoubleIterable extends Iterable<Double> {
+    @Override
+    DoubleIterator iterator();
+}

stdlib/src/jet/FloatIterable.java

@@ -0,0 +1,9 @@
+package jet;
+
+/**
+ * @author alex.tkachman
+ */
+public interface FloatIterable extends Iterable<Float> {
+    @Override
+    FloatIterator iterator();
+}

stdlib/src/jet/IntIterable.java

@@ -0,0 +1,9 @@
+package jet;
+
+/**
+ * @author alex.tkachman
+ */
+public interface IntIterable extends Iterable<Integer> {
+    @Override
+    IntIterator iterator();
+}

stdlib/src/jet/IntRange.java

@@ -2,7 +2,7 @@ package jet;
 
 import jet.typeinfo.TypeInfo;
 
-public final class IntRange implements Range<Integer>, Iterable<Integer>, JetObject {
+public final class IntRange implements Range<Integer>, IntIterable, JetObject {
     private final static TypeInfo typeInfo = TypeInfo.getTypeInfo(IntRange.class, false);
 
     private final int start;
@@ -39,7 +39,7 @@ public final class IntRange implements Range<Integer>, Iterable<Integer>, JetObj
     }
 
     @Override
-    public Iterator<Integer> iterator() {
+    public IntIterator iterator() {
         return new MyIterator(start, count);
     }
 
@@ -66,7 +66,7 @@ public final class IntRange implements Range<Integer>, Iterable<Integer>, JetObj
         }
     }
 
-    private static class MyIterator implements Iterator<Integer> {
+    private static class MyIterator extends IntIterator {
         private final static TypeInfo typeInfo = TypeInfo.getTypeInfo(MyIterator.class, false);
 
         private int cur;
@@ -86,7 +86,7 @@ public final class IntRange implements Range<Integer>, Iterable<Integer>, JetObj
         }
 
         @Override
-        public Integer next() {
+        public int nextInt() {
             count--;
             if(reversed) {
                 return cur--;

stdlib/src/jet/LongIterable.java

@@ -0,0 +1,9 @@
+package jet;
+
+/**
+ * @author alex.tkachman
+ */
+public interface LongIterable extends Iterable<Long> {
+    @Override
+    LongIterator iterator();
+}

stdlib/src/jet/LongRange.java

@@ -2,7 +2,7 @@ package jet;
 
 import jet.typeinfo.TypeInfo;
 
-public final class LongRange implements Range<Long>, Iterable<Long>, JetObject {
+public final class LongRange implements Range<Long>, LongIterable, JetObject {
     private final static TypeInfo typeInfo = TypeInfo.getTypeInfo(IntRange.class, false);
 
     private final long start;
@@ -39,7 +39,7 @@ public final class LongRange implements Range<Long>, Iterable<Long>, JetObject {
     }
 
     @Override
-    public Iterator<Long> iterator() {
+    public LongIterator iterator() {
         return new MyIterator(start, count);
     }
 
@@ -66,7 +66,7 @@ public final class LongRange implements Range<Long>, Iterable<Long>, JetObject {
         }
     }
 
-    private static class MyIterator implements Iterator<Long> {
+    private static class MyIterator extends LongIterator {
         private final static TypeInfo typeInfo = TypeInfo.getTypeInfo(MyIterator.class, false);
 
         private long cur;
@@ -86,7 +86,7 @@ public final class LongRange implements Range<Long>, Iterable<Long>, JetObject {
         }
 
         @Override
-        public Long next() {
+        public long nextLong() {
             count--;
             if(reversed) {
                 return cur--;

stdlib/src/jet/ShortIterable.java

@@ -0,0 +1,9 @@
+package jet;
+
+/**
+ * @author alex.tkachman
+ */
+public interface ShortIterable extends Iterable<Short> {
+    @Override
+    ShortIterator iterator();
+}