merged some of the expressions in a single file; correct nullability for array access expression

This commit is contained in:
Dmitry Jemerov
2012-06-01 16:42:12 +02:00
committed by Pavel V. Talanov
parent 7cbff97c6e
commit a59d15c090
8 changed files with 30 additions and 48 deletions
@@ -1,7 +0,0 @@
package org.jetbrains.jet.j2k.ast
public open class ArrayAccessExpression(val expression : Expression, val index : Expression) : Expression() {
public override fun toKotlin() : String {
return expression.toKotlin() + "[" + index.toKotlin() + "]"
}
}
@@ -1,6 +0,0 @@
package org.jetbrains.jet.j2k.ast
public open class AssignmentExpression(val left : Expression, val right : Expression, val op : String) : Expression() {
public override fun toKotlin() : String = left.toKotlin() + " "+ op + " "+ right.toKotlin()
}
@@ -1,5 +0,0 @@
package org.jetbrains.jet.j2k.ast
public class BangBangExpression(val expr: Expression): Expression() {
public override fun toKotlin(): String = expr.toKotlin() + "!!"
}
@@ -1,8 +0,0 @@
package org.jetbrains.jet.j2k.ast
import java.util.Arrays
import java.util.List
public open class BinaryExpression(val left: Expression, val right: Expression, val op: String): Expression() {
public override fun toKotlin(): String = left.toKotlin() + " " + op + " " + right.toKotlin()
}
@@ -1,8 +0,0 @@
package org.jetbrains.jet.j2k.ast
public open class ClassObjectAccessExpression(val typeElement: Element): Expression() {
public override fun toKotlin(): String {
return "getJavaClass<" + typeElement.toKotlin() + ">"
}
}
@@ -0,0 +1,30 @@
package org.jetbrains.jet.j2k.ast
public open class ArrayAccessExpression(val expression : Expression, val index : Expression) : Expression() {
override fun toKotlin() = expression.toKotlin() + "[" + index.toKotlin() + "]"
override fun isNullable() = expression.isNullable()
}
public open class AssignmentExpression(val left : Expression, val right : Expression, val op : String) : Expression() {
override fun toKotlin() = left.toKotlin() + " "+ op + " "+ right.toKotlin()
}
public class BangBangExpression(val expr: Expression): Expression() {
override fun toKotlin() = expr.toKotlin() + "!!"
}
public open class BinaryExpression(val left: Expression, val right: Expression, val op: String): Expression() {
override fun toKotlin() = left.toKotlin() + " " + op + " " + right.toKotlin()
}
public open class ClassObjectAccessExpression(val typeElement: Element): Expression() {
override fun toKotlin() = "getJavaClass<" + typeElement.toKotlin() + ">"
}
public open class IsOperator(val expression: Expression, val typeElement: TypeElement): Expression() {
override fun toKotlin() = expression.toKotlin() + " is " + typeElement.`type`.convertedToNotNull().toKotlin()
}
public open class LiteralExpression(val literalText: String): Expression() {
override fun toKotlin() = literalText
}
@@ -1,8 +0,0 @@
package org.jetbrains.jet.j2k.ast
public open class IsOperator(val expression: Expression, val typeElement: TypeElement): Expression() {
public override fun toKotlin(): String {
return expression.toKotlin() + " is " + typeElement.`type`.convertedToNotNull().toKotlin()
}
}
@@ -1,6 +0,0 @@
package org.jetbrains.jet.j2k.ast
public open class LiteralExpression(val literalText: String): Expression() {
public override fun toKotlin() = literalText
}