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

Unify and use names of synthetic members of data class

Browse Source
This commit is contained in:
Jinseong Jeon
2021-09-23 23:30:22 -07:00
committed by Ilya Kirillov
parent 8c97f0c3a1
commit c8047f8384
5 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt
+1 -4
View File
@@ -5,10 +5,10 @@
package org.jetbrains.kotlin.fir.analysis.checkers
import org.jetbrains.kotlin.builtins.StandardNames.HASHCODE_NAME
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.descriptors.Visibility
import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget
import org.jetbrains.kotlin.fir.*
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
@@ -32,12 +32,9 @@ import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
import org.jetbrains.kotlin.fir.symbols.SymbolInternals
import org.jetbrains.kotlin.fir.symbols.impl.*
import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.name.*
import org.jetbrains.kotlin.psi.KtModifierList
import org.jetbrains.kotlin.psi.KtParameter.VAL_VAR_TOKEN_SET
import org.jetbrains.kotlin.psi.psiUtil.visibilityModifierType
import org.jetbrains.kotlin.resolve.AnnotationTargetList
import org.jetbrains.kotlin.resolve.AnnotationTargetLists
import org.jetbrains.kotlin.types.AbstractTypeChecker
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirMethodOfAnyImplementedInInterfaceChecker.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.fir.analysis.checkers.declaration
import org.jetbrains.kotlin.fir.HASHCODE_NAME
import org.jetbrains.kotlin.builtins.StandardNames.HASHCODE_NAME
import org.jetbrains.kotlin.fir.analysis.checkers.FirDeclarationPresenter
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/DataClassMembersGenerator.kt
+3 -3
View File
@@ -5,9 +5,9 @@
package org.jetbrains.kotlin.fir.backend.generators
import org.jetbrains.kotlin.builtins.StandardNames.DATA_CLASS_COPY
import org.jetbrains.kotlin.builtins.StandardNames.HASHCODE_NAME
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.fir.COPY_NAME
import org.jetbrains.kotlin.fir.HASHCODE_NAME
import org.jetbrains.kotlin.fir.backend.Fir2IrComponents
import org.jetbrains.kotlin.fir.backend.FirMetadataSource
import org.jetbrains.kotlin.fir.backend.declareThisReceiverParameter
@@ -330,7 +330,7 @@ class DataClassMembersGenerator(val components: Fir2IrComponents) {
companion object {
fun isCopy(irFunction: IrFunction): Boolean =
irFunction.name == COPY_NAME
irFunction.name == DATA_CLASS_COPY
fun isComponentN(irFunction: IrFunction): Boolean {
if (irFunction.name.isSpecial) {
compiler/fir/tree/src/org/jetbrains/kotlin/fir/DefaultNames.kt
-12
View File
@@ -1,12 +0,0 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.fir
import org.jetbrains.kotlin.name.Name
// Data class synthetic members
val COPY_NAME = Name.identifier("copy")
val HASHCODE_NAME = Name.identifier("hashCode")
core/compiler.common/src/org/jetbrains/kotlin/builtins/StandardNames.kt
+4
View File
@@ -24,6 +24,10 @@ object StandardNames {
@JvmField val ENUM_VALUE_OF = Name.identifier("valueOf")
@JvmField val DATA_CLASS_COPY = Name.identifier("copy")
@JvmField val HASHCODE_NAME = Name.identifier("hashCode")
@JvmField val CHAR_CODE = Name.identifier("code")
@JvmField val COROUTINES_PACKAGE_FQ_NAME = FqName("kotlin.coroutines")