azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

getting rid of JetObject.getOuterObject

Browse Source
This commit is contained in:
Alex Tkachman
2012-02-21 15:13:16 +02:00
parent 25c1ece063
commit 5e7de3f5ab
20 changed files with 13 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stdlib/src/jet/ByteRange.java
+1 -11
View File
@@ -16,7 +16,7 @@
package jet;
public final class ByteRange implements Range<Byte>, ByteIterable, JetObject {
public final class ByteRange implements Range<Byte>, ByteIterable {
private final byte start;
private final int count;
@@ -72,11 +72,6 @@ public final class ByteRange implements Range<Byte>, ByteIterable, JetObject {
return new MyIterator(start, count, 1);
}
@Override
public JetObject getOuterObject() {
return null;
}
public static ByteRange count(int length) {
return new ByteRange((byte) 0, length);
}
@@ -119,10 +114,5 @@ public final class ByteRange implements Range<Byte>, ByteIterable, JetObject {
return (byte) (cur - step);
}
}
@Override
public JetObject getOuterObject() {
return null;
}
}
}
stdlib/src/jet/CharRange.java
+1 -11
View File
@@ -16,7 +16,7 @@
package jet;
public final class CharRange implements Range<Character>, CharIterable, JetObject {
public final class CharRange implements Range<Character>, CharIterable {
private final char start;
private final int count;
@@ -72,11 +72,6 @@ public final class CharRange implements Range<Character>, CharIterable, JetObjec
return new MyIterator(start, count, 1);
}
@Override
public JetObject getOuterObject() {
return null;
}
public static CharRange count(int length) {
return new CharRange((char) 0, length);
}
@@ -119,10 +114,5 @@ public final class CharRange implements Range<Character>, CharIterable, JetObjec
return (char) (cur - step);
}
}
@Override
public JetObject getOuterObject() {
return null;
}
}
}
stdlib/src/jet/DefaultJetObject.java
+1 -6
View File
@@ -19,12 +19,7 @@ package jet;
/**
* @author alex.tkachman
*/
public class DefaultJetObject implements JetObject {
public class DefaultJetObject {
protected DefaultJetObject() {
}
@Override
public JetObject getOuterObject() {
return null;
}
}
stdlib/src/jet/DoubleRange.java
+1 -11
View File
@@ -16,7 +16,7 @@
package jet;
public final class DoubleRange implements Range<Double>, JetObject {
public final class DoubleRange implements Range<Double> {
private final double start;
private final double size;
@@ -61,11 +61,6 @@ public final class DoubleRange implements Range<Double>, JetObject {
return new DoubleRange(getEnd(), -size);
}
@Override
public JetObject getOuterObject() {
return null;
}
public static DoubleRange count(int length) {
return new DoubleRange(0, length);
}
@@ -110,10 +105,5 @@ public final class DoubleRange implements Range<Double>, JetObject {
return cur - step;
}
}
@Override
public JetObject getOuterObject() {
return null;
}
}
}
stdlib/src/jet/FloatRange.java
+1 -12
View File
@@ -16,7 +16,7 @@
package jet;
public final class FloatRange implements Range<Float>, JetObject {
public final class FloatRange implements Range<Float> {
private final float start;
private final float size;
@@ -61,12 +61,6 @@ public final class FloatRange implements Range<Float>, JetObject {
return new FloatRange(getEnd(), -size);
}
@Override
public JetObject getOuterObject() {
return null;
}
public static FloatRange count(int length) {
return new FloatRange(0, length);
}
@@ -111,10 +105,5 @@ public final class FloatRange implements Range<Float>, JetObject {
return cur - step;
}
}
@Override
public JetObject getOuterObject() {
return null;
}
}
}
stdlib/src/jet/IntRange.java
+1 -11
View File
@@ -16,7 +16,7 @@
package jet;
public final class IntRange implements Range<Integer>, IntIterable, JetObject {
public final class IntRange implements Range<Integer>, IntIterable {
private final int start;
private final int count;
@@ -72,11 +72,6 @@ public final class IntRange implements Range<Integer>, IntIterable, JetObject {
return new MyIterator(start, count, 1);
}
@Override
public JetObject getOuterObject() {
return null;
}
public static IntRange count(int length) {
return new IntRange(0, length);
}
@@ -119,10 +114,5 @@ public final class IntRange implements Range<Integer>, IntIterable, JetObject {
return cur - step;
}
}
@Override
public JetObject getOuterObject() {
return null;
}
}
}
stdlib/src/jet/Iterable.java
+1 -1
View File
@@ -16,6 +16,6 @@
package jet;
public interface Iterable<T> extends JetObject {
public interface Iterable<T> {
Iterator<T> iterator ();
}
stdlib/src/jet/Iterator.java
+1 -1
View File
@@ -18,7 +18,7 @@ package jet;
import jet.runtime.typeinfo.JetMethod;
public interface Iterator<T> extends JetObject {
public interface Iterator<T> {
@JetMethod(kind = JetMethod.KIND_PROPERTY)
boolean getHasNext();
T next ();
stdlib/src/jet/JetObject.java
+1 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2012 JetBrains s.r.o.
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,5 +21,4 @@ package jet;
* @author alex.tkachman
*/
public interface JetObject {
JetObject getOuterObject();
}
stdlib/src/jet/LongRange.java
+1 -11
View File
@@ -16,7 +16,7 @@
package jet;
public final class LongRange implements Range<Long>, LongIterable, JetObject {
public final class LongRange implements Range<Long>, LongIterable {
private final long start;
private final long count;
@@ -72,11 +72,6 @@ public final class LongRange implements Range<Long>, LongIterable, JetObject {
return new MyIterator(start, count, 1);
}
@Override
public JetObject getOuterObject() {
return null;
}
public static LongRange count(int length) {
return new LongRange(0, length);
}
@@ -119,10 +114,5 @@ public final class LongRange implements Range<Long>, LongIterable, JetObject {
return (cur - step);
}
}
@Override
public JetObject getOuterObject() {
return null;
}
}
}
stdlib/src/jet/ShortRange.java
+1 -11
View File
@@ -16,7 +16,7 @@
package jet;
public final class ShortRange implements Range<Short>, ShortIterable, JetObject {
public final class ShortRange implements Range<Short>, ShortIterable {
private final short start;
private final int count;
@@ -72,11 +72,6 @@ public final class ShortRange implements Range<Short>, ShortIterable, JetObject
return new MyIterator(start, count, 1);
}
@Override
public JetObject getOuterObject() {
return null;
}
public static ShortRange count(int length) {
return new ShortRange((byte) 0, length);
}
@@ -119,10 +114,5 @@ public final class ShortRange implements Range<Short>, ShortIterable, JetObject
return (short) (cur - step);
}
}
@Override
public JetObject getOuterObject() {
return null;
}
}
}
stdlib/src/jet/Tuple0.java
+1 -6
View File
@@ -19,7 +19,7 @@ package jet;
/**
* @author alex.tkachman
*/
public class Tuple0 implements JetObject {
public class Tuple0 {
public static final Tuple0 INSTANCE = new Tuple0();
private Tuple0() {
@@ -39,9 +39,4 @@ public class Tuple0 implements JetObject {
public int hashCode() {
return 239;
}
@Override
public JetObject getOuterObject() {
return null;
}
}
stdlib/src/jet/runtime/ArrayIterator.java
+1 -46
View File
@@ -21,7 +21,7 @@ import jet.*;
/**
* @author alex.tkachman
*/
public abstract class ArrayIterator<T> implements Iterator<T>, JetObject {
public abstract class ArrayIterator<T> implements Iterator<T> {
private final int size;
protected int index;
@@ -46,11 +46,6 @@ public abstract class ArrayIterator<T> implements Iterator<T>, JetObject {
public T next() {
return array[index++];
}
@Override
public JetObject getOuterObject() {
return null;
}
}
public static <T> Iterator<T> iterator(T[] array) {
@@ -74,11 +69,6 @@ public abstract class ArrayIterator<T> implements Iterator<T>, JetObject {
public byte nextByte() {
return array[index++];
}
@Override
public JetObject getOuterObject() {
return null;
}
}
public static ByteIterator iterator(byte[] array) {
@@ -103,11 +93,6 @@ public abstract class ArrayIterator<T> implements Iterator<T>, JetObject {
public short nextShort() {
return array[index++];
}
@Override
public JetObject getOuterObject() {
return null;
}
}
public static ShortIterator iterator(short[] array) {
@@ -132,11 +117,6 @@ public abstract class ArrayIterator<T> implements Iterator<T>, JetObject {
public int nextInt() {
return array[index++];
}
@Override
public JetObject getOuterObject() {
return null;
}
}
public static IntIterator iterator(int[] array) {
@@ -161,11 +141,6 @@ public abstract class ArrayIterator<T> implements Iterator<T>, JetObject {
public long nextLong() {
return array[index++];
}
@Override
public JetObject getOuterObject() {
return null;
}
}
public static LongIterator iterator(long[] array) {
@@ -190,11 +165,6 @@ public abstract class ArrayIterator<T> implements Iterator<T>, JetObject {
public float nextFloat() {
return array[index++];
}
@Override
public JetObject getOuterObject() {
return null;
}
}
public static FloatIterator iterator(float[] array) {
@@ -219,11 +189,6 @@ public abstract class ArrayIterator<T> implements Iterator<T>, JetObject {
public double nextDouble() {
return array[index++];
}
@Override
public JetObject getOuterObject() {
return null;
}
}
public static DoubleIterator iterator(double[] array) {
@@ -248,11 +213,6 @@ public abstract class ArrayIterator<T> implements Iterator<T>, JetObject {
public char nextChar() {
return array[index++];
}
@Override
public JetObject getOuterObject() {
return null;
}
}
public static CharIterator iterator(char[] array) {
@@ -277,11 +237,6 @@ public abstract class ArrayIterator<T> implements Iterator<T>, JetObject {
public boolean nextBoolean() {
return array[index++];
}
@Override
public JetObject getOuterObject() {
return null;
}
}
public static BooleanIterator iterator(boolean[] array) {