Fix bug in codegen for kotlin arrays of unsigned numeric primitives (#…

…685) Co-authored-by: Ellen Arteca <[email protected]>
rust-diplomat · Sep 11, 2024 · cd9fb53 · cd9fb53
1 parent e92e497
commit cd9fb53
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/tool/src/kotlin/formatter.rs b/tool/src/kotlin/formatter.rs
@@ -60,10 +60,10 @@ impl<'tcx> KotlinFormatter<'tcx> {
             PrimitiveType::Int(IntType::I16) => "Short",
             PrimitiveType::Int(IntType::I32) => "Int",
             PrimitiveType::Int(IntType::I64) => "Long",
-            PrimitiveType::Int(IntType::U8) => "Byte",
-            PrimitiveType::Int(IntType::U16) => "Short",
-            PrimitiveType::Int(IntType::U32) => "Int",
-            PrimitiveType::Int(IntType::U64) => "Long",
+            PrimitiveType::Int(IntType::U8) => "UByte",
+            PrimitiveType::Int(IntType::U16) => "UShort",
+            PrimitiveType::Int(IntType::U32) => "UInt",
+            PrimitiveType::Int(IntType::U64) => "ULong",
             PrimitiveType::Byte => "Byte",
             PrimitiveType::IntSize(IntSizeType::Isize) => "Long",
             PrimitiveType::IntSize(IntSizeType::Usize) => "Long",

diff --git a/tool/src/kotlin/mod.rs b/tool/src/kotlin/mod.rs
@@ -1796,6 +1796,10 @@ mod test {
                     pub fn test_multi_arg_callback(f: impl Fn(i32) -> i32, x: i32) -> i32 {
                         f(10 + x)
                     }
+
+                    pub fn get_u_byte_slice<'a>() -> &'a [u8] {
+                        todo!()
+                    }
                 }
             }
         };
@@ -1902,7 +1906,6 @@ mod test {
                     pub fn string_stuff_2<'a, 'c>(&'a self,  some_str: &'c DiplomatStr)  -> &'a MyOpaqueStruct<'b> {
                         self.0.as_ref()
                     }
-
                 }
 
             }

diff --git a/tool/src/kotlin/snapshots/diplomat_tool__kotlin__test__struct.snap b/tool/src/kotlin/snapshots/diplomat_tool__kotlin__test__struct.snap
@@ -1,6 +1,6 @@
 ---
 source: tool/src/kotlin/mod.rs
-assertion_line: 1823
+assertion_line: 1828
 expression: struct_code
 ---
 package dev.gigapixel.somelib
@@ -14,6 +14,7 @@ import com.sun.jna.Structure
 internal interface MyNativeStructLib: Library {
     fun MyNativeStruct_new(): MyNativeStructNative
     fun MyNativeStruct_test_multi_arg_callback(f: DiplomatCallback_MyNativeStruct_test_multi_arg_callback_diplomatCallback_f_Native, x: Int): Int
+    fun MyNativeStruct_get_u_byte_slice(): Slice
 }
 
 internal class MyNativeStructNative: Structure(), Structure.ByValue {
@@ -140,6 +141,12 @@ class MyNativeStruct internal constructor (
             val returnVal = lib.MyNativeStruct_test_multi_arg_callback(DiplomatCallback_MyNativeStruct_test_multi_arg_callback_diplomatCallback_f.fromCallback(f).nativeStruct, x);
             return returnVal
         }
+
+        fun getUByteSlice(): UByteArray {
+
+            val returnVal = lib.MyNativeStruct_get_u_byte_slice();
+                return PrimitiveArrayTools.getUByteArray(returnVal)
+        }
     }
 
 }