K2. Minor. Rename FirConstExpression to FirLiteralExpression

FirConstExpression is usually confused with "constant" calculations,
while in fact, it just denotes a simple literal expression
and `1 + 1` isn't represented by a FirConstExpression.

^KT-64314 Fixed
This commit is contained in:
Simon Ogorodnik
2024-01-12 18:44:13 +01:00
committed by Space Team
parent 213967e25c
commit 53e89a9722
105 changed files with 300 additions and 295 deletions
@@ -470,14 +470,14 @@ abstract class AbstractRawFirBuilder<T>(val baseSession: FirSession, val context
)
}
BOOLEAN_CONSTANT ->
buildConstExpression(
buildLiteralExpression(
sourceElement,
ConstantValueKind.Boolean,
convertedText as Boolean,
setType = false
)
NULL ->
buildConstExpression(
buildLiteralExpression(
sourceElement,
ConstantValueKind.Null,
null,
@@ -503,7 +503,7 @@ abstract class AbstractRawFirBuilder<T>(val baseSession: FirSession, val context
receiver: FirExpression,
operationToken: IElementType,
): FirExpression? {
if (receiver !is FirConstExpression<*>) return null
if (receiver !is FirLiteralExpression<*>) return null
if (receiver.kind != ConstantValueKind.IntegerLiteral) return null
if (operationToken != PLUS && operationToken != MINUS) return null
@@ -514,7 +514,7 @@ abstract class AbstractRawFirBuilder<T>(val baseSession: FirSession, val context
else -> error("Should not be here")
}
return buildConstExpression(
return buildLiteralExpression(
source.toFirSourceElement(),
ConstantValueKind.IntegerLiteral,
convertedValue,
@@ -537,7 +537,7 @@ abstract class AbstractRawFirBuilder<T>(val baseSession: FirSession, val context
OPEN_QUOTE, CLOSING_QUOTE -> continue@L
LITERAL_STRING_TEMPLATE_ENTRY -> {
sb.append(entry.asText)
buildConstExpression(
buildLiteralExpression(
entry.toFirSourceElement(), ConstantValueKind.String, entry.asText, setType = false
)
}
@@ -571,7 +571,7 @@ abstract class AbstractRawFirBuilder<T>(val baseSession: FirSession, val context
source = base?.toFirSourceElement()
// Fast-pass if there is no errors and non-const string expressions
if (!hasExpressions && !argumentList.arguments.any { it is FirErrorExpression })
return buildConstExpression(source, ConstantValueKind.String, sb.toString(), setType = false)
return buildLiteralExpression(source, ConstantValueKind.String, sb.toString(), setType = false)
}
}
@@ -363,7 +363,7 @@ fun <T> FirPropertyBuilder.generateAccessorsByDelegate(
}
coneTypeOrNull = context.dispatchReceiverTypesStack.last()
}
else -> buildConstExpression(null, ConstantValueKind.Null, null, setType = false)
else -> buildLiteralExpression(null, ConstantValueKind.Null, null, setType = false)
}
fun delegateAccess() = buildPropertyAccessExpression {