Created FunctionTypeName

Author: The-Ray-Man

formver.compiler-plugin/core/src/org/jetbrains/kotlin/formver/core/embeddings/types/FunctionTypeEmbedding.kt

@@ -6,7 +6,9 @@
 package org.jetbrains.kotlin.formver.core.embeddings.types
 
 import org.jetbrains.kotlin.formver.core.domains.RuntimeTypeDomain
-import org.jetbrains.kotlin.formver.core.names.SetOfNames
+import org.jetbrains.kotlin.formver.core.names.FunctionTypeName
+import org.jetbrains.kotlin.formver.core.names.ListOfNames
+import org.jetbrains.kotlin.formver.core.names.NameOfType
 
 data class FunctionTypeEmbedding(
     val dispatchReceiverType: TypeEmbedding?,
@@ -17,7 +19,8 @@ data class FunctionTypeEmbedding(
 ) : PretypeEmbedding {
     override val runtimeType = RuntimeTypeDomain.functionType()
 
-    override val name: SetOfNames = SetOfNames(formalArgTypes.map { it -> it.name } + listOf(returnType.name))
+    private val argsTypeNames = ListOfNames<NameOfType>(formalArgTypes.map { it.name })
+    override val name: FunctionTypeName = FunctionTypeName(argsTypeNames, returnType.name)
 
     /**
      * The flattened structure of the callable parameters: in case the callable has a receiver

formver.compiler-plugin/core/src/org/jetbrains/kotlin/formver/core/embeddings/types/TypeEmbedding.kt

@@ -37,7 +37,7 @@ data class TypeEmbedding(val pretype: PretypeEmbedding, val flags: TypeEmbedding
      * It may at some point necessary to make a `TypeName` hierarchy of some sort to
      * represent these names, but we do it inline for now.
      */
-    val name: SymbolicName
+    val name: TypeName
         get() = TypeName(pretype, flags.nullable)
 
     val havocMethodName: SymbolicName by lazy {

formver.compiler-plugin/core/src/org/jetbrains/kotlin/formver/core/names/KotlinName.kt

@@ -83,14 +83,16 @@ data class ConstructorKotlinName(val type: FunctionTypeEmbedding) : KotlinName {
         get() = type.name.mangledBaseName
 }
 
-data class PretypeName(val name: String) : KotlinName {
+interface NameOfType : SymbolicName
+
+data class PretypeName(val name: String) : NameOfType {
 
     context(nameResolver: NameResolver)
     override val mangledBaseName: String
         get() = name
 }
 
-data class SetOfNames(val names: List<SymbolicName>) : KotlinName {
+data class ListOfNames<T : SymbolicName>(val names: List<T>) : SymbolicName {
     override val mangledType: NameType
         get() = NameType.Type
 
@@ -99,7 +101,17 @@ data class SetOfNames(val names: List<SymbolicName>) : KotlinName {
         get() = names.joinToString(SEPARATOR) { it.mangled }
 }
 
-data class TypeName(val pretype: PretypeEmbedding, val nullable: Boolean) : KotlinName {
+data class FunctionTypeName(val args: ListOfNames<NameOfType>, val returns: TypeName) : NameOfType {
+    context(nameResolver: NameResolver)
+    override val mangledBaseName: String
+        get() = buildString {
+            append(args.mangledBaseName)
+            if (isNotEmpty()) append(SEPARATOR)
+            append(returns.mangled)
+        }
+}
+
+data class TypeName(val pretype: PretypeEmbedding, val nullable: Boolean) : NameOfType {
 
     override val mangledType: NameType
         get() = NameType.Type
@@ -112,5 +124,4 @@ data class TypeName(val pretype: PretypeEmbedding, val nullable: Boolean) : Kotl
             if (isNotEmpty()) append(SEPARATOR)
             append(pretype.name.mangledBaseName)
         }
-
 }