diff --git a/native/swift/sir-passes/src/org/jetbrains/sir/passes/translation/ForeignIntoSwiftFunctionTranslationPass.kt b/native/swift/sir-passes/src/org/jetbrains/sir/passes/translation/ForeignIntoSwiftFunctionTranslationPass.kt index db05c0667a3..3a2cf7235aa 100644 --- a/native/swift/sir-passes/src/org/jetbrains/sir/passes/translation/ForeignIntoSwiftFunctionTranslationPass.kt +++ b/native/swift/sir-passes/src/org/jetbrains/sir/passes/translation/ForeignIntoSwiftFunctionTranslationPass.kt @@ -30,18 +30,18 @@ public class ForeignIntoSwiftFunctionTranslationPass : SirPass : SirVisitor() { return transformDeclaration(foreignDeclaration, data) } - final override fun visitForeignDeclaration(foreignDeclaration: SirForeignDeclaration, data: D): SirDeclaration { - return transformForeignDeclaration(foreignDeclaration, data) + final override fun visitForeignDeclaration(declaration: SirForeignDeclaration, data: D): SirDeclaration { + return transformForeignDeclaration(declaration, data) } @@ -59,8 +59,8 @@ abstract class SirTransformer : SirVisitor() { return transformDeclaration(namedDeclaration, data) } - final override fun visitNamedDeclaration(namedDeclaration: SirNamedDeclaration, data: D): SirDeclaration { - return transformNamedDeclaration(namedDeclaration, data) + final override fun visitNamedDeclaration(declaration: SirNamedDeclaration, data: D): SirDeclaration { + return transformNamedDeclaration(declaration, data) } open fun transformEnum(enum: SirEnum, data: D): SirDeclaration { @@ -99,7 +99,7 @@ abstract class SirTransformer : SirVisitor() { return transformCallable(foreignFunction, data) } - final override fun visitForeignFunction(foreignFunction: SirForeignFunction, data: D): SirDeclaration { - return transformForeignFunction(foreignFunction, data) + final override fun visitForeignFunction(function: SirForeignFunction, data: D): SirDeclaration { + return transformForeignFunction(function, data) } } diff --git a/native/swift/sir/gen/org/jetbrains/kotlin/sir/visitors/SirTransformerVoid.kt b/native/swift/sir/gen/org/jetbrains/kotlin/sir/visitors/SirTransformerVoid.kt index 766e6b2efa8..6afea21fe21 100644 --- a/native/swift/sir/gen/org/jetbrains/kotlin/sir/visitors/SirTransformerVoid.kt +++ b/native/swift/sir/gen/org/jetbrains/kotlin/sir/visitors/SirTransformerVoid.kt @@ -38,17 +38,17 @@ abstract class SirTransformerVoid : SirTransformer() { final override fun transformDeclaration(declaration: SirDeclaration, data: Nothing?): SirDeclaration = transformDeclaration(declaration) - open fun transformForeignDeclaration(foreignDeclaration: SirForeignDeclaration): SirDeclaration = - transformDeclaration(foreignDeclaration) + open fun transformForeignDeclaration(declaration: SirForeignDeclaration): SirDeclaration = + transformDeclaration(declaration) - final override fun transformForeignDeclaration(foreignDeclaration: SirForeignDeclaration, data: Nothing?): SirDeclaration = - transformForeignDeclaration(foreignDeclaration) + final override fun transformForeignDeclaration(declaration: SirForeignDeclaration, data: Nothing?): SirDeclaration = + transformForeignDeclaration(declaration) - open fun transformNamedDeclaration(namedDeclaration: SirNamedDeclaration): SirDeclaration = - transformDeclaration(namedDeclaration) + open fun transformNamedDeclaration(declaration: SirNamedDeclaration): SirDeclaration = + transformDeclaration(declaration) - final override fun transformNamedDeclaration(namedDeclaration: SirNamedDeclaration, data: Nothing?): SirDeclaration = - transformNamedDeclaration(namedDeclaration) + final override fun transformNamedDeclaration(declaration: SirNamedDeclaration, data: Nothing?): SirDeclaration = + transformNamedDeclaration(declaration) open fun transformEnum(enum: SirEnum): SirDeclaration = transformNamedDeclaration(enum) @@ -74,9 +74,9 @@ abstract class SirTransformerVoid : SirTransformer() { final override fun transformFunction(function: SirFunction, data: Nothing?): SirDeclaration = transformFunction(function) - open fun transformForeignFunction(foreignFunction: SirForeignFunction): SirDeclaration = - transformCallable(foreignFunction) + open fun transformForeignFunction(function: SirForeignFunction): SirDeclaration = + transformCallable(function) - final override fun transformForeignFunction(foreignFunction: SirForeignFunction, data: Nothing?): SirDeclaration = - transformForeignFunction(foreignFunction) + final override fun transformForeignFunction(function: SirForeignFunction, data: Nothing?): SirDeclaration = + transformForeignFunction(function) } diff --git a/native/swift/sir/gen/org/jetbrains/kotlin/sir/visitors/SirVisitor.kt b/native/swift/sir/gen/org/jetbrains/kotlin/sir/visitors/SirVisitor.kt index 7c2cc544b53..41924d8d1fc 100644 --- a/native/swift/sir/gen/org/jetbrains/kotlin/sir/visitors/SirVisitor.kt +++ b/native/swift/sir/gen/org/jetbrains/kotlin/sir/visitors/SirVisitor.kt @@ -26,11 +26,11 @@ abstract class SirVisitor { open fun visitDeclaration(declaration: SirDeclaration, data: D): R = visitElement(declaration, data) - open fun visitForeignDeclaration(foreignDeclaration: SirForeignDeclaration, data: D): R = - visitDeclaration(foreignDeclaration, data) + open fun visitForeignDeclaration(declaration: SirForeignDeclaration, data: D): R = + visitDeclaration(declaration, data) - open fun visitNamedDeclaration(namedDeclaration: SirNamedDeclaration, data: D): R = - visitDeclaration(namedDeclaration, data) + open fun visitNamedDeclaration(declaration: SirNamedDeclaration, data: D): R = + visitDeclaration(declaration, data) open fun visitEnum(enum: SirEnum, data: D): R = visitNamedDeclaration(enum, data) @@ -44,6 +44,6 @@ abstract class SirVisitor { open fun visitFunction(function: SirFunction, data: D): R = visitCallable(function, data) - open fun visitForeignFunction(foreignFunction: SirForeignFunction, data: D): R = - visitCallable(foreignFunction, data) + open fun visitForeignFunction(function: SirForeignFunction, data: D): R = + visitCallable(function, data) } diff --git a/native/swift/sir/gen/org/jetbrains/kotlin/sir/visitors/SirVisitorVoid.kt b/native/swift/sir/gen/org/jetbrains/kotlin/sir/visitors/SirVisitorVoid.kt index 7abbabd9603..0c79539e2de 100644 --- a/native/swift/sir/gen/org/jetbrains/kotlin/sir/visitors/SirVisitorVoid.kt +++ b/native/swift/sir/gen/org/jetbrains/kotlin/sir/visitors/SirVisitorVoid.kt @@ -46,20 +46,20 @@ abstract class SirVisitorVoid : SirVisitor() { visitElement(declaration) } - final override fun visitForeignDeclaration(foreignDeclaration: SirForeignDeclaration, data: Nothing?) { - visitForeignDeclaration(foreignDeclaration) + final override fun visitForeignDeclaration(declaration: SirForeignDeclaration, data: Nothing?) { + visitForeignDeclaration(declaration) } - open fun visitForeignDeclaration(foreignDeclaration: SirForeignDeclaration) { - visitDeclaration(foreignDeclaration) + open fun visitForeignDeclaration(declaration: SirForeignDeclaration) { + visitDeclaration(declaration) } - final override fun visitNamedDeclaration(namedDeclaration: SirNamedDeclaration, data: Nothing?) { - visitNamedDeclaration(namedDeclaration) + final override fun visitNamedDeclaration(declaration: SirNamedDeclaration, data: Nothing?) { + visitNamedDeclaration(declaration) } - open fun visitNamedDeclaration(namedDeclaration: SirNamedDeclaration) { - visitDeclaration(namedDeclaration) + open fun visitNamedDeclaration(declaration: SirNamedDeclaration) { + visitDeclaration(declaration) } final override fun visitEnum(enum: SirEnum, data: Nothing?) { @@ -94,11 +94,11 @@ abstract class SirVisitorVoid : SirVisitor() { visitCallable(function) } - final override fun visitForeignFunction(foreignFunction: SirForeignFunction, data: Nothing?) { - visitForeignFunction(foreignFunction) + final override fun visitForeignFunction(function: SirForeignFunction, data: Nothing?) { + visitForeignFunction(function) } - open fun visitForeignFunction(foreignFunction: SirForeignFunction) { - visitCallable(foreignFunction) + open fun visitForeignFunction(function: SirForeignFunction) { + visitCallable(function) } } diff --git a/native/swift/sir/tree-generator/src/org/jetbrains/kotlin/sir/tree/generator/SwiftIrTree.kt b/native/swift/sir/tree-generator/src/org/jetbrains/kotlin/sir/tree/generator/SwiftIrTree.kt index d20a591dcf4..01bd77159e1 100644 --- a/native/swift/sir/tree-generator/src/org/jetbrains/kotlin/sir/tree/generator/SwiftIrTree.kt +++ b/native/swift/sir/tree-generator/src/org/jetbrains/kotlin/sir/tree/generator/SwiftIrTree.kt @@ -43,6 +43,8 @@ object SwiftIrTree : AbstractSwiftIrTreeBuilder() { val foreignDeclaration by sealedElement { parent(declaration) + + visitorParameterName = "declaration" } val named by sealedElement { @@ -53,6 +55,8 @@ object SwiftIrTree : AbstractSwiftIrTreeBuilder() { customParentInVisitor = declaration parent(declaration) parent(named) + + visitorParameterName = "declaration" } val enum: Element by element { @@ -86,5 +90,7 @@ object SwiftIrTree : AbstractSwiftIrTreeBuilder() { customParentInVisitor = callable parent(callable) parent(foreignDeclaration) + + visitorParameterName = "function" } } \ No newline at end of file diff --git a/native/swift/sir/tree-generator/src/org/jetbrains/kotlin/sir/tree/generator/model/Element.kt b/native/swift/sir/tree-generator/src/org/jetbrains/kotlin/sir/tree/generator/model/Element.kt index 5501db8a398..2cd28b04d42 100644 --- a/native/swift/sir/tree-generator/src/org/jetbrains/kotlin/sir/tree/generator/model/Element.kt +++ b/native/swift/sir/tree-generator/src/org/jetbrains/kotlin/sir/tree/generator/model/Element.kt @@ -20,8 +20,7 @@ class Element(name: String, override val propertyName: String) : AbstractElement override val otherParents: MutableList> = mutableListOf() - override val visitorParameterName: String - get() = safeDecapitalizedName + override var visitorParameterName: String = safeDecapitalizedName override val hasAcceptMethod: Boolean get() = true