diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/EmptyRange.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/EmptyRange.java index 0c1d8e86a74..67517bb264f 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/EmptyRange.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/EmptyRange.java @@ -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); } } diff --git a/runtime/src/jet/ByteRange.java b/runtime/src/jet/ByteRange.java index 881e62758f9..10d5c3005e3 100644 --- a/runtime/src/jet/ByteRange.java +++ b/runtime/src/jet/ByteRange.java @@ -23,7 +23,7 @@ public final class ByteRange implements Range, 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; diff --git a/runtime/src/jet/CharRange.java b/runtime/src/jet/CharRange.java index 1f41d6fe26b..ae044bb5add 100644 --- a/runtime/src/jet/CharRange.java +++ b/runtime/src/jet/CharRange.java @@ -23,7 +23,7 @@ public final class CharRange implements Range, 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; diff --git a/runtime/src/jet/DoubleRange.java b/runtime/src/jet/DoubleRange.java index 654edc7b989..01bb39f361f 100644 --- a/runtime/src/jet/DoubleRange.java +++ b/runtime/src/jet/DoubleRange.java @@ -23,7 +23,7 @@ public final class DoubleRange implements Range { 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; diff --git a/runtime/src/jet/FloatRange.java b/runtime/src/jet/FloatRange.java index 5197dc2c531..8962310deea 100644 --- a/runtime/src/jet/FloatRange.java +++ b/runtime/src/jet/FloatRange.java @@ -23,7 +23,7 @@ public final class FloatRange implements Range { 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; diff --git a/runtime/src/jet/IntRange.java b/runtime/src/jet/IntRange.java index 693e21a6077..f73d7a8331a 100644 --- a/runtime/src/jet/IntRange.java +++ b/runtime/src/jet/IntRange.java @@ -23,7 +23,7 @@ public final class IntRange implements Range, 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; diff --git a/runtime/src/jet/LongRange.java b/runtime/src/jet/LongRange.java index f091be8de81..114155d0123 100644 --- a/runtime/src/jet/LongRange.java +++ b/runtime/src/jet/LongRange.java @@ -23,7 +23,7 @@ public final class LongRange implements Range, 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; diff --git a/runtime/src/jet/ShortRange.java b/runtime/src/jet/ShortRange.java index 6cddf3bba53..d94206c0894 100644 --- a/runtime/src/jet/ShortRange.java +++ b/runtime/src/jet/ShortRange.java @@ -23,7 +23,7 @@ public final class ShortRange implements Range, 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; diff --git a/runtime/src/jet/runtime/Ranges.java b/runtime/src/jet/runtime/Ranges.java index 537e4aae7fb..93af2430afc 100644 --- a/runtime/src/jet/runtime/Ranges.java +++ b/runtime/src/jet/runtime/Ranges.java @@ -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" +