[builtins-gen] Explicit visibility for companion objects and secondary constructors
This commit is contained in:
committed by
Space Team
parent
ab7c2f2196
commit
d8ee74222f
@@ -199,10 +199,6 @@ class WasmBooleanGenerator(writer: PrintWriter) : BooleanGenerator(writer) {
|
||||
}
|
||||
}
|
||||
|
||||
override fun CompanionObjectBuilder.modifyGeneratedCompanionObject() {
|
||||
isPublic = true
|
||||
}
|
||||
|
||||
override fun MethodBuilder.modifyGeneratedNot() {
|
||||
implementAsIntrinsic(PrimitiveType.BOOLEAN, methodName)
|
||||
}
|
||||
|
||||
@@ -446,7 +446,6 @@ class WasmCharGenerator(writer: PrintWriter) : CharGenerator(writer) {
|
||||
}
|
||||
|
||||
override fun CompanionObjectBuilder.modifyGeneratedCompanionObject() {
|
||||
isPublic = true
|
||||
property {
|
||||
appendDoc("The minimum value of a supplementary code point, `\\u0x10000`.")
|
||||
visibility = MethodVisibility.INTERNAL
|
||||
|
||||
@@ -29,10 +29,6 @@ class WasmPrimitivesGenerator(writer: PrintWriter) : BasePrimitivesGenerator(wri
|
||||
}
|
||||
}
|
||||
|
||||
override fun CompanionObjectBuilder.modifyGeneratedCompanionObject(thisKind: PrimitiveType) {
|
||||
isPublic = true
|
||||
}
|
||||
|
||||
override fun primitiveConstants(type: PrimitiveType): List<Any> {
|
||||
return when (type) {
|
||||
PrimitiveType.FLOAT -> listOf(
|
||||
|
||||
@@ -188,7 +188,6 @@ internal class ClassBuilder : AnnotatedAndDocumented(), PrimitiveBuilder {
|
||||
}
|
||||
|
||||
internal class CompanionObjectBuilder : AnnotatedAndDocumented(), PrimitiveBuilder {
|
||||
var isPublic: Boolean = false
|
||||
private val properties: MutableList<PropertyBuilder> = mutableListOf()
|
||||
|
||||
fun property(init: PropertyBuilder.() -> Unit): PropertyBuilder {
|
||||
@@ -200,7 +199,7 @@ internal class CompanionObjectBuilder : AnnotatedAndDocumented(), PrimitiveBuild
|
||||
override fun build(): String {
|
||||
return buildString {
|
||||
printDocumentationAndAnnotations()
|
||||
if (isPublic) append("public ")
|
||||
append("public ")
|
||||
if (properties.isEmpty()) {
|
||||
append("companion object {}")
|
||||
} else {
|
||||
@@ -235,7 +234,7 @@ internal class PrimaryConstructorBuilder : AnnotatedAndDocumented(), PrimitiveBu
|
||||
}
|
||||
|
||||
internal class SecondaryConstructorBuilder : AnnotatedAndDocumented(), PrimitiveBuilder {
|
||||
var visibility: MethodVisibility? = MethodVisibility.PRIVATE
|
||||
var visibility: MethodVisibility = MethodVisibility.PRIVATE
|
||||
private var parameters: MutableList<MethodParameterBuilder> = mutableListOf()
|
||||
private var argumentsToPrimaryContructor: MutableList<String> = mutableListOf()
|
||||
|
||||
@@ -253,7 +252,7 @@ internal class SecondaryConstructorBuilder : AnnotatedAndDocumented(), Primitive
|
||||
return buildString {
|
||||
printDocumentationAndAnnotations()
|
||||
|
||||
visibility?.let { append("${it.name.lowercase()} ") }
|
||||
append("${visibility.name.lowercase()} ")
|
||||
append("constructor")
|
||||
append(parameters.joinToString(prefix = "(", postfix = ") : ") { it.build() })
|
||||
append(argumentsToPrimaryContructor.joinToString(prefix = "this(", postfix = ")"))
|
||||
|
||||
Reference in New Issue
Block a user