Add header verification for functions.

touchlab · May 14, 2024 · a791b8b · a791b8b
1 parent 5cbdf7e
commit a791b8b
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 4 deletions.
diff --git a/SKIE/acceptance-tests b/SKIE/acceptance-tests
diff --git a/SKIE/kotlin-compiler/core/src/commonMain/kotlin/co/touchlab/skie/sir/element/SirFunction.kt b/SKIE/kotlin-compiler/core/src/commonMain/kotlin/co/touchlab/skie/sir/element/SirFunction.kt
@@ -1,6 +1,7 @@
 package co.touchlab.skie.sir.element
 
 import co.touchlab.skie.sir.signature.Signature
+import co.touchlab.skie.util.collisionFreeIdentifier
 import co.touchlab.skie.util.swift.escapeSwiftIdentifier
 import io.outfoxx.swiftpoet.CodeBlock
 import io.outfoxx.swiftpoet.FunctionSpec
@@ -76,4 +77,31 @@ fun SirFunction.copyValueParametersFrom(valueParameters: List<SirValueParameter>
             inout = it.inout,
         )
     }
+
+    fixValueParameterCollisions()
+}
+
+fun SirFunction.fixValueParameterCollisions() {
+    fixValueParameterNameCollisions()
+    fixValueParameterLabelCollisions()
+}
+
+private fun SirFunction.fixValueParameterNameCollisions() {
+    val usedNames = mutableSetOf<String>()
+
+    valueParameters.forEach { parameter ->
+        parameter.name = parameter.name.collisionFreeIdentifier(usedNames)
+
+        usedNames.add(parameter.name)
+    }
+}
+
+private fun SirFunction.fixValueParameterLabelCollisions() {
+    val usedNames = mutableSetOf<String>()
+
+    valueParameters.forEach { parameter ->
+        parameter.label = parameter.labelOrName.collisionFreeIdentifier(usedNames)
+
+        usedNames.add(parameter.labelOrName)
+    }
 }
diff --git a/...ompiler/core/src/commonMain/kotlin/co/touchlab/skie/sir/element/SirTypeParameterParent.kt b/...ompiler/core/src/commonMain/kotlin/co/touchlab/skie/sir/element/SirTypeParameterParent.kt
@@ -13,12 +13,28 @@ sealed interface SirTypeParameterParent {
     }
 }
 
-fun SirTypeParameterParent.copyTypeParametersFrom(other: SirClass) {
-    val copiesWithOriginal = other.typeParameters.map {
+fun SirTypeParameterParent.copyTypeParametersFrom(other: SirTypeParameterParent) {
+    copyTypeParametersFrom(other.typeParameters)
+}
+
+fun SirTypeParameterParent.copyTypeParametersFrom(
+    copiedTypeParameters: List<SirTypeParameter>,
+    allTypeParameters: List<SirTypeParameter> = copiedTypeParameters,
+) {
+    val copiesWithOriginal = copiedTypeParameters.map {
         it to SirTypeParameter(it.name)
     }
 
-    val substitutions = copiesWithOriginal.toMap()
+    val nonCopiedTypeParameters = allTypeParameters - copiedTypeParameters.toSet()
+
+    val nonCopiedSubstitutions = nonCopiedTypeParameters.map { nonCopiedTypeParameter ->
+        val existingTypeParameter = (typeParameters.firstOrNull { it.name == nonCopiedTypeParameter.name }
+            ?: error("Type parameter ${nonCopiedTypeParameter.name} not found in parent scope"))
+
+        nonCopiedTypeParameter to existingTypeParameter
+    }
+
+    val substitutions = (copiesWithOriginal + nonCopiedSubstitutions).toMap()
 
     copiesWithOriginal.forEach { (original, copy) ->
         // TODO This is not entirely correct, because we don't substitute type parameters from parent scope as nested scopes are not implemented yet.