json numbers will never be parsed as float if doubleOrNull is checked first...

Jolanrensen · Jolanrensen · commit ff833c1c71d5 · 2025-02-21T15:51:21.000+01:00
diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/io/readJson.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/io/readJson.kt
@@ -229,10 +229,10 @@ internal fun fromJsonListAnyColumns(
 
                             v.longOrNull != null -> collector.add(v.long)
 
-                            v.doubleOrNull != null -> collector.add(v.double)
-
                             v.floatOrNull != null -> collector.add(v.float)
 
+                            v.doubleOrNull != null -> collector.add(v.double)
+
                             else -> error("Malformed JSON element ${v::class}: $v")
                         }
                     }
@@ -578,10 +578,10 @@ internal fun fromJsonListArrayAndValueColumns(
 
                                         v.longOrNull != null -> collector.add(v.long)
 
-                                        v.doubleOrNull != null -> collector.add(v.double)
-
                                         v.floatOrNull != null -> collector.add(v.float)
 
+                                        v.doubleOrNull != null -> collector.add(v.double)
+
                                         else -> error("Malformed JSON element ${v::class}: $v")
                                     }
                                 }

Original file line number	Diff line number	Diff line change
`@@ -229,10 +229,10 @@ internal fun fromJsonListAnyColumns(`
`229`	`229`
`230`	`230`	`v.longOrNull != null -> collector.add(v.long)`
`231`	`231`
`232`		`- v.doubleOrNull != null -> collector.add(v.double)`
`233`		`-`
`234`	`232`	`v.floatOrNull != null -> collector.add(v.float)`
`235`	`233`
	`234`	`+ v.doubleOrNull != null -> collector.add(v.double)`
	`235`	`+`
`236`	`236`	`else -> error("Malformed JSON element ${v::class}: $v")`
`237`	`237`	`}`
`238`	`238`	`}`
`@@ -578,10 +578,10 @@ internal fun fromJsonListArrayAndValueColumns(`
`578`	`578`
`579`	`579`	`v.longOrNull != null -> collector.add(v.long)`
`580`	`580`
`581`		`- v.doubleOrNull != null -> collector.add(v.double)`
`582`		`-`
`583`	`581`	`v.floatOrNull != null -> collector.add(v.float)`
`584`	`582`
	`583`	`+ v.doubleOrNull != null -> collector.add(v.double)`
	`584`	`+`
`585`	`585`	`else -> error("Malformed JSON element ${v::class}: $v")`
`586`	`586`	`}`
`587`	`587`	`}`