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

translator: fix comparison in nullable primitive types, tests for n.p.t.

Browse Source
This commit is contained in:
Alexey Stepanov
2016-08-23 11:03:13 +03:00
parent 30fe83fc5f
commit e5dbadcb83
9 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
translator/src/main/kotlin/org/kotlinnative/translator/llvm/types/LLVMBooleanType.kt
+2 -2
View File
@@ -31,10 +31,10 @@ class LLVMBooleanType() : LLVMType() {
LLVMExpression(LLVMBooleanType(), "icmp sge i1 $firstOp, $secondOp")
override fun operatorEq(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMBooleanType(), "icmp eq i1 $firstOp, $secondOp")
LLVMExpression(LLVMBooleanType(), "icmp eq i1" + (if ((firstOp.pointer > 0) || (secondOp.pointer > 0)) "*" else "") + " $firstOp, $secondOp")
override fun operatorNeq(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMBooleanType(), "icmp ne i1 $firstOp, $secondOp")
LLVMExpression(LLVMBooleanType(), "icmp ne i1" + (if ((firstOp.pointer > 0) || (secondOp.pointer > 0)) "*" else "") + " $firstOp, $secondOp")
override fun operatorOr(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMBooleanType(), "or i1 $firstOp, $secondOp")
translator/src/main/kotlin/org/kotlinnative/translator/llvm/types/LLVMByteType.kt
+2 -2
View File
@@ -17,10 +17,10 @@ class LLVMByteType() : LLVMType() {
LLVMExpression(LLVMBooleanType(), "icmp sge i8 $firstOp, $secondOp")
override fun operatorEq(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMBooleanType(), "icmp eq i8 $firstOp, $secondOp")
LLVMExpression(LLVMBooleanType(), "icmp eq i8" + (if ((firstOp.pointer > 0) || (secondOp.pointer > 0)) "*" else "") + " $firstOp, $secondOp")
override fun operatorNeq(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMBooleanType(), "icmp ne i8 $firstOp, $secondOp")
LLVMExpression(LLVMBooleanType(), "icmp ne i8" + (if ((firstOp.pointer > 0) || (secondOp.pointer > 0)) "*" else "") + " $firstOp, $secondOp")
override fun operatorMod(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMByteType(), "srem i8 $firstOp, $secondOp")
translator/src/main/kotlin/org/kotlinnative/translator/llvm/types/LLVMCharType.kt
+2 -2
View File
@@ -17,10 +17,10 @@ class LLVMCharType() : LLVMType() {
LLVMExpression(LLVMBooleanType(), "icmp sge i8 $firstOp, $secondOp")
override fun operatorEq(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMBooleanType(), "icmp eq i8 $firstOp, $secondOp")
LLVMExpression(LLVMBooleanType(), "icmp eq i8" + (if ((firstOp.pointer > 0) || (secondOp.pointer > 0)) "*" else "") + " $firstOp, $secondOp")
override fun operatorNeq(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMBooleanType(), "icmp ne i8 $firstOp, $secondOp")
LLVMExpression(LLVMBooleanType(), "icmp ne i8" + (if ((firstOp.pointer > 0) || (secondOp.pointer > 0)) "*" else "") + " $firstOp, $secondOp")
override fun equals(other: Any?): Boolean {
return other is LLVMCharType
translator/src/main/kotlin/org/kotlinnative/translator/llvm/types/LLVMFloatType.kt
+2 -2
View File
@@ -37,10 +37,10 @@ class LLVMFloatType() : LLVMType() {
LLVMExpression(LLVMBooleanType(), "fcmp oge float i32 $firstOp, $secondOp")
override fun operatorEq(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMBooleanType(), "fcmp oeq float $firstOp, $secondOp")
LLVMExpression(LLVMBooleanType(), "fcmp oeq float" + (if ((firstOp.pointer > 0) || (secondOp.pointer > 0)) "*" else "") + " $firstOp, $secondOp")
override fun operatorNeq(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMBooleanType(), "fcmp one float $firstOp, $secondOp")
LLVMExpression(LLVMBooleanType(), "fcmp one float" + (if ((firstOp.pointer > 0) || (secondOp.pointer > 0)) "*" else "") + " $firstOp, $secondOp")
override fun operatorMod(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMFloatType(), "frem float $firstOp, $secondOp")
translator/src/main/kotlin/org/kotlinnative/translator/llvm/types/LLVMIntType.kt
+2 -2
View File
@@ -56,10 +56,10 @@ class LLVMIntType() : LLVMType() {
LLVMExpression(LLVMBooleanType(), "icmp sge i32 $firstOp, $secondOp")
override fun operatorEq(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMBooleanType(), "icmp eq i32 $firstOp, $secondOp")
LLVMExpression(LLVMBooleanType(), "icmp eq i32" + (if ((firstOp.pointer > 0) || (secondOp.pointer > 0)) "*" else "") + " $firstOp, $secondOp")
override fun operatorNeq(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMBooleanType(), "icmp ne i32 $firstOp, $secondOp")
LLVMExpression(LLVMBooleanType(), "icmp ne i32" + (if ((firstOp.pointer > 0) || (secondOp.pointer > 0)) "*" else "") + " $firstOp, $secondOp")
override fun operatorMod(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMIntType(), "srem i32 $firstOp, $secondOp")
translator/src/main/kotlin/org/kotlinnative/translator/llvm/types/LLVMLongType.kt
+2 -2
View File
@@ -50,10 +50,10 @@ class LLVMLongType() : LLVMType() {
LLVMExpression(LLVMBooleanType(), "icmp sge i64 $firstOp, $secondOp")
override fun operatorEq(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMBooleanType(), "icmp eq i64 $firstOp, $secondOp")
LLVMExpression(LLVMBooleanType(), "icmp eq i64" + (if ((firstOp.pointer > 0) || (secondOp.pointer > 0)) "*" else "") + " $firstOp, $secondOp")
override fun operatorNeq(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMBooleanType(), "icmp ne i64 $firstOp, $secondOp")
LLVMExpression(LLVMBooleanType(), "icmp ne i64" + (if ((firstOp.pointer > 0) || (secondOp.pointer > 0)) "*" else "") + " $firstOp, $secondOp")
override fun operatorMod(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMLongType(), "srem i64 $firstOp, $secondOp")
translator/src/main/kotlin/org/kotlinnative/translator/llvm/types/LLVMShortType.kt
+2 -2
View File
@@ -17,10 +17,10 @@ class LLVMShortType() : LLVMType() {
LLVMExpression(LLVMBooleanType(), "icmp sge i16 $firstOp, $secondOp")
override fun operatorEq(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMBooleanType(), "icmp eq i16 $firstOp, $secondOp")
LLVMExpression(LLVMBooleanType(), "icmp eq i16" + (if ((firstOp.pointer > 0) || (secondOp.pointer > 0)) "*" else "") + " $firstOp, $secondOp")
override fun operatorNeq(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMBooleanType(), "icmp ne i16 $firstOp, $secondOp")
LLVMExpression(LLVMBooleanType(), "icmp ne i16" + (if ((firstOp.pointer > 0) || (secondOp.pointer > 0)) "*" else "") + " $firstOp, $secondOp")
override fun operatorMod(firstOp: LLVMSingleValue, secondOp: LLVMSingleValue): LLVMExpression =
LLVMExpression(LLVMShortType(), "srem i16 $firstOp, $secondOp")
translator/src/test/kotlin/tests/input/nullable_primitive_types_1.txt
+4
View File
@@ -0,0 +1,4 @@
nullable_primitive_types_1_small() == 29
nullable_primitive_types_1_extern_Int(11) == 19
nullable_primitive_types_1_if_null() == 11
nullable_primitive_types_1_if_not_null() == 2245
translator/src/test/kotlin/tests/kotlin/nullable_primitive_types_1.kt
+32
View File
@@ -0,0 +1,32 @@
fun nullable_primitive_types_1_small(): Int {
var variable: Int? = null
variable = 29
val art: Int? = variable
return art!!
}
fun nullable_primitive_types_1_extern(x: Int): Int {
val variable: Int? = x
val art: Int? = variable!! + 8
return art!!
}
fun nullable_primitive_types_1_if_null(): Int {
val variable: Int? = null
if (variable == null){
return 11
}
else{
return 2245
}
}
fun nullable_primitive_types_1_if_not_null(): Int {
val variable: Int? = null
if (variable != null){
return 11
}
else{
return 2245
}
}