not bothering with duplicate symbol name detection (minimal viable product)

fractalwrench · fractalwrench · commit f248126fc03f · 2018-02-25T10:30:12.000Z
diff --git a/TODO.md b/TODO.md
@@ -4,7 +4,6 @@
 Ordered roughly in priority:
 
 - Add more real world payloads
-- Symbol pool for class names
 - General cleanup of weird/disgusting code areas
 - Address all FIXME/TODOs
 - Write Contributing guide
diff --git a/core/src/main/kotlin/com/fractalwrench/json2kotlin/ClassTypeHolder.kt b/core/src/main/kotlin/com/fractalwrench/json2kotlin/ClassTypeHolder.kt
@@ -59,7 +59,7 @@ internal class ClassTypeHolder(val delegate: SourceBuildDelegate, groupingStrate
         }
 
         val classType = buildClass(commonElements, fields.sortedBy {
-            it.toKotlinIdentifier().toLowerCase() // FIXME check symbol pool!
+            it.toKotlinIdentifier().toLowerCase()
         }).build()
 
         return commonElements.filterNot { // reuse any types which already exist in the map
@@ -71,7 +71,7 @@ internal class ClassTypeHolder(val delegate: SourceBuildDelegate, groupingStrate
 
     private fun buildClass(commonElements: List<TypedJsonElement>, fields: Collection<String>): TypeSpec.Builder {
         val identifier = commonElements.last().kotlinIdentifier // FIXME should only pass in one if that's all that's needed!
-        val classBuilder = TypeSpec.classBuilder(identifier.capitalize()) // FIXME check symbol pool!
+        val classBuilder = TypeSpec.classBuilder(identifier.capitalize())
         val constructor = FunSpec.constructorBuilder()
 
         if (fields.isEmpty()) { // FIXME misses delegate!
diff --git a/core/src/main/kotlin/com/fractalwrench/json2kotlin/JsonNames.kt b/core/src/main/kotlin/com/fractalwrench/json2kotlin/JsonNames.kt
@@ -1,13 +1,9 @@
 package com.fractalwrench.json2kotlin
 
 
-// TODO move to a symbol pool class (or equivalent)
-
 internal fun nameForArrayField(index: Int, identifier: String): String =
         if (index == 0) identifier else "$identifier${index + 1}"
 
-// TODO move to a symbol pool class (or equivalent)
-
 // FIXME pattern compilation
 
 fun String.standardiseNewline(): String {
diff --git a/core/src/main/kotlin/com/fractalwrench/json2kotlin/JsonTypeDetector.kt b/core/src/main/kotlin/com/fractalwrench/json2kotlin/JsonTypeDetector.kt
@@ -40,7 +40,7 @@ internal class JsonTypeDetector {
             return ClassName.bestGuess(existingTypeName.name!!)
         }
 
-        val identifier = key.toKotlinIdentifier().capitalize() // FIXME check symbol pool!
+        val identifier = key.toKotlinIdentifier().capitalize()
         return ClassName.bestGuess(identifier)
     }
 
@@ -49,7 +49,7 @@ internal class JsonTypeDetector {
         var nullable = false
 
         jsonArray.withIndex().forEach {
-            val sanitisedName = key.toKotlinIdentifier() // FIXME check symbol pool!
+            val sanitisedName = key.toKotlinIdentifier()
             with(it.value) {
                 when {
                     isJsonPrimitive -> arrayTypes.add(typeForJsonPrimitive(asJsonPrimitive))
diff --git a/core/src/main/kotlin/com/fractalwrench/json2kotlin/TypedJsonElement.kt b/core/src/main/kotlin/com/fractalwrench/json2kotlin/TypedJsonElement.kt
@@ -9,7 +9,7 @@ class TypedJsonElement : JsonElement {
     val jsonElement: JsonElement
     val jsonKey: String
     val level: Int
-    val kotlinIdentifier: String // FIXME symbol pooling
+    val kotlinIdentifier: String
 
     constructor(jsonElement: JsonElement, jsonKey: String, level: Int) : super() {
         this.jsonElement = jsonElement

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ internal class JsonTypeDetector {`
`40`	`40`	`return ClassName.bestGuess(existingTypeName.name!!)`
`41`	`41`	`}`
`42`	`42`
`43`		`- val identifier = key.toKotlinIdentifier().capitalize() // FIXME check symbol pool!`
	`43`	`+ val identifier = key.toKotlinIdentifier().capitalize()`
`44`	`44`	`return ClassName.bestGuess(identifier)`
`45`	`45`	`}`
`46`	`46`
`@@ -49,7 +49,7 @@ internal class JsonTypeDetector {`
`49`	`49`	`var nullable = false`
`50`	`50`
`51`	`51`	`jsonArray.withIndex().forEach {`
`52`		`- val sanitisedName = key.toKotlinIdentifier() // FIXME check symbol pool!`
	`52`	`+ val sanitisedName = key.toKotlinIdentifier()`
`53`	`53`	`with(it.value) {`
`54`	`54`	`when {`
`55`	`55`	`isJsonPrimitive -> arrayTypes.add(typeForJsonPrimitive(asJsonPrimitive))`