azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Interop: add minor improvements

Browse Source
This commit is contained in:
Svyatoslav Scherbina
2016-09-29 17:23:41 +07:00
parent 5dc871ec32
commit 80ed5a2461
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Interop/Runtime/src/main/kotlin/kotlin_native/interop/Types.kt
+4
View File
@@ -196,3 +196,7 @@ class Arena : Placement, Closeable {
override fun close() = clear() override fun close() = clear()
} }
fun <T : NativeRef> Placement.alloc(type: NativeRef.TypeWithSize<T>): T {
return type.byPtr(this.alloc(type.size))
}
Interop/Runtime/src/main/kotlin/kotlin_native/interop/Utils.kt
+4 -2
View File
@@ -19,14 +19,16 @@ fun free(ptr: NativePtr?) {
fun free(ref: NativeRef?) = free(ref.getNativePtr()) fun free(ref: NativeRef?) = free(ref.getNativePtr())
fun <T : NativeRef> mallocNativeArrayOf(elemType: NativeRef.Type<T>, vararg elements: T?): NativeArray<RefBox<T>> { fun <T : NativeRef> Placement.allocNativeArrayOf(elemType: NativeRef.Type<T>, vararg elements: T?): NativeArray<RefBox<T>> {
val res = malloc(array[elements.size](elemType.ref)) val res = this.alloc(array[elements.size](elemType.ref))
elements.forEachIndexed { i, element -> elements.forEachIndexed { i, element ->
res[i].value = element res[i].value = element
} }
return res return res
} }
fun <T : NativeRef> mallocNativeArrayOf(elemType: NativeRef.Type<T>, vararg elements: T?) = heap.allocNativeArrayOf(elemType, *elements)
fun CString.Companion.fromString(str: String?): CString? { fun CString.Companion.fromString(str: String?): CString? {
if (str == null) { if (str == null) {
return null return null