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

[K/N] Migrate compiler, interop and others to new case conversion api

Browse Source
This commit is contained in:
Abduqodiri Qurbonzoda
2021-04-08 02:34:32 +03:00
parent a4839b8548
commit 983985bc68
13 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/KotlinCodeModel.kt
+2 -2
View File
@@ -224,12 +224,12 @@ object KotlinTypes {
private open class ClassifierAtPackage(val pkg: String) {
operator fun getValue(thisRef: KotlinTypes, property: KProperty<*>): Classifier =
Classifier.topLevel(pkg, property.name.capitalize())
Classifier.topLevel(pkg, property.name.replaceFirstChar(Char::uppercaseChar))
}
private open class TypeAtPackage(val pkg: String) {
operator fun getValue(thisRef: KotlinTypes, property: KProperty<*>): KotlinClassifierType =
Classifier.topLevel(pkg, property.name.capitalize()).type
Classifier.topLevel(pkg, property.name.replaceFirstChar(Char::uppercaseChar)).type
}
private object BuiltInType : TypeAtPackage("kotlin")
kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/ObjCStubs.kt
+2 -2
View File
@@ -56,7 +56,7 @@ private fun ObjCMethod.getFirstKotlinParameterNameCandidate(forConstructorOrFact
val selectorPart = this.selector.takeWhile { it != ':' }.trimStart('_')
if (selectorPart.startsWith("init")) {
selectorPart.removePrefix("init").removePrefix("With")
.takeIf { it.isNotEmpty() }?.let { return it.decapitalize() }
.takeIf { it.isNotEmpty() }?.let { return it.replaceFirstChar(Char::lowercaseChar) }
}
}
@@ -69,7 +69,7 @@ private fun ObjCMethod.getKotlinParameters(
): List<FunctionParameterStub> {
if (this.isInit && this.parameters.isEmpty() && this.selector != "init") {
// Create synthetic Unit parameter, just like Swift does in this case:
val parameterName = this.selector.removePrefix("init").removePrefix("With").decapitalize()
val parameterName = this.selector.removePrefix("init").removePrefix("With").replaceFirstChar(Char::lowercaseChar)
return listOf(FunctionParameterStub(parameterName, KotlinTypes.unit.toStubIrType()))
// Note: this parameter is explicitly handled in compiler.
}
kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrElementBuilders.kt
+1 -1
View File
@@ -392,7 +392,7 @@ internal class EnumStubBuilder(
)
}
private fun EnumConstant.isMoreCanonicalThan(other: EnumConstant): Boolean = with(other.name.toLowerCase()) {
private fun EnumConstant.isMoreCanonicalThan(other: EnumConstant): Boolean = with(other.name.lowercase()) {
contains("min") || contains("max") ||
contains("first") || contains("last") ||
contains("begin") || contains("end")
kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/CommandLine.kt
+1 -1
View File
@@ -128,7 +128,7 @@ class JSInteropArguments(argParser: ArgParser = ArgParser("jsinterop",
enum class TargetType {
WASM32;
override fun toString() = name.toLowerCase()
override fun toString() = name.lowercase()
}
val target by argParser.option(ArgType.Choice<TargetType>(),
description = "wasm target to compile to").default(TargetType.WASM32)
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CAdapterGenerator.kt
+3 -3
View File
@@ -810,8 +810,8 @@ internal class CAdapterGenerator(val context: Context) : DeclarationDescriptorVi
val exportedSymbol = "${prefix}_symbols"
exportedSymbols += exportedSymbol
output("#ifndef KONAN_${prefix.toUpperCase()}_H")
output("#define KONAN_${prefix.toUpperCase()}_H")
output("#ifndef KONAN_${prefix.uppercase()}_H")
output("#define KONAN_${prefix.uppercase()}_H")
// TODO: use namespace for C++ case?
output("""
#ifdef __cplusplus
@@ -882,7 +882,7 @@ internal class CAdapterGenerator(val context: Context) : DeclarationDescriptorVi
} /* extern "C" */
#endif""".trimIndent())
output("#endif /* KONAN_${prefix.toUpperCase()}_H */")
output("#endif /* KONAN_${prefix.uppercase()}_H */")
outputStreamWriter.close()
println("Produced library API in ${prefix}_api.h")
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanReflectionTypes.kt
+1 -1
View File
@@ -32,7 +32,7 @@ class KonanReflectionTypes(module: ModuleDescriptor, internalPackage: FqName) {
private class ClassLookup(val memberScope: MemberScope) {
operator fun getValue(types: KonanReflectionTypes, property: KProperty<*>): ClassDescriptor {
return types.find(memberScope, property.name.capitalize())
return types.find(memberScope, property.name.replaceFirstChar(Char::uppercaseChar))
}
}
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/Ir.kt
+3 -3
View File
@@ -90,7 +90,7 @@ internal class KonanSymbols(
val integerConversions = allIntegerClasses.flatMap { fromClass ->
allIntegerClasses.map { toClass ->
val name = Name.identifier("to${toClass.descriptor.name.asString().capitalize()}")
val name = Name.identifier("to${toClass.descriptor.name.asString().replaceFirstChar(Char::uppercaseChar)}")
val descriptor = if (fromClass in signedIntegerClasses && toClass in unsignedIntegerClasses) {
builtInsPackage("kotlin")
.getContributedFunctions(name, NoLookupLocation.FROM_BACKEND)
@@ -222,11 +222,11 @@ internal class KonanSymbols(
val getNativeNullPtr = symbolTable.referenceSimpleFunction(context.getNativeNullPtr)
val boxCachePredicates = BoxCache.values().associate {
it to internalFunction("in${it.name.toLowerCase().capitalize()}BoxCache")
it to internalFunction("in${it.name.lowercase().replaceFirstChar(Char::uppercaseChar)}BoxCache")
}
val boxCacheGetters = BoxCache.values().associate {
it to internalFunction("getCached${it.name.toLowerCase().capitalize()}Box")
it to internalFunction("getCached${it.name.lowercase().replaceFirstChar(Char::uppercaseChar)}Box")
}
val immutableBlob = symbolTable.referenceClass(
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt
+1 -1
View File
@@ -289,7 +289,7 @@ private class InteropLoweringPart1(val context: Context) : BaseInteropIrTransfor
require(property.descriptor.type.isObjCObjectType()) { renderCompilerError(property) }
val name = property.name.asString()
val selector = "set${name.capitalize()}:"
val selector = "set${name.replaceFirstChar(Char::uppercaseChar)}:"
return generateFunctionImp(selector, property.setter!!)
}
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt
+1 -1
View File
@@ -558,7 +558,7 @@ internal class ObjCExportTranslatorImpl(
// Note: the condition below is similar to "toObjCMethods" logic in [ObjCExportedInterface.createCodeSpec].
if (propertySetter != null && mapper.shouldBeExposed(propertySetter)) {
val setterSelector = mapper.getBaseMethods(propertySetter).map { namer.getSelector(it) }.distinct().single()
setterName = if (setterSelector != "set" + name.capitalize() + ":") setterSelector else null
setterName = if (setterSelector != "set" + name.replaceFirstChar(Char::uppercaseChar) + ":") setterSelector else null
} else {
attributes += "readonly"
setterName = null
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportMapper.kt
+3 -3
View File
@@ -378,12 +378,12 @@ internal enum class NSNumberKind(val mappedKotlinClassId: ClassId?, val objCType
// UNSIGNED_SHORT -> unsignedShort
private val kindName = this.name.split('_')
.joinToString("") { it.toLowerCase().capitalize() }.decapitalize()
.joinToString("") { it.lowercase().replaceFirstChar(Char::uppercaseChar) }.replaceFirstChar(Char::lowercaseChar)
val valueSelector = kindName // unsignedShort
val initSelector = "initWith${kindName.capitalize()}:" // initWithUnsignedShort:
val factorySelector = "numberWith${kindName.capitalize()}:" // numberWithUnsignedShort:
val initSelector = "initWith${kindName.replaceFirstChar(Char::uppercaseChar)}:" // initWithUnsignedShort:
val factorySelector = "numberWith${kindName.replaceFirstChar(Char::uppercaseChar)}:" // numberWithUnsignedShort:
constructor(
primitiveType: PrimitiveType,
kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt
+12 -12
View File
@@ -155,7 +155,7 @@ private class ObjCExportNamingHelper(
ObjCExportNamer.ClassOrProtocolName(swiftName, buildString {
append(topLevelNamePrefix)
swiftName.split('.').forEachIndexed { index, part ->
append(if (index == 0) part else part.capitalize())
append(if (index == 0) part else part.replaceFirstChar(Char::uppercaseChar))
}
})
@@ -179,7 +179,7 @@ private class ObjCExportNamingHelper(
} else {
// AB -> ABC
// A.B -> A.BC
append(ownName.capitalize())
append(ownName.replaceFirstChar(Char::uppercaseChar))
}
} else {
// AB, A.B -> ABC
@@ -188,9 +188,9 @@ private class ObjCExportNamingHelper(
append(containerName)
} else {
append(containerName.substring(0, dotIndex))
append(containerName.substring(dotIndex + 1).capitalize())
append(containerName.substring(dotIndex + 1).replaceFirstChar(Char::uppercaseChar))
}
append(ownName.capitalize())
append(ownName.replaceFirstChar(Char::uppercaseChar))
}
}
@@ -421,7 +421,7 @@ internal class ObjCExportNamerImpl(
val containingDeclaration = descriptor.containingDeclaration
if (containingDeclaration is ClassDescriptor) {
append(getClassOrProtocolObjCName(containingDeclaration))
.append(descriptor.name.asString().toIdentifier().capitalize())
.append(descriptor.name.asString().toIdentifier().replaceFirstChar(Char::uppercaseChar))
} else if (containingDeclaration is PackageFragmentDescriptor) {
append(topLevelNamePrefix).appendTopLevelClassBaseName(descriptor)
@@ -473,7 +473,7 @@ internal class ObjCExportNamerImpl(
else -> ""
})
append(name.capitalize())
append(name.replaceFirstChar(Char::uppercaseChar))
} else {
append(name)
}
@@ -551,7 +551,7 @@ internal class ObjCExportNamerImpl(
assert(descriptor.kind == ClassKind.OBJECT)
return objectInstanceSelectors.getOrPut(descriptor) {
val name = descriptor.name.asString().decapitalize().toIdentifier().mangleIfSpecialFamily("get")
val name = descriptor.name.asString().replaceFirstChar(Char::lowercaseChar).toIdentifier().mangleIfSpecialFamily("get")
StringBuilder(name).mangledBySuffixUnderscores()
}
@@ -563,8 +563,8 @@ internal class ObjCExportNamerImpl(
return enumClassSelectors.getOrPut(descriptor) {
// FOO_BAR_BAZ -> fooBarBaz:
val name = descriptor.name.asString().split('_').mapIndexed { index, s ->
val lower = s.toLowerCase()
if (index == 0) lower else lower.capitalize()
val lower = s.lowercase()
if (index == 0) lower else lower.replaceFirstChar(Char::uppercaseChar)
}.joinToString("").toIdentifier().mangleIfSpecialFamily("the")
StringBuilder(name).mangledBySuffixUnderscores()
@@ -655,7 +655,7 @@ internal class ObjCExportNamerImpl(
val candidate = when (this) {
is PropertyGetterDescriptor -> this.correspondingProperty.name.asString()
is PropertySetterDescriptor -> "set${this.correspondingProperty.name.asString().capitalize()}"
is PropertySetterDescriptor -> "set${this.correspondingProperty.name.asString().replaceFirstChar(kotlin.Char::uppercaseChar)}"
else -> this.name.asString()
}.toIdentifier()
@@ -668,7 +668,7 @@ internal class ObjCExportNamerImpl(
if (trimmed.startsWithWords(family)) {
// Then method can be detected as having special family by Objective-C compiler.
// mangle the name:
return prefix + this.capitalize()
return prefix + this.replaceFirstChar(Char::uppercaseChar)
}
}
@@ -894,7 +894,7 @@ internal val ModuleDescriptor.namePrefix: String get() {
fun abbreviate(name: String): String {
val normalizedName = name
.capitalize()
.replaceFirstChar(Char::uppercaseChar)
.replace("-|\\.".toRegex(), "_")
val uppers = normalizedName.filterIndexed { index, character -> index == 0 || character.isUpperCase() }
kotlin-native/endorsedLibraries/kotlinx.cli/src/main/kotlin/kotlinx/cli/ArgType.kt
+1 -1
View File
@@ -79,7 +79,7 @@ abstract class ArgType<T : Any>(val hasParameter: kotlin.Boolean) {
enumValues<T>().find { e -> e.toString().equals(it, ignoreCase = true) } ?:
throw IllegalArgumentException("No enum constant $it")
},
noinline toString: (T) -> kotlin.String = { it.toString().toLowerCase() }): Choice<T> {
noinline toString: (T) -> kotlin.String = { it.toString().lowercase() }): Choice<T> {
return Choice(enumValues<T>().toList(), toVariant, toString)
}
}
kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Configurables.kt
+1
View File
@@ -23,6 +23,7 @@ interface RelocationModeFlags : TargetableExternalStorage {
val staticLibraryRelocationMode get() = targetString("staticLibraryRelocationMode").mode()
val executableRelocationMode get() = targetString("executableRelocationMode").mode()
@Suppress("DEPRECATION")
private fun String?.mode(): Mode = when (this?.toLowerCase()) {
null -> Mode.DEFAULT
"pic" -> Mode.PIC