From dfd745d55b4fa8768061e2cdc62124329123c2b7 Mon Sep 17 00:00:00 2001 From: Dimach Date: Sun, 11 Mar 2018 23:30:02 +0200 Subject: [PATCH] New J2K: Fixed errors. --- .../org/jetbrains/kotlin/j2k/tree/impl/j.kt | 37 +++++++++------ .../org/jetbrains/kotlin/j2k/tree/impl/jk.kt | 45 +++++++++++++------ .../org/jetbrains/kotlin/j2k/tree/impl/k.kt | 3 ++ .../org/jetbrains/kotlin/j2k/tree/jk.kt | 2 +- 4 files changed, 59 insertions(+), 28 deletions(-) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/j.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/j.kt index 5eb0df3c0c6..82044d7362e 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/j.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/j.kt @@ -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 accept(visitor: JKVisitor, data: D): R = visitor.visitJavaField(this, data) - override fun acceptChildren(visitor: JKVisitor, data: D) = listOfNotNull(type, name, initializer).forEach { it.accept(visitor, data) } + override fun acceptChildren(visitor: JKVisitor, data: D) = + listOfNotNull(type, name, initializer).forEach { it.accept(visitor, data) } override fun transformChildren(transformer: JKTransformer, data: D) { type = type.transform(transformer, data) @@ -57,10 +60,12 @@ class JKJavaModifierImpl(override val type: JKJavaModifier.JavaModifierType) : J override fun accept(visitor: JKVisitor, data: D): R = visitor.visitJavaModifier(this, data) } -class JKJavaMethodImpl(override var modifierList: JKModifierList, - override var name: JKNameIdentifier, - override var valueArguments: List, - override var block: JKBlock?) : JKJavaMethod, JKElementBase() { +class JKJavaMethodImpl( + override var modifierList: JKModifierList, + override var name: JKNameIdentifier, + override var valueArguments: List, + 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 accept(visitor: JKVisitor, data: D): R = visitor.visitJavaMethodCallExpression(this, data) override fun acceptChildren(visitor: JKVisitor, 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 accept(visitor: JKVisitor, data: D): R = visitor.visitJavaNewExpression(this, data) override fun acceptChildren(visitor: JKVisitor, data: D) { @@ -127,7 +136,7 @@ class JKJavaNewExpressionImpl(override var identifier: JKClassReference, } } -class JKJavaNewEmptyArrayImpl(override val initializer: List) : JKJavaNewEmptyArray, JKElementBase() { +class JKJavaNewEmptyArrayImpl(override var initializer: List) : JKJavaNewEmptyArray, JKElementBase() { override fun accept(visitor: JKVisitor, data: D): R = visitor.visitJavaNewEmptyArray(this, data) override fun acceptChildren(visitor: JKVisitor, data: D) { diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt index 9c0696a350a..8cccd20f9ea 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt @@ -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 = 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 accept(visitor: JKVisitor, data: D): R = visitor.visitValueArgument(this, data) override fun transformChildren(transformer: JKTransformer, data: D) { type = type.transform(transformer, data) @@ -84,6 +90,7 @@ class JKBlockImpl(override var statements: List) : JKBlock, JKEleme override fun transformChildren(transformer: JKTransformer, data: D) { statements = statements.map { it.transform(transformer, data) } } + override fun acceptChildren(visitor: JKVisitor, data: D) { statements.forEach { it.accept(visitor, data) } } @@ -93,8 +100,10 @@ class JKStringLiteralExpressionImpl(override val text: String) : JKStringLiteral override fun accept(visitor: JKVisitor, 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 accept(visitor: JKVisitor, data: D): R = visitor.visitBinaryExpression(this, data) override fun acceptChildren(visitor: JKVisitor, 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 accept(visitor: JKVisitor, data: D): R = visitor.visitPrefixExpression(this, data) override fun acceptChildren(visitor: JKVisitor, 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 accept(visitor: JKVisitor, data: D): R = visitor.visitPostfixExpression(this, data) override fun acceptChildren(visitor: JKVisitor, data: D) { expression?.accept(visitor, data) @@ -149,8 +162,10 @@ class JKExpressionListImpl(override var expressions: Array) : 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 accept(visitor: JKVisitor, data: D): R = visitor.visitQualifiedExpression(this, data) override fun acceptChildren(visitor: JKVisitor, 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 accept(visitor: JKVisitor, data: D): R = visitor.visitArrayAccessExpression(this, data) override fun acceptChildren(visitor: JKVisitor, data: D) { @@ -212,7 +228,10 @@ class JKTypeCastExpressionImpl(override var expression: JKExpression?, override } } -class JKTypeReferenceImpl(override val parameters: List) : JKType, JKElementBase() { +class JKTypeImpl( + override val classReference: JKClassReference, override val parameters: List, + override val nullability: Nullability = Nullability.Default +) : JKType, JKElementBase() { override fun accept(visitor: JKVisitor, data: D): R = visitor.visitType(this, data) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/k.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/k.kt index 51743b9bae8..1de87c9a543 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/k.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/k.kt @@ -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, diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/jk.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/jk.kt index 0dd5703db3c..24f27a84d26 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/jk.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/jk.kt @@ -91,7 +91,7 @@ interface JKTypeCastExpression : JKExpression { } interface JKExpressionList : JKElement { - + val expressions: Array } interface JKReference : JKElement {