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

[Raw FIR] Fix PSI consistency test (enum entry) + some cleanup

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-01-09 14:41:20 +03:00
parent 2b05320ae9
commit 97670e5036
7 changed files with 97 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/converter/ConverterUtil.kt
+2 -2
View File
@@ -140,9 +140,9 @@ fun generateDestructuringBlock(
FirComponentCallImpl(null, generateResolvedAccessExpression(null, container), index + 1), FirComponentCallImpl(null, generateResolvedAccessExpression(null, container), index + 1),
null, null,
isVar, isVar,
FirPropertySymbol(CallableId(entry.name)), // TODO? FirPropertySymbol(entry.name), // TODO?
true, true,
FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL) FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL)
).apply { ).apply {
annotations += entry.annotations annotations += entry.annotations
symbol.bind(this) symbol.bind(this)
compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
+2 -2
View File
@@ -857,7 +857,7 @@ class DeclarationsConverter(
) )
}, },
isVar, isVar,
FirPropertySymbol(CallableId(propertyName)), FirPropertySymbol(propertyName),
true, true,
FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL) FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL)
).apply { ).apply {
@@ -950,7 +950,7 @@ class DeclarationsConverter(
null, null,
null, null,
false, false,
FirPropertySymbol(CallableId(name)), FirPropertySymbol(name),
true, true,
FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL) FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL)
).apply { ).apply {
compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt
+1 -1
View File
@@ -533,7 +533,7 @@ class ExpressionsConverter(
variable.initializer, variable.initializer,
null, null,
false, false,
FirPropertySymbol(CallableId(variable.name)), FirPropertySymbol(variable.name),
true, true,
FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL) FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL)
) )
compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt
+27 -15
View File
@@ -25,10 +25,7 @@ import org.jetbrains.kotlin.fir.references.impl.FirSimpleNamedReference
import org.jetbrains.kotlin.fir.symbols.CallableId import org.jetbrains.kotlin.fir.symbols.CallableId
import org.jetbrains.kotlin.fir.symbols.impl.FirErrorFunctionSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirErrorFunctionSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.fir.types.ConeTypeParameterType
import org.jetbrains.kotlin.fir.types.FirTypeRef
import org.jetbrains.kotlin.fir.types.coneTypeSafe
import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
import org.jetbrains.kotlin.fir.types.impl.FirResolvedTypeRefImpl import org.jetbrains.kotlin.fir.types.impl.FirResolvedTypeRefImpl
@@ -95,8 +92,6 @@ abstract class BaseFirBuilder<T>(val session: FirSession, val context: Context =
/**** Common utils ****/ /**** Common utils ****/
companion object { companion object {
val KNPE = Name.identifier("KotlinNullPointerException")
val ANONYMOUS_OBJECT_NAME = Name.special("<anonymous>") val ANONYMOUS_OBJECT_NAME = Name.special("<anonymous>")
} }
@@ -149,7 +144,7 @@ abstract class BaseFirBuilder<T>(val session: FirSession, val context: Context =
} }
} }
fun KtClassOrObject?.toDelegatedSelfType(firClass: FirRegularClass): FirTypeRef { fun KtClassOrObject?.toDelegatedSelfType(firClass: FirRegularClass): FirResolvedTypeRef {
return FirResolvedTypeRefImpl( return FirResolvedTypeRefImpl(
this?.toFirSourceElement(), this?.toFirSourceElement(),
ConeClassLikeTypeImpl( ConeClassLikeTypeImpl(
@@ -183,7 +178,11 @@ abstract class BaseFirBuilder<T>(val session: FirSession, val context: Context =
if (lastLoop != null) { if (lastLoop != null) {
target.bind(lastLoop) target.bind(lastLoop)
} else { } else {
target.bind(FirErrorLoop(expression.getSourceOrNull(), FirSimpleDiagnostic("Cannot bind unlabeled jump to a loop", DiagnosticKind.Syntax))) target.bind(
FirErrorLoop(
expression.getSourceOrNull(), FirSimpleDiagnostic("Cannot bind unlabeled jump to a loop", DiagnosticKind.Syntax)
)
)
} }
} else { } else {
for (firLoop in context.firLoops.asReversed()) { for (firLoop in context.firLoops.asReversed()) {
@@ -192,7 +191,11 @@ abstract class BaseFirBuilder<T>(val session: FirSession, val context: Context =
return this return this
} }
} }
target.bind(FirErrorLoop(expression.getSourceOrNull(), FirSimpleDiagnostic("Cannot bind label $labelName to a loop", DiagnosticKind.Syntax))) target.bind(
FirErrorLoop(
expression.getSourceOrNull(), FirSimpleDiagnostic("Cannot bind label $labelName to a loop", DiagnosticKind.Syntax)
)
)
} }
return this return this
} }
@@ -240,16 +243,19 @@ abstract class BaseFirBuilder<T>(val session: FirSession, val context: Context =
FLOAT_CONSTANT -> FLOAT_CONSTANT ->
if (convertedText is Float) { if (convertedText is Float) {
FirConstExpressionImpl( FirConstExpressionImpl(
expression.getSourceOrNull(), FirConstKind.Float, convertedText, FirSimpleDiagnostic("Incorrect float: $text", DiagnosticKind.Syntax) expression.getSourceOrNull(), FirConstKind.Float, convertedText,
FirSimpleDiagnostic("Incorrect float: $text", DiagnosticKind.Syntax)
) )
} else { } else {
FirConstExpressionImpl( FirConstExpressionImpl(
expression.getSourceOrNull(), FirConstKind.Double, convertedText as Double, FirSimpleDiagnostic("Incorrect double: $text", DiagnosticKind.Syntax) expression.getSourceOrNull(), FirConstKind.Double, convertedText as Double,
FirSimpleDiagnostic("Incorrect double: $text", DiagnosticKind.Syntax)
) )
} }
CHARACTER_CONSTANT -> CHARACTER_CONSTANT ->
FirConstExpressionImpl( FirConstExpressionImpl(
expression.getSourceOrNull(), FirConstKind.Char, text.parseCharacter(), FirSimpleDiagnostic("Incorrect character: $text", DiagnosticKind.Syntax) expression.getSourceOrNull(), FirConstKind.Char, text.parseCharacter(),
FirSimpleDiagnostic("Incorrect character: $text", DiagnosticKind.Syntax)
) )
BOOLEAN_CONSTANT -> BOOLEAN_CONSTANT ->
FirConstExpressionImpl(expression.getSourceOrNull(), FirConstKind.Boolean, convertedText as Boolean) FirConstExpressionImpl(expression.getSourceOrNull(), FirConstKind.Boolean, convertedText as Boolean)
@@ -412,7 +418,8 @@ abstract class BaseFirBuilder<T>(val session: FirSession, val context: Context =
firMemberAccess.calleeReference firMemberAccess.calleeReference
} else { } else {
FirErrorNamedReferenceImpl( FirErrorNamedReferenceImpl(
left.getSourceOrNull(), FirSimpleDiagnostic("Unsupported qualified LValue: ${left.asText}", DiagnosticKind.Syntax) left.getSourceOrNull(),
FirSimpleDiagnostic("Unsupported qualified LValue: ${left.asText}", DiagnosticKind.Syntax)
) )
} }
} }
@@ -421,7 +428,9 @@ abstract class BaseFirBuilder<T>(val session: FirSession, val context: Context =
} }
} }
} }
return FirErrorNamedReferenceImpl(left.getSourceOrNull(), FirSimpleDiagnostic("Unsupported LValue: $tokenType", DiagnosticKind.Syntax)) return FirErrorNamedReferenceImpl(
left.getSourceOrNull(), FirSimpleDiagnostic("Unsupported LValue: $tokenType", DiagnosticKind.Syntax)
)
} }
fun T?.generateAssignment( fun T?.generateAssignment(
@@ -465,7 +474,10 @@ abstract class BaseFirBuilder<T>(val session: FirSession, val context: Context =
if (operation in FirOperation.ASSIGNMENTS && operation != FirOperation.ASSIGN) { if (operation in FirOperation.ASSIGNMENTS && operation != FirOperation.ASSIGN) {
return FirOperatorCallImpl(source, operation).apply { return FirOperatorCallImpl(source, operation).apply {
// TODO: take good psi // TODO: take good psi
arguments += this@generateAssignment?.convert() ?: FirErrorExpressionImpl(null, FirSimpleDiagnostic("Unsupported left value of assignment: ${source?.psi?.text}", DiagnosticKind.Syntax)) arguments += this@generateAssignment?.convert() ?:
FirErrorExpressionImpl(
null, FirSimpleDiagnostic("Unsupported left value of assignment: ${source?.psi?.text}", DiagnosticKind.Syntax)
)
arguments += value arguments += value
} }
} }
compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt
+2 -2
View File
@@ -279,7 +279,7 @@ internal fun generateDestructuringBlock(
FirComponentCallImpl(entrySource, generateResolvedAccessExpression(entrySource, container), index + 1), FirComponentCallImpl(entrySource, generateResolvedAccessExpression(entrySource, container), index + 1),
null, null,
isVar, isVar,
FirPropertySymbol(CallableId(entry.nameAsSafeName)), // TODO? FirPropertySymbol(entry.nameAsSafeName), // TODO?
true, true,
FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL) FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL)
).apply { ).apply {
@@ -302,7 +302,7 @@ fun generateTemporaryVariable(
initializer, initializer,
null, null,
false, false,
FirPropertySymbol(CallableId(name)), FirPropertySymbol(name),
true, true,
FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL) FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL)
).apply { ).apply {
compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
+59 -31
View File
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement
import org.jetbrains.kotlin.fir.impl.FirLabelImpl import org.jetbrains.kotlin.fir.impl.FirLabelImpl
import org.jetbrains.kotlin.fir.references.FirNamedReference import org.jetbrains.kotlin.fir.references.FirNamedReference
import org.jetbrains.kotlin.fir.references.impl.* import org.jetbrains.kotlin.fir.references.impl.*
import org.jetbrains.kotlin.fir.symbols.CallableId
import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.fir.symbols.impl.*
import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.scopes.FirScopeProvider
@@ -109,18 +108,25 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
convertSafe() ?: implicitUnitType convertSafe() ?: implicitUnitType
private fun KtTypeReference?.toFirOrErrorType(): FirTypeRef = private fun KtTypeReference?.toFirOrErrorType(): FirTypeRef =
convertSafe() ?: FirErrorTypeRefImpl(this?.toFirSourceElement(), FirSimpleDiagnostic(if (this == null) "Incomplete code" else "Conversion failed", DiagnosticKind.Syntax)) convertSafe() ?: FirErrorTypeRefImpl(
this?.toFirSourceElement(),
FirSimpleDiagnostic(if (this == null) "Incomplete code" else "Conversion failed", DiagnosticKind.Syntax)
)
// Here we accept lambda as receiver to prevent expression calculation in stub mode // Here we accept lambda as receiver to prevent expression calculation in stub mode
private fun (() -> KtExpression?).toFirExpression(errorReason: String): FirExpression = private fun (() -> KtExpression?).toFirExpression(errorReason: String): FirExpression =
if (stubMode) FirExpressionStub(null) if (stubMode) FirExpressionStub(null)
else with(this()) { else with(this()) {
convertSafe<FirExpression>() ?: FirErrorExpressionImpl(this?.toFirSourceElement(), FirSimpleDiagnostic(errorReason, DiagnosticKind.Syntax)) convertSafe<FirExpression>() ?: FirErrorExpressionImpl(
this?.toFirSourceElement(), FirSimpleDiagnostic(errorReason, DiagnosticKind.Syntax)
)
} }
private fun KtExpression?.toFirExpression(errorReason: String): FirExpression = private fun KtExpression?.toFirExpression(errorReason: String): FirExpression =
if (stubMode) FirExpressionStub(null) if (stubMode) FirExpressionStub(null)
else convertSafe<FirExpression>() ?: FirErrorExpressionImpl(this?.toFirSourceElement(), FirSimpleDiagnostic(errorReason, DiagnosticKind.Syntax)) else convertSafe<FirExpression>() ?: FirErrorExpressionImpl(
this?.toFirSourceElement(), FirSimpleDiagnostic(errorReason, DiagnosticKind.Syntax)
)
private fun KtExpression.toFirStatement(errorReason: String): FirStatement = private fun KtExpression.toFirStatement(errorReason: String): FirStatement =
convertSafe() ?: FirErrorExpressionImpl(this.toFirSourceElement(), FirSimpleDiagnostic(errorReason, DiagnosticKind.Syntax)) convertSafe() ?: FirErrorExpressionImpl(this.toFirSourceElement(), FirSimpleDiagnostic(errorReason, DiagnosticKind.Syntax))
@@ -129,17 +135,19 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
convert() convert()
private fun KtDeclaration.toFirDeclaration( private fun KtDeclaration.toFirDeclaration(
delegatedSuperType: FirTypeRef?, delegatedSelfType: FirTypeRef?, owner: KtClassOrObject, hasPrimaryConstructor: Boolean delegatedSuperType: FirTypeRef?, delegatedSelfType: FirResolvedTypeRef?, owner: KtClassOrObject, hasPrimaryConstructor: Boolean
): FirDeclaration { ): FirDeclaration {
return when (this) { return when (this) {
is KtSecondaryConstructor -> toFirConstructor( is KtSecondaryConstructor -> toFirConstructor(
delegatedSuperType, delegatedSuperType,
delegatedSelfType ?: FirErrorTypeRefImpl(this.toFirSourceElement(), FirSimpleDiagnostic("Constructor in object", DiagnosticKind.ConstructorInObject)), delegatedSelfType ?: FirErrorTypeRefImpl(
this.toFirSourceElement(), FirSimpleDiagnostic("Constructor in object", DiagnosticKind.ConstructorInObject)
),
owner, owner,
hasPrimaryConstructor hasPrimaryConstructor
) )
is KtEnumEntry -> toFirEnumEntry(delegatedSelfType!!) is KtEnumEntry -> toFirEnumEntry(delegatedSelfType!!)
else -> convert<FirDeclaration>() else -> convert()
} }
} }
@@ -170,7 +178,12 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
} }
private fun ValueArgument?.toFirExpression(): FirExpression { private fun ValueArgument?.toFirExpression(): FirExpression {
this ?: return FirErrorExpressionImpl((this as? KtElement)?.toFirSourceElement(), FirSimpleDiagnostic("No argument given", DiagnosticKind.Syntax)) if (this == null) {
return FirErrorExpressionImpl(
(this as? KtElement)?.toFirSourceElement(),
FirSimpleDiagnostic("No argument given", DiagnosticKind.Syntax)
)
}
val name = this.getArgumentName()?.asName val name = this.getArgumentName()?.asName
val expression = this.getArgumentExpression() val expression = this.getArgumentExpression()
val firExpression = when (expression) { val firExpression = when (expression) {
@@ -243,7 +256,7 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
else -> null.toFirOrImplicitType() else -> null.toFirOrImplicitType()
}, },
name, name,
FirVariableSymbol(CallableId(name)), FirVariableSymbol(name),
if (hasDefaultValue()) { if (hasDefaultValue()) {
{ defaultValue }.toFirExpression("Should have default value") { defaultValue }.toFirExpression("Should have default value")
} else null, } else null,
@@ -465,7 +478,7 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
return firFile return firFile
} }
private fun KtEnumEntry.toFirEnumEntry(delegatedEnumSelfTypeRef: FirTypeRef): FirDeclaration { private fun KtEnumEntry.toFirEnumEntry(delegatedEnumSelfTypeRef: FirResolvedTypeRef): FirDeclaration {
val obj = FirAnonymousObjectImpl( val obj = FirAnonymousObjectImpl(
source = toFirSourceElement(), source = toFirSourceElement(),
session, session,
@@ -473,21 +486,29 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
scopeProvider, scopeProvider,
FirAnonymousObjectSymbol() FirAnonymousObjectSymbol()
) )
val delegatedEntrySelfType =
FirResolvedTypeRefImpl(source = null, ConeClassLikeTypeImpl(obj.symbol.toLookupTag(), emptyArray(), isNullable = false)) val delegatedEntrySelfType = FirResolvedTypeRefImpl(
source = null,
type = ConeClassLikeTypeImpl(obj.symbol.toLookupTag(), emptyArray(), isNullable = false)
)
extractAnnotationsTo(obj) extractAnnotationsTo(obj)
obj.superTypeRefs += delegatedEnumSelfTypeRef obj.superTypeRefs += delegatedEnumSelfTypeRef
val superTypeCallEntry = superTypeListEntries.firstIsInstanceOrNull<KtSuperTypeCallEntry>()
val correctedEnumSelfTypeRef = FirResolvedTypeRefImpl(
source = superTypeCallEntry?.calleeExpression?.typeReference?.toFirSourceElement(),
type = delegatedEnumSelfTypeRef.type
)
obj.declarations += primaryConstructor.toFirConstructor( obj.declarations += primaryConstructor.toFirConstructor(
superTypeListEntries.firstIsInstanceOrNull(), superTypeCallEntry,
delegatedEnumSelfTypeRef, correctedEnumSelfTypeRef,
delegatedEntrySelfType, delegatedEntrySelfType,
owner = this owner = this
) )
for (declaration in declarations) { for (declaration in declarations) {
obj.declarations += declaration.toFirDeclaration( obj.declarations += declaration.toFirDeclaration(
delegatedEnumSelfTypeRef, correctedEnumSelfTypeRef,
delegatedSelfType = delegatedEntrySelfType, delegatedSelfType = delegatedEntrySelfType,
this, this,
hasPrimaryConstructor = true hasPrimaryConstructor = true
@@ -581,7 +602,8 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
firClass.declarations.filterIsInstance<FirProperty>() firClass.declarations.filterIsInstance<FirProperty>()
) )
zippedParameters.generateComponentFunctions( zippedParameters.generateComponentFunctions(
session, firClass, context.packageFqName, context.className, firPrimaryConstructor) session, firClass, context.packageFqName, context.className, firPrimaryConstructor
)
zippedParameters.generateCopyFunction( zippedParameters.generateCopyFunction(
session, classOrObject, firClass, context.packageFqName, context.className, firPrimaryConstructor session, classOrObject, firClass, context.packageFqName, context.className, firPrimaryConstructor
) )
@@ -646,7 +668,9 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
} }
val receiverType = function.receiverTypeReference.convertSafe<FirTypeRef>() val receiverType = function.receiverTypeReference.convertSafe<FirTypeRef>()
val firFunction = if (function.name == null) { val firFunction = if (function.name == null) {
FirAnonymousFunctionImpl(function.toFirSourceElement(), session, returnType, receiverType, FirAnonymousFunctionSymbol(), isLambda = false) FirAnonymousFunctionImpl(
function.toFirSourceElement(), session, returnType, receiverType, FirAnonymousFunctionSymbol(), isLambda = false
)
} else { } else {
val status = FirDeclarationStatusImpl( val status = FirDeclarationStatusImpl(
if (function.isLocal) Visibilities.LOCAL else function.visibility, if (function.isLocal) Visibilities.LOCAL else function.visibility,
@@ -690,7 +714,9 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
val literalSource = literal.toFirSourceElement() val literalSource = literal.toFirSourceElement()
val returnType = FirImplicitTypeRefImpl(literalSource) val returnType = FirImplicitTypeRefImpl(literalSource)
val receiverType = FirImplicitTypeRefImpl(literalSource) val receiverType = FirImplicitTypeRefImpl(literalSource)
return FirAnonymousFunctionImpl(literalSource, session, returnType, receiverType, FirAnonymousFunctionSymbol(), isLambda = true).apply { return FirAnonymousFunctionImpl(
literalSource, session, returnType, receiverType, FirAnonymousFunctionSymbol(), isLambda = true
).apply {
context.firFunctions += this context.firFunctions += this
var destructuringBlock: FirExpression? = null var destructuringBlock: FirExpression? = null
for (valueParameter in literal.valueParameters) { for (valueParameter in literal.valueParameters) {
@@ -828,7 +854,7 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
) )
}, },
isVar, isVar,
FirPropertySymbol(CallableId(name)), FirPropertySymbol(name),
true, true,
FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL) FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL)
).apply { ).apply {
@@ -1063,7 +1089,7 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
is KtVariableDeclaration -> { is KtVariableDeclaration -> {
val name = ktSubjectExpression.nameAsSafeName val name = ktSubjectExpression.nameAsSafeName
FirPropertyImpl( FirPropertyImpl(
ktSubjectExpression?.toFirSourceElement(), ktSubjectExpression.toFirSourceElement(),
session, session,
ktSubjectExpression.typeReference.toFirOrImplicitType(), ktSubjectExpression.typeReference.toFirOrImplicitType(),
null, null,
@@ -1071,7 +1097,7 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
subjectExpression, subjectExpression,
null, null,
false, false,
FirPropertySymbol(CallableId(name)), FirPropertySymbol(name),
true, true,
FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL) FirDeclarationStatusImpl(Visibilities.LOCAL, Modality.FINAL)
) )
@@ -1081,14 +1107,13 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
val hasSubject = subjectExpression != null val hasSubject = subjectExpression != null
val subject = FirWhenSubject() val subject = FirWhenSubject()
return FirWhenExpressionImpl( return FirWhenExpressionImpl(
expression?.toFirSourceElement(), expression.toFirSourceElement(),
subjectExpression, subjectExpression,
subjectVariable subjectVariable
).apply { ).apply {
if (hasSubject) { if (hasSubject) {
subject.bind(this) subject.bind(this)
} }
var thereIsElseBranch = false
for (entry in expression.entries) { for (entry in expression.entries) {
val entrySource = entry.toFirSourceElement() val entrySource = entry.toFirSourceElement()
val branch = entry.expression.toFirBlock() val branch = entry.expression.toFirBlock()
@@ -1107,13 +1132,9 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
FirWhenBranchImpl(entrySource, firCondition, branch) FirWhenBranchImpl(entrySource, firCondition, branch)
} }
} else { } else {
thereIsElseBranch = true
FirWhenBranchImpl(entrySource, FirElseIfTrueCondition(null), branch) FirWhenBranchImpl(entrySource, FirElseIfTrueCondition(null), branch)
} }
} }
// if (!thereIsElseBranch) {
// branches += FirWhenBranchImpl(null, FirElseIfTrueCondition(null), FirEmptyExpressionBlock())
// }
} }
} }
@@ -1351,7 +1372,9 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
override fun visitQualifiedExpression(expression: KtQualifiedExpression, data: Unit): FirElement { override fun visitQualifiedExpression(expression: KtQualifiedExpression, data: Unit): FirElement {
val selector = expression.selectorExpression val selector = expression.selectorExpression
?: return FirErrorExpressionImpl(expression.toFirSourceElement(), FirSimpleDiagnostic("Qualified expression without selector", DiagnosticKind.Syntax)) ?: return FirErrorExpressionImpl(
expression.toFirSourceElement(), FirSimpleDiagnostic("Qualified expression without selector", DiagnosticKind.Syntax)
)
val firSelector = selector.toFirExpression("Incorrect selector expression") val firSelector = selector.toFirExpression("Incorrect selector expression")
if (firSelector is FirModifiableQualifiedAccess) { if (firSelector is FirModifiableQualifiedAccess) {
firSelector.safe = expression is KtSafeQualifiedExpression firSelector.safe = expression is KtSafeQualifiedExpression
@@ -1375,7 +1398,8 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
} }
override fun visitParenthesizedExpression(expression: KtParenthesizedExpression, data: Unit): FirElement { override fun visitParenthesizedExpression(expression: KtParenthesizedExpression, data: Unit): FirElement {
return expression.expression?.accept(this, data) ?: FirErrorExpressionImpl(expression.toFirSourceElement(), FirSimpleDiagnostic("Empty parentheses", DiagnosticKind.Syntax)) return expression.expression?.accept(this, data)
?: FirErrorExpressionImpl(expression.toFirSourceElement(), FirSimpleDiagnostic("Empty parentheses", DiagnosticKind.Syntax))
} }
override fun visitLabeledExpression(expression: KtLabeledExpression, data: Unit): FirElement { override fun visitLabeledExpression(expression: KtLabeledExpression, data: Unit): FirElement {
@@ -1385,7 +1409,8 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
if (labelName != null) { if (labelName != null) {
context.firLabels += FirLabelImpl(source, labelName) context.firLabels += FirLabelImpl(source, labelName)
} }
val result = expression.baseExpression?.accept(this, data) ?: FirErrorExpressionImpl(source, FirSimpleDiagnostic("Empty label", DiagnosticKind.Syntax)) val result = expression.baseExpression?.accept(this, data)
?: FirErrorExpressionImpl(source, FirSimpleDiagnostic("Empty label", DiagnosticKind.Syntax))
if (size != context.firLabels.size) { if (size != context.firLabels.size) {
context.firLabels.removeLast() context.firLabels.removeLast()
println("Unused label: ${expression.text}") println("Unused label: ${expression.text}")
@@ -1396,7 +1421,10 @@ class RawFirBuilder(session: FirSession, val scopeProvider: FirScopeProvider, va
override fun visitAnnotatedExpression(expression: KtAnnotatedExpression, data: Unit): FirElement { override fun visitAnnotatedExpression(expression: KtAnnotatedExpression, data: Unit): FirElement {
val rawResult = expression.baseExpression?.accept(this, data) val rawResult = expression.baseExpression?.accept(this, data)
val result = rawResult as? FirAbstractAnnotatedElement val result = rawResult as? FirAbstractAnnotatedElement
?: FirErrorExpressionImpl(expression.toFirSourceElement(), FirSimpleDiagnostic("Strange annotated expression: ${rawResult?.render()}", DiagnosticKind.Syntax)) ?: FirErrorExpressionImpl(
expression.toFirSourceElement(),
FirSimpleDiagnostic("Strange annotated expression: ${rawResult?.render()}", DiagnosticKind.Syntax)
)
expression.extractAnnotationsTo(result) expression.extractAnnotationsTo(result)
return result return result
} }
compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirVariableSymbol.kt
+4 -2
View File
@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.name.Name
open class FirVariableSymbol<D : FirVariable<D>>(override val callableId: CallableId) : FirCallableSymbol<D>() { open class FirVariableSymbol<D : FirVariable<D>>(override val callableId: CallableId) : FirCallableSymbol<D>() {
@Deprecated("TODO: Better solution for local vars?")
constructor(name: Name) : this(CallableId(name)) // TODO? constructor(name: Name) : this(CallableId(name)) // TODO?
} }
@@ -23,7 +22,10 @@ open class FirPropertySymbol(
val isFakeOverride: Boolean = false, val isFakeOverride: Boolean = false,
// Actual for fake override only // Actual for fake override only
override val overriddenSymbol: FirPropertySymbol? = null override val overriddenSymbol: FirPropertySymbol? = null
) : FirVariableSymbol<FirProperty>(callableId) ) : FirVariableSymbol<FirProperty>(callableId) {
// TODO: should we use this constructor for local variables?
constructor(name: Name) : this(CallableId(name))
}
class FirBackingFieldSymbol(callableId: CallableId) : FirVariableSymbol<FirProperty>(callableId) class FirBackingFieldSymbol(callableId: CallableId) : FirVariableSymbol<FirProperty>(callableId)