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

KT-2416 fix contains for ranges with primitive parameters

Browse Source
This commit is contained in:
Alex Tkachman
2012-08-03 09:15:53 +03:00
parent 8ba9e9f51b
commit 0e4a8660fd
9 changed files with 79 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+12 -3
View File
@@ -1881,9 +1881,18 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
StackValue leftValue = gen(expr);
FunctionDescriptor op = (FunctionDescriptor) bindingContext.get(BindingContext.REFERENCE_TARGET, expression.getOperationReference());
assert op != null;
leftValue.put(asmType(op.getValueParameters().get(0).getType()), v);
genToJVMStack(expression.getRight());
v.swap();
Type type = asmType(op.getValueParameters().get(0).getType());
if(type.getSize() == 1) {
leftValue.put(type, v);
genToJVMStack(expression.getRight());
v.swap();
}
else {
leftValue.put(type, v);
genToJVMStack(expression.getRight());
v.dupX2();
v.pop();
}
invokeFunctionNoParams(op, Type.BOOLEAN_TYPE, v);
}
return StackValue.onStack(Type.BOOLEAN_TYPE);
compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
+14 -14
View File
@@ -71,6 +71,20 @@ public class JetTypeMapper {
public static final Type ARRAY_GENERIC_TYPE = Type.getType(Object[].class);
public static final Type TUPLE0_TYPE = Type.getObjectType("jet/Tuple0");
public static final Type TYPE_ITERATOR = Type.getObjectType("jet/Iterator");
public static final Type TYPE_INT_RANGE = Type.getObjectType("jet/IntRange");
public static final Type TYPE_SHARED_VAR = Type.getObjectType("jet/runtime/SharedVar$Object");
public static final Type TYPE_SHARED_INT = Type.getObjectType("jet/runtime/SharedVar$Int");
public static final Type TYPE_SHARED_DOUBLE = Type.getObjectType("jet/runtime/SharedVar$Double");
public static final Type TYPE_SHARED_FLOAT = Type.getObjectType("jet/runtime/SharedVar$Float");
public static final Type TYPE_SHARED_BYTE = Type.getObjectType("jet/runtime/SharedVar$Byte");
public static final Type TYPE_SHARED_SHORT = Type.getObjectType("jet/runtime/SharedVar$Short");
public static final Type TYPE_SHARED_CHAR = Type.getObjectType("jet/runtime/SharedVar$Char");
public static final Type TYPE_SHARED_LONG = Type.getObjectType("jet/runtime/SharedVar$Long");
public static final Type TYPE_SHARED_BOOLEAN = Type.getObjectType("jet/runtime/SharedVar$Boolean");
public static final Type TYPE_FUNCTION0 = Type.getObjectType("jet/Function0");
public static final Type TYPE_FUNCTION1 = Type.getObjectType("jet/Function1");
private JetStandardLibrary standardLibrary1;
public BindingContext bindingContext;
private ClosureAnnotator closureAnnotator;
@@ -148,20 +162,6 @@ public class JetTypeMapper {
private final HashMap<KnownTypeKey, Type> knowTypes = Maps.newHashMap();
public static final Type TYPE_ITERATOR = Type.getObjectType("jet/Iterator");
public static final Type TYPE_INT_RANGE = Type.getObjectType("jet/IntRange");
public static final Type TYPE_SHARED_VAR = Type.getObjectType("jet/runtime/SharedVar$Object");
public static final Type TYPE_SHARED_INT = Type.getObjectType("jet/runtime/SharedVar$Int");
public static final Type TYPE_SHARED_DOUBLE = Type.getObjectType("jet/runtime/SharedVar$Double");
public static final Type TYPE_SHARED_FLOAT = Type.getObjectType("jet/runtime/SharedVar$Float");
public static final Type TYPE_SHARED_BYTE = Type.getObjectType("jet/runtime/SharedVar$Byte");
public static final Type TYPE_SHARED_SHORT = Type.getObjectType("jet/runtime/SharedVar$Short");
public static final Type TYPE_SHARED_CHAR = Type.getObjectType("jet/runtime/SharedVar$Char");
public static final Type TYPE_SHARED_LONG = Type.getObjectType("jet/runtime/SharedVar$Long");
public static final Type TYPE_SHARED_BOOLEAN = Type.getObjectType("jet/runtime/SharedVar$Boolean");
public static final Type TYPE_FUNCTION0 = Type.getObjectType("jet/Function0");
public static final Type TYPE_FUNCTION1 = Type.getObjectType("jet/Function1");
public static boolean isIntPrimitive(Type type) {
return type == Type.INT_TYPE || type == Type.SHORT_TYPE || type == Type.BYTE_TYPE || type == Type.CHAR_TYPE;
}
compiler/testData/codegen/regressions/kt2416.kt
+13
View File
@@ -0,0 +1,13 @@
fun main(args: Array<String>) {
9 in 0..9
val intRange = 0..9
9 in intRange
val charRange = '0'..'9'
'9' in charRange
val byteRange = 0.toByte()..9.toByte()
9.toByte() in byteRange
val longRange = 0.toLong()..9.toLong()
9.toLong() in longRange
val shortRange = 0.toShort()..9.toShort()
9.toShort() in shortRange
}
compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java
+5
View File
@@ -366,4 +366,9 @@ public class ControlStructuresTest extends CodegenTestCase {
createEnvironmentWithFullJdk();
blackBoxFile("regressions/kt2423.kt");
}
public void testKt2416() {
createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY);
blackBoxFile("regressions/kt2416.kt");
}
}
runtime/src/jet/ByteRange.java
+7
View File
@@ -39,6 +39,13 @@ public final class ByteRange implements Range<Byte>, ByteIterable {
return item <= start && item > start + count;
}
public boolean contains(byte item) {
if (count >= 0) {
return item >= start && item < start + count;
}
return item <= start && item > start + count;
}
@Override
public boolean equals(Object o) {
if (this == o) {
runtime/src/jet/CharRange.java
+7
View File
@@ -39,6 +39,13 @@ public final class CharRange implements Range<Character>, CharIterable {
return item <= start && item > start + count;
}
public boolean contains(char item) {
if (count >= 0) {
return item >= start && item < start + count;
}
return item <= start && item > start + count;
}
@Override
public boolean equals(Object o) {
if (this == o) {
runtime/src/jet/IntRange.java
+7
View File
@@ -48,6 +48,13 @@ public final class IntRange implements Range<Integer>, IntIterable {
return item <= start && item > start + count;
}
public boolean contains(int item) {
if (count >= 0) {
return item >= start && item < start + count;
}
return item <= start && item > start + count;
}
@Override
public boolean equals(Object o) {
if (this == o) {
runtime/src/jet/LongRange.java
+7
View File
@@ -46,6 +46,13 @@ public final class LongRange implements Range<Long>, LongIterable {
return item <= start && item > start + count;
}
public boolean contains(long item) {
if (count >= 0) {
return item >= start && item < start + count;
}
return item <= start && item > start + count;
}
@Override
public boolean equals(Object o) {
if (this == o) {
runtime/src/jet/ShortRange.java
+7
View File
@@ -46,6 +46,13 @@ public final class ShortRange implements Range<Short>, ShortIterable {
return item <= start && item > start + count;
}
public boolean contains(short item) {
if (count >= 0) {
return item >= start && item < start + count;
}
return item <= start && item > start + count;
}
@Override
public boolean equals(Object o) {
if (this == o) {