Cleanup in stdlib generators
This commit is contained in:
@@ -17,7 +17,7 @@ private val COMMON_AUTOGENERATED_WARNING: String = """//
|
||||
* at runtime.
|
||||
*/
|
||||
fun main(args: Array<String>) {
|
||||
require(args.size() == 1) { "Expecting Kotlin project home path as an argument" }
|
||||
require(args.size == 1) { "Expecting Kotlin project home path as an argument" }
|
||||
|
||||
val outDir = File(File(args[0]), "libraries/stdlib/src/generated")
|
||||
require(outDir.exists()) { "$outDir doesn't exist!" }
|
||||
|
||||
@@ -54,7 +54,7 @@ fun arrays(): List<GenericFunction> {
|
||||
}
|
||||
}
|
||||
|
||||
templates addAll PrimitiveType.values().map { primitive ->
|
||||
templates addAll PrimitiveType.defaultPrimitives.map { primitive ->
|
||||
val arrayType = primitive.name + "Array"
|
||||
f("to$arrayType()") {
|
||||
only(ArraysOfObjects, Collections)
|
||||
|
||||
@@ -43,7 +43,7 @@ enum class PrimitiveType {
|
||||
Double;
|
||||
|
||||
companion object {
|
||||
val defaultPrimitives = PrimitiveType.values().toSet()
|
||||
val defaultPrimitives = PrimitiveType.values.toSet()
|
||||
val numericPrimitives = setOf(Int, Long, Byte, Short, Double, Float)
|
||||
val integralPrimitives = setOf(Int, Long, Byte, Short, Char)
|
||||
|
||||
@@ -170,7 +170,7 @@ class GenericFunction(val signature: String, val keyword: String = "fun") {
|
||||
buildPrimitives.addAll(p.toList())
|
||||
}
|
||||
|
||||
fun instantiate(vararg families: Family = Family.values()): List<ConcreteFunction> {
|
||||
fun instantiate(vararg families: Family = Family.values): List<ConcreteFunction> {
|
||||
return families
|
||||
.sortedBy { it.name }
|
||||
.filter { buildFamilies.contains(it) }
|
||||
@@ -201,7 +201,7 @@ class GenericFunction(val signature: String, val keyword: String = "fun") {
|
||||
Primitives, Generic -> SourceFile.Misc
|
||||
}
|
||||
|
||||
fun build(vararg families: Family = Family.values()): String {
|
||||
fun build(vararg families: Family = Family.values): String {
|
||||
val builder = StringBuilder()
|
||||
for (family in families.sortedBy { it.name }) {
|
||||
if (buildFamilies.contains(family))
|
||||
|
||||
Reference in New Issue
Block a user