Merge remote-tracking branch 'mipt-npm/dev' into mp-samplers

This commit is contained in:
Iaroslav 2020-06-16 14:49:56 +07:00
commit 6fc6d124ca
No known key found for this signature in database
GPG Key ID: 46E15E4A31B3BCD7

View File

@ -11,18 +11,16 @@ class DataViewMemory(val view: DataView) : Memory {
override fun view(offset: Int, length: Int): Memory { override fun view(offset: Int, length: Int): Memory {
require(offset >= 0) { "offset shouldn't be negative: $offset" } require(offset >= 0) { "offset shouldn't be negative: $offset" }
require(length >= 0) { "length shouldn't be negative: $length" } require(length >= 0) { "length shouldn't be negative: $length" }
if (offset + length > size) {
if (offset + length > size)
throw IndexOutOfBoundsException("offset + length > size: $offset + $length > $size") throw IndexOutOfBoundsException("offset + length > size: $offset + $length > $size")
}
return DataViewMemory(DataView(view.buffer, view.byteOffset + offset, length)) return DataViewMemory(DataView(view.buffer, view.byteOffset + offset, length))
} }
override fun copy(): Memory = DataViewMemory(DataView(view.buffer.slice(0)))
override fun copy(): Memory { private val reader: MemoryReader = object : MemoryReader {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
private val reader = object : MemoryReader {
override val memory: Memory get() = this@DataViewMemory override val memory: Memory get() = this@DataViewMemory
override fun readDouble(offset: Int): Double = view.getFloat64(offset, false) override fun readDouble(offset: Int): Double = view.getFloat64(offset, false)
@ -45,7 +43,7 @@ class DataViewMemory(val view: DataView) : Memory {
override fun reader(): MemoryReader = reader override fun reader(): MemoryReader = reader
private val writer = object : MemoryWriter { private val writer: MemoryWriter = object : MemoryWriter {
override val memory: Memory get() = this@DataViewMemory override val memory: Memory get() = this@DataViewMemory
override fun writeDouble(offset: Int, value: Double) { override fun writeDouble(offset: Int, value: Double) {
@ -76,7 +74,6 @@ class DataViewMemory(val view: DataView) : Memory {
override fun release() { override fun release() {
//does nothing on JS //does nothing on JS
} }
} }
override fun writer(): MemoryWriter = writer override fun writer(): MemoryWriter = writer
@ -94,4 +91,4 @@ actual fun Memory.Companion.allocate(length: Int): Memory {
actual fun Memory.Companion.wrap(array: ByteArray): Memory { actual fun Memory.Companion.wrap(array: ByteArray): Memory {
@Suppress("CAST_NEVER_SUCCEEDS") val int8Array = array as Int8Array @Suppress("CAST_NEVER_SUCCEEDS") val int8Array = array as Int8Array
return DataViewMemory(DataView(int8Array.buffer, int8Array.byteOffset, int8Array.length)) return DataViewMemory(DataView(int8Array.buffer, int8Array.byteOffset, int8Array.length))
} }