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

FIR: use StandardNames (instead of hardcoded constants)

Browse Source
This commit is contained in:
Jinseong Jeon
2022-02-11 14:08:51 -08:00
committed by Ilya Kirillov
parent 3651c4984a
commit 2599c1dbb6
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/src/org/jetbrains/kotlin/fir/EnumClassUtils.kt
+5 -7
View File
@@ -6,6 +6,9 @@
package org.jetbrains.kotlin.fir package org.jetbrains.kotlin.fir
import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtFakeSourceElementKind
import org.jetbrains.kotlin.builtins.StandardNames.DEFAULT_VALUE_PARAMETER
import org.jetbrains.kotlin.builtins.StandardNames.ENUM_VALUES
import org.jetbrains.kotlin.builtins.StandardNames.ENUM_VALUE_OF
import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.fakeElement import org.jetbrains.kotlin.fakeElement
@@ -26,13 +29,8 @@ import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
import org.jetbrains.kotlin.fir.types.impl.FirImplicitStringTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitStringTypeRef
import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.CallableId
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.name.StandardClassIds
private val ENUM_VALUES = Name.identifier("values")
private val ENUM_VALUE_OF = Name.identifier("valueOf")
private val VALUE = Name.identifier("value")
fun FirRegularClassBuilder.generateValuesFunction( fun FirRegularClassBuilder.generateValuesFunction(
moduleData: FirModuleData, packageFqName: FqName, classFqName: FqName, makeExpect: Boolean = false moduleData: FirModuleData, packageFqName: FqName, classFqName: FqName, makeExpect: Boolean = false
) { ) {
@@ -94,8 +92,8 @@ fun FirRegularClassBuilder.generateValueOfFunction(
origin = FirDeclarationOrigin.Source origin = FirDeclarationOrigin.Source
this.moduleData = moduleData this.moduleData = moduleData
returnTypeRef = FirImplicitStringTypeRef(source) returnTypeRef = FirImplicitStringTypeRef(source)
name = VALUE name = DEFAULT_VALUE_PARAMETER
this@vp.symbol = FirValueParameterSymbol(VALUE) this@vp.symbol = FirValueParameterSymbol(DEFAULT_VALUE_PARAMETER)
isCrossinline = false isCrossinline = false
isNoinline = false isNoinline = false
isVararg = false isVararg = false