less red-code-inducing handling of nullability with array accesses

This commit is contained in:
Dmitry Jemerov
2012-06-01 17:54:29 +02:00
committed by Pavel V. Talanov
parent 5be56e15ba
commit 192cdd7028
4 changed files with 6 additions and 5 deletions
+3 -2
View File
@@ -3,8 +3,9 @@ package org.jetbrains.jet.j2k.ast
import org.jetbrains.jet.j2k.ast.types.Type
public open class ArrayAccessExpression(val expression : Expression, val index : Expression) : Expression() {
override fun toKotlin() = expression.toKotlin() + "[" + index.toKotlin() + "]"
override fun isNullable() = expression.isNullable()
override fun toKotlin() = expression.toKotlin() +
(if (expression.isNullable()) "!!" else "") +
"[" + index.toKotlin() + "]"
}
public open class AssignmentExpression(val left : Expression, val right : Expression, val op : String) : Expression() {
@@ -1,4 +1,4 @@
var array : IntArray? = IntArray(10)
for (i in 0..10) {
array[i] = i
array!![i] = i
}
@@ -1,4 +1,4 @@
var array : IntArray? = IntArray(10)
for (i in 0..10 - 1) {
array[i] = i
array!![i] = i
}
@@ -1,4 +1,4 @@
var array : IntArray? = IntArray(10)
for (i in 0..10 - 1) {
array[i] = i
array!![i] = i
}