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

New J2K: Fixed errors.

Browse Source
This commit is contained in:
Dimach
2018-03-11 23:30:02 +02:00
committed by Ilya Kirillov
parent 10ff8d500b
commit dfd745d55b
4 changed files with 59 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/j.kt
+23 -14
View File
@@ -20,16 +20,19 @@ import org.jetbrains.kotlin.j2k.tree.*
import org.jetbrains.kotlin.j2k.tree.visitors.JKTransformer
import org.jetbrains.kotlin.j2k.tree.visitors.JKVisitor
class JKJavaFieldImpl(override var modifierList: JKModifierList,
override var type: JKTypeIdentifier,
override var name: JKNameIdentifier,
override var initializer: JKExpression?) : JKJavaField, JKElementBase() {
class JKJavaFieldImpl(
override var modifierList: JKModifierList,
override var type: JKTypeIdentifier,
override var name: JKNameIdentifier,
override var initializer: JKExpression?
) : JKJavaField, JKElementBase() {
override val valid: Boolean
get() = true
override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitJavaField(this, data)
override fun <D> acceptChildren(visitor: JKVisitor<Unit, D>, data: D) = listOfNotNull(type, name, initializer).forEach { it.accept(visitor, data) }
override fun <D> acceptChildren(visitor: JKVisitor<Unit, D>, data: D) =
listOfNotNull(type, name, initializer).forEach { it.accept(visitor, data) }
override fun <D> transformChildren(transformer: JKTransformer<D>, data: D) {
type = type.transform(transformer, data)
@@ -57,10 +60,12 @@ class JKJavaModifierImpl(override val type: JKJavaModifier.JavaModifierType) : J
override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitJavaModifier(this, data)
}
class JKJavaMethodImpl(override var modifierList: JKModifierList,
override var name: JKNameIdentifier,
override var valueArguments: List<JKValueArgument>,
override var block: JKBlock?) : JKJavaMethod, JKElementBase() {
class JKJavaMethodImpl(
override var modifierList: JKModifierList,
override var name: JKNameIdentifier,
override var valueArguments: List<JKValueArgument>,
override var block: JKBlock?
) : JKJavaMethod, JKElementBase() {
override val valid: Boolean
get() = true
@@ -86,8 +91,10 @@ sealed class JKJavaQualificationIdentifierImpl : JKJavaQualificationIdentifier,
object DOT : JKJavaQualificationIdentifierImpl()
}
class JKJavaMethodCallExpressionImpl(override var identifier: JKMethodReference,
override var arguments: JKExpressionList) : JKJavaMethodCallExpression, JKElementBase() {
class JKJavaMethodCallExpressionImpl(
override var identifier: JKMethodReference,
override var arguments: JKExpressionList
) : JKJavaMethodCallExpression, JKElementBase() {
override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitJavaMethodCallExpression(this, data)
override fun <D> acceptChildren(visitor: JKVisitor<Unit, D>, data: D) {
@@ -113,8 +120,10 @@ class JKJavaFieldAccessExpressionImpl(override var identifier: JKReference) : JK
}
}
class JKJavaNewExpressionImpl(override var identifier: JKClassReference,
override var arguments: JKExpressionList) : JKJavaNewExpression, JKElementBase() {
class JKJavaNewExpressionImpl(
override var identifier: JKClassReference,
override var arguments: JKExpressionList
) : JKJavaNewExpression, JKElementBase() {
override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitJavaNewExpression(this, data)
override fun <D> acceptChildren(visitor: JKVisitor<Unit, D>, data: D) {
@@ -127,7 +136,7 @@ class JKJavaNewExpressionImpl(override var identifier: JKClassReference,
}
}
class JKJavaNewEmptyArrayImpl(override val initializer: List<JKLiteralExpression?>) : JKJavaNewEmptyArray, JKElementBase() {
class JKJavaNewEmptyArrayImpl(override var initializer: List<JKLiteralExpression?>) : JKJavaNewEmptyArray, JKElementBase() {
override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitJavaNewEmptyArray(this, data)
override fun <D> acceptChildren(visitor: JKVisitor<Unit, D>, data: D) {
j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt
+32 -13
View File
@@ -33,7 +33,11 @@ abstract class JKElementBase : JKElement {
}
class JKClassImpl(override var modifierList: JKModifierList, override var name: JKNameIdentifier, override var classKind: JKClass.ClassKind) : JKClass, JKElementBase() {
class JKClassImpl(
override var modifierList: JKModifierList,
override var name: JKNameIdentifier,
override var classKind: JKClass.ClassKind
) : JKClass, JKElementBase() {
override val valid: Boolean
get() = true
override var declarations: List<JKDeclaration> = mutableListOf()
@@ -71,8 +75,10 @@ class JKModifierListImpl : JKModifierList, JKElementBase() {
}
}
class JKValueArgumentImpl(override var type: JKTypeIdentifier,
override val name: String) : JKValueArgument, JKElementBase() {
class JKValueArgumentImpl(
override var type: JKTypeIdentifier,
override val name: String
) : JKValueArgument, JKElementBase() {
override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitValueArgument(this, data)
override fun <D> transformChildren(transformer: JKTransformer<D>, data: D) {
type = type.transform(transformer, data)
@@ -84,6 +90,7 @@ class JKBlockImpl(override var statements: List<JKStatement>) : JKBlock, JKEleme
override fun <D> transformChildren(transformer: JKTransformer<D>, data: D) {
statements = statements.map { it.transform<JKStatement, D>(transformer, data) }
}
override fun <D> acceptChildren(visitor: JKVisitor<Unit, D>, data: D) {
statements.forEach { it.accept(visitor, data) }
}
@@ -93,8 +100,10 @@ class JKStringLiteralExpressionImpl(override val text: String) : JKStringLiteral
override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitStringLiteralExpression(this, data)
}
class JKBinaryExpressionImpl(override var left: JKExpression, override var right: JKExpression?,
override var operator: JKOperatorIdentifier) : JKBinaryExpression, JKElementBase() {
class JKBinaryExpressionImpl(
override var left: JKExpression, override var right: JKExpression?,
override var operator: JKOperatorIdentifier
) : JKBinaryExpression, JKElementBase() {
override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitBinaryExpression(this, data)
override fun <D> acceptChildren(visitor: JKVisitor<Unit, D>, data: D) {
left.accept(visitor, data)
@@ -109,8 +118,10 @@ class JKBinaryExpressionImpl(override var left: JKExpression, override var right
}
}
class JKPrefixExpressionImpl(override var expression: JKExpression,
override var operator: JKOperatorIdentifier) : JKPrefixExpression, JKElementBase() {
class JKPrefixExpressionImpl(
override var expression: JKExpression?,
override var operator: JKOperatorIdentifier
) : JKPrefixExpression, JKElementBase() {
override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitPrefixExpression(this, data)
override fun <D> acceptChildren(visitor: JKVisitor<Unit, D>, data: D) {
expression?.accept(visitor, data)
@@ -123,8 +134,10 @@ class JKPrefixExpressionImpl(override var expression: JKExpression,
}
}
class JKPostfixExpressionImpl(override var expression: JKExpression,
override var operator: JKOperatorIdentifier) : JKPostfixExpression, JKElementBase() {
class JKPostfixExpressionImpl(
override var expression: JKExpression,
override var operator: JKOperatorIdentifier
) : JKPostfixExpression, JKElementBase() {
override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitPostfixExpression(this, data)
override fun <D> acceptChildren(visitor: JKVisitor<Unit, D>, data: D) {
expression?.accept(visitor, data)
@@ -149,8 +162,10 @@ class JKExpressionListImpl(override var expressions: Array<JKExpression>) : JKEx
}
}
class JKQualifiedExpressionImpl(override var receiver: JKExpression, override var operator: JKQualificationIdentifier,
override var selector: JKStatement) : JKQualifiedExpression, JKElementBase() {
class JKQualifiedExpressionImpl(
override var receiver: JKExpression, override var operator: JKQualificationIdentifier,
override var selector: JKStatement
) : JKQualifiedExpression, JKElementBase() {
override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitQualifiedExpression(this, data)
override fun <D> acceptChildren(visitor: JKVisitor<Unit, D>, data: D) {
receiver.accept(visitor, data)
@@ -172,7 +187,8 @@ class JKExpressionStatementImpl(override val expression: JKExpression) : JKExpre
}
}
class JKArrayAccessExpressionImpl(override var expression: JKExpression, override var indexExpression: JKExpression?) : JKArrayAccessExpression, JKElementBase() {
class JKArrayAccessExpressionImpl(override var expression: JKExpression, override var indexExpression: JKExpression?) :
JKArrayAccessExpression, JKElementBase() {
override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitArrayAccessExpression(this, data)
override fun <D> acceptChildren(visitor: JKVisitor<Unit, D>, data: D) {
@@ -212,7 +228,10 @@ class JKTypeCastExpressionImpl(override var expression: JKExpression?, override
}
}
class JKTypeReferenceImpl(override val parameters: List<JKType>) : JKType, JKElementBase() {
class JKTypeImpl(
override val classReference: JKClassReference, override val parameters: List<JKType>,
override val nullability: Nullability = Nullability.Default
) : JKType, JKElementBase() {
override fun <R, D> accept(visitor: JKVisitor<R, D>, data: D): R = visitor.visitType(this, data)
j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/k.kt
+3
View File
@@ -44,6 +44,9 @@ class JKKtPropertyImpl(override var modifierList: JKModifierList,
getter = getter?.transform(transformer, data)
setter = setter?.transform(transformer, data)
}
override val valid: Boolean
get() = true
}
class JKKtFunctionImpl(override var returnType: JKTypeIdentifier,
j2k/newSrc/org/jetbrains/kotlin/j2k/tree/jk.kt
+1 -1
View File
@@ -91,7 +91,7 @@ interface JKTypeCastExpression : JKExpression {
}
interface JKExpressionList : JKElement {
val expressions: Array<JKExpression>
}
interface JKReference : JKElement {