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

Interop: rework String auto conversion

Browse Source 
use memScoped
This commit is contained in:
Svyatoslav Scherbina
2016-10-19 15:59:55 +03:00
parent 53884f8da6
commit 8a66de216d
2 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Interop/Runtime/src/main/kotlin/kotlin_native/interop/Utils.kt
+7 -9
View File
@@ -32,13 +32,15 @@ fun Placement.allocNativeArrayOf(elements: ByteArray): NativeArray<Int8Box> {
}
fun CString.Companion.fromString(str: String?): CString? {
if (str == null) {
return null
}
return str?.toCString(heap)
}
val bytes = str.toByteArray() // TODO: encoding
fun Int8Box.asCString() = CString.fromArray(NativeArray.byRefToFirstElem(this, Int8Box))
fun String.toCString(retValPlacement: Placement): CString {
val bytes = this.toByteArray() // TODO: encoding
val len = bytes.size
val nativeBytes = malloc(NativeArray of Int8Box length (len + 1))
val nativeBytes = retValPlacement.alloc(array[len + 1](Int8Box))
bytes.forEachIndexed { i, byte ->
nativeBytes[i].value = byte
@@ -48,10 +50,6 @@ fun CString.Companion.fromString(str: String?): CString? {
return CString.fromArray(nativeBytes)
}
fun NativeArray<Int8Box>.asCString() = CString.fromArray(this)
fun Int8Box.asCString() = CString.fromArray(NativeArray.byRefToFirstElem(this, Int8Box))
fun String.toCString() = CString.fromString(this)
class MemScope private constructor(private val arena: Arena) : Placement by arena {
val memScope: Placement
get() = this