Revert "Use unsigned number types"

This reverts commit ff094dc.
karakum-team · Dec 18, 2024 · e36cb68 · e36cb68
1 parent 4bee6f2
commit e36cb68
Showing 1 changed file with 6 additions and 17 deletions.
diff --git a/buildSrc/src/main/kotlin/karakum/browser/IDL.kt b/buildSrc/src/main/kotlin/karakum/browser/IDL.kt
@@ -26,18 +26,18 @@ private data class MethodReturnData(
 ) : MemberNumberData()
 
 private val NUMBER_TYPE_MAP = mapOf(
-    "octet" to "UByte",
+    "octet" to "Short /* unsigned byte */",
 
     "short" to "Short",
-    "unsigned short" to "UShort",
+    "unsigned short" to "Short",
 
     "float" to "Float",
 
     "double" to "Double",
     "unrestricted double" to "Double",
 
     "long" to "Int",
-    "unsigned long" to "UInt",
+    "unsigned long" to "Int",
 
     "long long" to "JsLong",
     "unsigned long long" to "JsLong",
@@ -165,15 +165,10 @@ internal object IDLRegistry {
                 .removePrefix("unrestricted ")
                 .substringBefore(" = ")
 
-            var type = getNumberType(data.substringBeforeLast(" ").removeSuffix("?"))
+            val type = getNumberType(data.substringBeforeLast(" ").removeSuffix("?"))
                 ?: return emptySequence()
 
             val name = data.substringAfterLast(" ")
-
-            // TEMP
-            if ((name == "length" || name == "size") && type == "UInt")
-                type = "Int"
-
             return sequenceOf(
                 PropertyData(
                     className = className,
@@ -200,19 +195,13 @@ internal object IDLRegistry {
                 .map { it.substringAfter("] ") }
                 .map { it.removePrefix("optional ") }
                 .mapNotNull { psource ->
-                    var type = getNumberType(psource.substringBeforeLast(" ").removeSuffix("?"))
+                    val type = getNumberType(psource.substringBeforeLast(" ").removeSuffix("?"))
                         ?: return@mapNotNull null
 
-                    val name = psource.substringAfterLast(" ")
-
-                    // TEMP
-                    if (name == "index" && type == "UInt")
-                        type = "Int"
-
                     ParameterData(
                         className = className,
                         methodName = methodName,
-                        parameterName = name,
+                        parameterName = psource.substringAfterLast(" "),
                         parameterType = type,
                     )
                 }