azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Move resolvedStatus from FirRegularClassSymbol to FirClassSymbol

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-12-01 13:49:40 +03:00
committed by teamcityserver
parent 77101edfa4
commit ac718cd1c4
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/utils/FirSymbolStatusUtils.kt
+18 -18
View File
@@ -45,31 +45,31 @@ inline val FirCallableSymbol<*>.isFun: Boolean get() = resolvedStatus.isFun
// ---------------------- regular with status ---------------------- // ---------------------- regular with status ----------------------
inline val FirRegularClassSymbol.modality: Modality? get() = resolvedStatus.modality inline val FirClassSymbol<*>.modality: Modality? get() = resolvedStatus.modality
inline val FirRegularClassSymbol.isAbstract: Boolean get() = resolvedStatus.modality == Modality.ABSTRACT inline val FirClassSymbol<*>.isAbstract: Boolean get() = resolvedStatus.modality == Modality.ABSTRACT
inline val FirRegularClassSymbol.isOpen: Boolean get() = resolvedStatus.modality == Modality.OPEN inline val FirClassSymbol<*>.isOpen: Boolean get() = resolvedStatus.modality == Modality.OPEN
inline val FirRegularClassSymbol.isFinal: Boolean inline val FirClassSymbol<*>.isFinal: Boolean
get() { get() {
// member with unspecified modality is final // member with unspecified modality is final
val modality = resolvedStatus.modality ?: return true val modality = resolvedStatus.modality ?: return true
return modality == Modality.FINAL return modality == Modality.FINAL
} }
inline val FirRegularClassSymbol.visibility: Visibility get() = resolvedStatus.visibility inline val FirClassSymbol<*>.visibility: Visibility get() = resolvedStatus.visibility
inline val FirRegularClassSymbol.effectiveVisibility: EffectiveVisibility get() = resolvedStatus.effectiveVisibility inline val FirClassSymbol<*>.effectiveVisibility: EffectiveVisibility get() = resolvedStatus.effectiveVisibility
inline val FirRegularClassSymbol.isActual: Boolean get() = resolvedStatus.isActual inline val FirClassSymbol<*>.isActual: Boolean get() = resolvedStatus.isActual
inline val FirRegularClassSymbol.isExpect: Boolean get() = resolvedStatus.isExpect inline val FirClassSymbol<*>.isExpect: Boolean get() = resolvedStatus.isExpect
inline val FirRegularClassSymbol.isInner: Boolean get() = resolvedStatus.isInner inline val FirClassSymbol<*>.isInner: Boolean get() = resolvedStatus.isInner
inline val FirRegularClassSymbol.isStatic: Boolean get() = resolvedStatus.isStatic inline val FirClassSymbol<*>.isStatic: Boolean get() = resolvedStatus.isStatic
inline val FirRegularClassSymbol.isInline: Boolean get() = resolvedStatus.isInline inline val FirClassSymbol<*>.isInline: Boolean get() = resolvedStatus.isInline
inline val FirRegularClassSymbol.isExternal: Boolean get() = resolvedStatus.isExternal inline val FirClassSymbol<*>.isExternal: Boolean get() = resolvedStatus.isExternal
inline val FirRegularClassSymbol.isFromSealedClass: Boolean get() = resolvedStatus.isFromSealedClass inline val FirClassSymbol<*>.isFromSealedClass: Boolean get() = resolvedStatus.isFromSealedClass
inline val FirRegularClassSymbol.isFromEnumClass: Boolean get() = resolvedStatus.isFromEnumClass inline val FirClassSymbol<*>.isFromEnumClass: Boolean get() = resolvedStatus.isFromEnumClass
inline val FirRegularClassSymbol.isFun: Boolean get() = resolvedStatus.isFun inline val FirClassSymbol<*>.isFun: Boolean get() = resolvedStatus.isFun
inline val FirRegularClassSymbol.isCompanion: Boolean get() = resolvedStatus.isCompanion inline val FirClassSymbol<*>.isCompanion: Boolean get() = resolvedStatus.isCompanion
inline val FirRegularClassSymbol.isData: Boolean get() = resolvedStatus.isData inline val FirClassSymbol<*>.isData: Boolean get() = resolvedStatus.isData
inline val FirRegularClassSymbol.isSealed: Boolean get() = resolvedStatus.modality == Modality.SEALED inline val FirClassSymbol<*>.isSealed: Boolean get() = resolvedStatus.modality == Modality.SEALED
inline val FirRegularClassSymbol.canHaveAbstractDeclaration: Boolean inline val FirRegularClassSymbol.canHaveAbstractDeclaration: Boolean
get() = isAbstract || isSealed || isEnumClass get() = isAbstract || isSealed || isEnumClass
compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassLikeSymbol.kt
+2 -2
View File
@@ -56,15 +56,15 @@ sealed class FirClassSymbol<C : FirClass>(classId: ClassId) : FirClassLikeSymbol
val classKind: ClassKind val classKind: ClassKind
get() = fir.classKind get() = fir.classKind
}
class FirRegularClassSymbol(classId: ClassId) : FirClassSymbol<FirRegularClass>(classId) {
val resolvedStatus: FirResolvedDeclarationStatus val resolvedStatus: FirResolvedDeclarationStatus
get() { get() {
ensureResolved(FirResolvePhase.STATUS) ensureResolved(FirResolvePhase.STATUS)
return fir.status as FirResolvedDeclarationStatus return fir.status as FirResolvedDeclarationStatus
} }
}
class FirRegularClassSymbol(classId: ClassId) : FirClassSymbol<FirRegularClass>(classId) {
val companionObjectSymbol: FirRegularClassSymbol? val companionObjectSymbol: FirRegularClassSymbol?
get() = fir.companionObjectSymbol get() = fir.companionObjectSymbol
} }