optional sorting, fix constants

Author: wagyourtail

.idea/artifacts/unimined_mapping_library_js_1_0_1.xml

@@ -47,6 +47,11 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
+"@js-joda/core@3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@js-joda/core/-/core-3.2.0.tgz#3e61e21b7b2b8a6be746df1335cf91d70db2a273"
+  integrity sha512-PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg==
+
 "@leichtgewicht/ip-codec@^2.0.1":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"

.idea/artifacts/unimined_mapping_library_jvm_1_0_1.xml

@@ -60,10 +60,18 @@ value class Constant private constructor(val value: String) : Type {
 
     fun getString() = if (isString()) StringConstant.unchecked(value) else null
 
-    fun getBoolean() = value.first() == 't'
+    fun getBoolean() = if (isBoolean()) BooleanConstant.unchecked(value) else null
 
     fun getNumber() = if (isNumber()) NumberConstant.unchecked(value) else null
 
+    fun getValue(): Any? = when {
+        isNull() -> null
+        isString() -> getString()!!.unescape()
+        isBoolean() -> getBoolean()!!.value
+        isNumber() -> getNumber()!!.asNumber()
+        else -> throw IllegalStateException()
+    }
+
     override fun accept(visitor: (Any) -> Boolean) {
         if (visitor(this)) {
             when {

.idea/inspectionProfiles/Project_Default.xml

@@ -30,7 +30,7 @@ value class NumberConstant private constructor(val value: String) : Type {
 
         override fun shouldRead(reader: CharReader<*>): Boolean {
             val first = reader.take()
-            return first == '-' || first?.isDigit() == true || first == 'N' || first == 'I'
+            return first == '-' || first?.isDigit() == true || first == 'N' || first == 'I' || first == '.'
         }
 
         override fun read(reader: CharReader<*>, append: (Any) -> Unit) {

.idea/kotlinc.xml

@@ -20,7 +20,7 @@ value class BinaryConstant private constructor(val value: String): Type {
 
         override fun read(reader: CharReader<*>, append: (Any) -> Unit) {
             val first = reader.peek()
-            if (first?.isDigit() != true) {
+            if (first !in '0' .. '1') {
                 throw IllegalArgumentException("Invalid binary constant, cannot start with ${first ?: "null"}")
             }
             append(reader.takeWhile { it in '0' .. '1' })

kotlin-js-store/yarn.lock

@@ -20,10 +20,11 @@ value class HexConstant private constructor(val value: String): Type {
 
         override fun read(reader: CharReader<*>, append: (Any) -> Unit) {
             val first = reader.peek()
-            if (first?.isDigit() != true) {
+            if (first?.isDigit() == true || first?.lowercaseChar() in 'a'..'f') {
+                append(reader.takeWhile { it.isDigit() || it.lowercaseChar() in 'a'..'f' })
+            } else {
                 throw IllegalArgumentException("Invalid hex constant, cannot start with ${first ?: "null"}")
             }
-            append(reader.takeWhile { it.isDigit() || it.lowercaseChar() in 'a'..'f' })
         }
 
         override fun unchecked(value: String): HexConstant {

src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/ext/constant/Constant.kt

@@ -20,7 +20,7 @@ value class OctalConstant private constructor(val value: String): Type {
 
         override fun read(reader: CharReader<*>, append: (Any) -> Unit) {
             val first = reader.peek()
-            if (first?.isDigit() != true) {
+            if (first !in '0' .. '7') {
                 throw IllegalArgumentException("Invalid octal constant, cannot start with ${first ?: "null"}")
             }
             append(reader.takeWhile { it.isDigit() && it != '8' && it != '9' })