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

Renamed 'empty' field in range classes to 'EMPTY'.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-08-09 13:35:25 +04:00
parent 0124c7bb5a
commit 543ec16f4d
9 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/EmptyRange.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class EmptyRange implements IntrinsicMethod {
StackValue receiver,
@NotNull GenerationState state) {
JvmClassName name = JvmClassName.byFqNameWithoutInnerClasses(elementType.getRangeClassName().getFqName());
v.getstatic(name.toString(), "empty", "L" + name + ";");
v.getstatic(name.toString(), "EMPTY", "L" + name + ";");
return StackValue.onStack(expectedType);
}
}
runtime/src/jet/ByteRange.java
+1 -1
View File
@@ -23,7 +23,7 @@ public final class ByteRange implements Range<Byte>, ByteIterable {
private final byte start;
private final int count;
public static final ByteRange empty = new ByteRange((byte) 0,0);
public static final ByteRange EMPTY = new ByteRange((byte) 0,0);
public ByteRange(byte startValue, int count) {
this.start = startValue;
runtime/src/jet/CharRange.java
+1 -1
View File
@@ -23,7 +23,7 @@ public final class CharRange implements Range<Character>, CharIterable {
private final char start;
private final int count;
public static final CharRange empty = new CharRange((char) 0,0);
public static final CharRange EMPTY = new CharRange((char) 0,0);
public CharRange(char startValue, int count) {
this.start = startValue;
runtime/src/jet/DoubleRange.java
+1 -1
View File
@@ -23,7 +23,7 @@ public final class DoubleRange implements Range<Double> {
private final double start;
private final double size;
public static final DoubleRange empty = new DoubleRange(0, 0);
public static final DoubleRange EMPTY = new DoubleRange(0, 0);
public DoubleRange(double startValue, double size) {
this.start = startValue;
runtime/src/jet/FloatRange.java
+1 -1
View File
@@ -23,7 +23,7 @@ public final class FloatRange implements Range<Float> {
private final float start;
private final float size;
public static final FloatRange empty = new FloatRange(0, 0);
public static final FloatRange EMPTY = new FloatRange(0, 0);
public FloatRange(float startValue, float size) {
this.start = startValue;
runtime/src/jet/IntRange.java
+1 -1
View File
@@ -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;
runtime/src/jet/LongRange.java
+1 -1
View File
@@ -23,7 +23,7 @@ public final class LongRange implements Range<Long>, LongIterable {
private final long start;
private final long count;
public static final LongRange empty = new LongRange(0L,0L);
public static final LongRange EMPTY = new LongRange(0L,0L);
public LongRange(long startValue, long count) {
this.start = startValue;
runtime/src/jet/ShortRange.java
+1 -1
View File
@@ -23,7 +23,7 @@ public final class ShortRange implements Range<Short>, ShortIterable {
private final short start;
private final int count;
public static final ShortRange empty = new ShortRange((short) 0,0);
public static final ShortRange EMPTY = new ShortRange((short) 0,0);
public ShortRange(short startValue, int count) {
this.start = startValue;
runtime/src/jet/runtime/Ranges.java
+26 -26
View File
@@ -30,7 +30,7 @@ public class Ranges {
public static ByteRange rangeTo(byte from, byte to) {
if (from > to) {
return ByteRange.empty;
return ByteRange.EMPTY;
}
else {
return new ByteRange(from, to - from + 1);
@@ -39,7 +39,7 @@ public class Ranges {
public static ShortRange rangeTo(byte from, short to) {
if (from > to) {
return ShortRange.empty;
return ShortRange.EMPTY;
}
else {
return new ShortRange(from, to - from + 1);
@@ -48,7 +48,7 @@ public class Ranges {
public static IntRange rangeTo(byte from, int to) {
if (from > to) {
return IntRange.empty;
return IntRange.EMPTY;
}
else {
return new IntRange(from, to - from + 1);
@@ -57,7 +57,7 @@ public class Ranges {
public static LongRange rangeTo(byte from, long to) {
if (from > to) {
return LongRange.empty;
return LongRange.EMPTY;
}
else {
return new LongRange(from, to - from + 1);
@@ -74,7 +74,7 @@ public class Ranges {
public static CharRange rangeTo(byte from, char to) {
if (from > to) {
return CharRange.empty;
return CharRange.EMPTY;
}
else {
return new CharRange((char) from, to - from + 1);
@@ -83,7 +83,7 @@ public class Ranges {
public static ShortRange rangeTo(short from, byte to) {
if (from > to) {
return ShortRange.empty;
return ShortRange.EMPTY;
}
else {
return new ShortRange(from, to - from + 1);
@@ -92,7 +92,7 @@ public class Ranges {
public static ShortRange rangeTo(short from, short to) {
if (from > to) {
return ShortRange.empty;
return ShortRange.EMPTY;
}
else {
return new ShortRange(from, to - from + 1);
@@ -101,7 +101,7 @@ public class Ranges {
public static IntRange rangeTo(short from, int to) {
if (from > to) {
return IntRange.empty;
return IntRange.EMPTY;
}
else {
return new IntRange(from, to - from + 1);
@@ -110,7 +110,7 @@ public class Ranges {
public static LongRange rangeTo(short from, long to) {
if (from > to) {
return LongRange.empty;
return LongRange.EMPTY;
}
else {
return new LongRange(from, to - from + 1);
@@ -127,7 +127,7 @@ public class Ranges {
public static ShortRange rangeTo(short from, char to) {
if (from > to) {
return ShortRange.empty;
return ShortRange.EMPTY;
}
else {
return new ShortRange(from, to - from + 1);
@@ -136,7 +136,7 @@ public class Ranges {
public static IntRange rangeTo(int from, byte to) {
if (from > to) {
return IntRange.empty;
return IntRange.EMPTY;
}
else {
return new IntRange(from, to - from + 1);
@@ -145,7 +145,7 @@ public class Ranges {
public static IntRange rangeTo(int from, short to) {
if (from > to) {
return IntRange.empty;
return IntRange.EMPTY;
}
else {
return new IntRange(from, to - from + 1);
@@ -154,7 +154,7 @@ public class Ranges {
public static IntRange rangeTo(int from, int to) {
if (from > to) {
return IntRange.empty;
return IntRange.EMPTY;
}
else {
return new IntRange(from, to - from + 1);
@@ -163,7 +163,7 @@ public class Ranges {
public static LongRange rangeTo(int from, long to) {
if (from > to) {
return LongRange.empty;
return LongRange.EMPTY;
}
else {
return new LongRange(from, to - from + 1);
@@ -180,7 +180,7 @@ public class Ranges {
public static IntRange rangeTo(int from, char to) {
if (from > to) {
return IntRange.empty;
return IntRange.EMPTY;
}
else {
return new IntRange(from, to - from + 1);
@@ -189,7 +189,7 @@ public class Ranges {
public static LongRange rangeTo(long from, byte to) {
if (from > to) {
return LongRange.empty;
return LongRange.EMPTY;
}
else {
return new LongRange(from, to - from + 1);
@@ -198,7 +198,7 @@ public class Ranges {
public static LongRange rangeTo(long from, short to) {
if (from > to) {
return LongRange.empty;
return LongRange.EMPTY;
}
else {
return new LongRange(from, to - from + 1);
@@ -207,7 +207,7 @@ public class Ranges {
public static LongRange rangeTo(long from, int to) {
if (from > to) {
return LongRange.empty;
return LongRange.EMPTY;
}
else {
return new LongRange(from, to - from + 1);
@@ -216,7 +216,7 @@ public class Ranges {
public static LongRange rangeTo(long from, long to) {
if (from > to) {
return LongRange.empty;
return LongRange.EMPTY;
}
else {
return new LongRange(from, to - from + 1);
@@ -233,7 +233,7 @@ public class Ranges {
public static LongRange rangeTo(long from, char to) {
if (from > to) {
return LongRange.empty;
return LongRange.EMPTY;
}
else {
return new LongRange(from, to - from + 1);
@@ -298,7 +298,7 @@ public class Ranges {
public static CharRange rangeTo(char from, byte to) {
if (from > to) {
return CharRange.empty;
return CharRange.EMPTY;
}
else {
return new CharRange(from, to - from + 1);
@@ -307,7 +307,7 @@ public class Ranges {
public static ShortRange rangeTo(char from, short to) {
if (from > to) {
return ShortRange.empty;
return ShortRange.EMPTY;
}
else {
return new ShortRange((short) from, to - from + 1);
@@ -316,7 +316,7 @@ public class Ranges {
public static IntRange rangeTo(char from, int to) {
if (from > to) {
return IntRange.empty;
return IntRange.EMPTY;
}
else {
return new IntRange(from, to - from + 1);
@@ -325,7 +325,7 @@ public class Ranges {
public static LongRange rangeTo(char from, long to) {
if (from > to) {
return LongRange.empty;
return LongRange.EMPTY;
}
else {
return new LongRange(from, to - from + 1);
@@ -342,7 +342,7 @@ public class Ranges {
public static CharRange rangeTo(char from, char to) {
if (from > to) {
return CharRange.empty;
return CharRange.EMPTY;
}
else {
return new CharRange(from, to - from + 1);
@@ -384,7 +384,7 @@ public class Ranges {
else {
System.out.println("\npublic static " + resType + " rangeTo(" + t1 + " from, " + t2 + " to) {" +
"\n if(from > to) {\n" +
" return " + resType + ".empty;\n" +
" return " + resType + ".EMPTY;\n" +
" }\n" +
" else {\n" +
" return new " + resType + "(from, to-from+1);\n" +