FIR deserializer: rename a callable kind that represents all "others"
This commit is contained in:
committed by
Denis Zharkov
parent
12181e55c0
commit
6a28558d43
+5
-5
@@ -35,9 +35,9 @@ class JvmBinaryAnnotationDeserializer(
|
|||||||
private data class MemberAnnotations(val memberAnnotations: Map<MemberSignature, MutableList<FirAnnotationCall>>)
|
private data class MemberAnnotations(val memberAnnotations: Map<MemberSignature, MutableList<FirAnnotationCall>>)
|
||||||
|
|
||||||
private enum class CallableKind {
|
private enum class CallableKind {
|
||||||
FUNCTION,
|
|
||||||
PROPERTY_GETTER,
|
PROPERTY_GETTER,
|
||||||
PROPERTY_SETTER
|
PROPERTY_SETTER,
|
||||||
|
OTHERS
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun loadTypeAnnotations(typeProto: ProtoBuf.Type, nameResolver: NameResolver): List<FirAnnotationCall> {
|
override fun loadTypeAnnotations(typeProto: ProtoBuf.Type, nameResolver: NameResolver): List<FirAnnotationCall> {
|
||||||
@@ -51,7 +51,7 @@ class JvmBinaryAnnotationDeserializer(
|
|||||||
nameResolver: NameResolver,
|
nameResolver: NameResolver,
|
||||||
typeTable: TypeTable
|
typeTable: TypeTable
|
||||||
): List<FirAnnotationCall> {
|
): List<FirAnnotationCall> {
|
||||||
val signature = getCallableSignature(constructorProto, nameResolver, typeTable, CallableKind.FUNCTION) ?: return emptyList()
|
val signature = getCallableSignature(constructorProto, nameResolver, typeTable) ?: return emptyList()
|
||||||
return findJvmBinaryClassAndLoadMemberAnnotations(containerSource, signature)
|
return findJvmBinaryClassAndLoadMemberAnnotations(containerSource, signature)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -61,7 +61,7 @@ class JvmBinaryAnnotationDeserializer(
|
|||||||
nameResolver: NameResolver,
|
nameResolver: NameResolver,
|
||||||
typeTable: TypeTable
|
typeTable: TypeTable
|
||||||
): List<FirAnnotationCall> {
|
): List<FirAnnotationCall> {
|
||||||
val signature = getCallableSignature(functionProto, nameResolver, typeTable, CallableKind.FUNCTION) ?: return emptyList()
|
val signature = getCallableSignature(functionProto, nameResolver, typeTable) ?: return emptyList()
|
||||||
return findJvmBinaryClassAndLoadMemberAnnotations(containerSource, signature)
|
return findJvmBinaryClassAndLoadMemberAnnotations(containerSource, signature)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -91,7 +91,7 @@ class JvmBinaryAnnotationDeserializer(
|
|||||||
proto: MessageLite,
|
proto: MessageLite,
|
||||||
nameResolver: NameResolver,
|
nameResolver: NameResolver,
|
||||||
typeTable: TypeTable,
|
typeTable: TypeTable,
|
||||||
kind: CallableKind
|
kind: CallableKind = CallableKind.OTHERS
|
||||||
): MemberSignature? {
|
): MemberSignature? {
|
||||||
return when (proto) {
|
return when (proto) {
|
||||||
is ProtoBuf.Constructor -> {
|
is ProtoBuf.Constructor -> {
|
||||||
|
|||||||
Reference in New Issue
Block a user