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

Rename & make public: Collection.collect -> collectForMangler

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-05-27 18:29:30 +03:00
parent ecb48b7ed9
commit a239604c24
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt
+6 -6
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.backend.common.serialization.mangle.descriptor
import org.jetbrains.kotlin.backend.common.serialization.mangle.KotlinMangleComputer import org.jetbrains.kotlin.backend.common.serialization.mangle.KotlinMangleComputer
import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleConstant import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleConstant
import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleMode import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleMode
import org.jetbrains.kotlin.backend.common.serialization.mangle.collect import org.jetbrains.kotlin.backend.common.serialization.mangle.collectForMangler
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.typeUtil.isUnit import org.jetbrains.kotlin.types.typeUtil.isUnit
@@ -115,12 +115,12 @@ abstract class DescriptorMangleComputer(protected val builder: StringBuilder, pr
mangleExtensionReceiverParameter(builder, it) mangleExtensionReceiverParameter(builder, it)
} }
valueParameters.collect(builder, MangleConstant.VALUE_PARAMETERS) { valueParameters.collectForMangler(builder, MangleConstant.VALUE_PARAMETERS) {
appendSignature(specialValueParamPrefix(it)) appendSignature(specialValueParamPrefix(it))
mangleValueParameter(this, it) mangleValueParameter(this, it)
} }
realTypeParameterContainer.typeParameters.filter { it.containingDeclaration == realTypeParameterContainer } realTypeParameterContainer.typeParameters.filter { it.containingDeclaration == realTypeParameterContainer }
.collect(builder, MangleConstant.TYPE_PARAMETERS) { mangleTypeParameter(this, it) } .collectForMangler(builder, MangleConstant.TYPE_PARAMETERS) { mangleTypeParameter(this, it) }
returnType?.run { returnType?.run {
if (!isCtor && !isUnit() && addReturnType()) { if (!isCtor && !isUnit() && addReturnType()) {
@@ -148,7 +148,7 @@ abstract class DescriptorMangleComputer(protected val builder: StringBuilder, pr
tpBuilder.appendSignature(param.index) tpBuilder.appendSignature(param.index)
tpBuilder.appendSignature(MangleConstant.UPPER_BOUND_SEPARATOR) tpBuilder.appendSignature(MangleConstant.UPPER_BOUND_SEPARATOR)
param.upperBounds.collect(tpBuilder, MangleConstant.UPPER_BOUNDS) { mangleType(this, it) } param.upperBounds.collectForMangler(tpBuilder, MangleConstant.UPPER_BOUNDS) { mangleType(this, it) }
} }
private fun mangleType(tBuilder: StringBuilder, wtype: KotlinType) { private fun mangleType(tBuilder: StringBuilder, wtype: KotlinType) {
@@ -173,7 +173,7 @@ abstract class DescriptorMangleComputer(protected val builder: StringBuilder, pr
} }
type.arguments.ifNotEmpty { type.arguments.ifNotEmpty {
collect(tBuilder, MangleConstant.TYPE_ARGUMENTS) { arg -> collectForMangler(tBuilder, MangleConstant.TYPE_ARGUMENTS) { arg ->
if (arg.isStarProjection) { if (arg.isStarProjection) {
appendSignature(MangleConstant.STAR_MARK) appendSignature(MangleConstant.STAR_MARK)
} else { } else {
@@ -268,7 +268,7 @@ abstract class DescriptorMangleComputer(protected val builder: StringBuilder, pr
mangleExtensionReceiverParameter(builder, extensionReceiver) mangleExtensionReceiverParameter(builder, extensionReceiver)
} }
descriptor.typeParameters.collect(builder, MangleConstant.TYPE_PARAMETERS) { mangleTypeParameter(this, it) } descriptor.typeParameters.collectForMangler(builder, MangleConstant.TYPE_PARAMETERS) { mangleTypeParameter(this, it) }
builder.append(descriptor.name.asString()) builder.append(descriptor.name.asString())
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ir/IrMangleComputer.kt
+6 -6
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.backend.common.serialization.mangle.ir
import org.jetbrains.kotlin.backend.common.serialization.mangle.KotlinMangleComputer import org.jetbrains.kotlin.backend.common.serialization.mangle.KotlinMangleComputer
import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleConstant import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleConstant
import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleMode import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleMode
import org.jetbrains.kotlin.backend.common.serialization.mangle.collect import org.jetbrains.kotlin.backend.common.serialization.mangle.collectForMangler
import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.symbols.IrClassSymbol import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
@@ -110,11 +110,11 @@ abstract class IrMangleComputer(protected val builder: StringBuilder, private va
mangleValueParameter(builder, it) mangleValueParameter(builder, it)
} }
valueParameters.collect(builder, MangleConstant.VALUE_PARAMETERS) { valueParameters.collectForMangler(builder, MangleConstant.VALUE_PARAMETERS) {
appendSignature(specialValueParamPrefix(it)) appendSignature(specialValueParamPrefix(it))
mangleValueParameter(this, it) mangleValueParameter(this, it)
} }
typeParameters.collect(builder, MangleConstant.TYPE_PARAMETERS) { mangleTypeParameter(this, it) } typeParameters.collectForMangler(builder, MangleConstant.TYPE_PARAMETERS) { mangleTypeParameter(this, it) }
if (!isCtor && !returnType.isUnit() && addReturnType()) { if (!isCtor && !returnType.isUnit() && addReturnType()) {
mangleType(builder, returnType) mangleType(builder, returnType)
@@ -137,7 +137,7 @@ abstract class IrMangleComputer(protected val builder: StringBuilder, private va
tpBuilder.appendSignature(param.index) tpBuilder.appendSignature(param.index)
tpBuilder.appendSignature(MangleConstant.UPPER_BOUND_SEPARATOR) tpBuilder.appendSignature(MangleConstant.UPPER_BOUND_SEPARATOR)
param.superTypes.collect(tpBuilder, MangleConstant.UPPER_BOUNDS) { mangleType(this, it) } param.superTypes.collectForMangler(tpBuilder, MangleConstant.UPPER_BOUNDS) { mangleType(this, it) }
} }
private fun StringBuilder.mangleTypeParameterReference(typeParameter: IrTypeParameter) { private fun StringBuilder.mangleTypeParameterReference(typeParameter: IrTypeParameter) {
@@ -159,7 +159,7 @@ abstract class IrMangleComputer(protected val builder: StringBuilder, private va
} }
type.arguments.ifNotEmpty { type.arguments.ifNotEmpty {
collect(tBuilder, MangleConstant.TYPE_ARGUMENTS) { arg -> collectForMangler(tBuilder, MangleConstant.TYPE_ARGUMENTS) { arg ->
when (arg) { when (arg) {
is IrStarProjection -> appendSignature(MangleConstant.STAR_MARK) is IrStarProjection -> appendSignature(MangleConstant.STAR_MARK)
is IrTypeProjection -> { is IrTypeProjection -> {
@@ -217,7 +217,7 @@ abstract class IrMangleComputer(protected val builder: StringBuilder, private va
val typeParameters = accessor.typeParameters val typeParameters = accessor.typeParameters
typeParameters.collect(builder, MangleConstant.TYPE_PARAMETERS) { mangleTypeParameter(this, it) } typeParameters.collectForMangler(builder, MangleConstant.TYPE_PARAMETERS) { mangleTypeParameter(this, it) }
builder.append(declaration.name.asString()) builder.append(declaration.name.asString())
} }
compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/mangleUtils.kt
+1 -1
View File
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.backend.common.serialization.mangle
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
internal fun <T> Collection<T>.collect(builder: StringBuilder, params: MangleConstant, collect: StringBuilder.(T) -> Unit) { fun <T> Collection<T>.collectForMangler(builder: StringBuilder, params: MangleConstant, collect: StringBuilder.(T) -> Unit) {
var first = true var first = true
builder.append(params.prefix) builder.append(params.prefix)