move EnvironmentGet

illarionov · Mar 14, 2024 · fbba783 · fbba783
1 parent 9caf94a
commit fbba783
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/sqlite-embedder-graalvm/build.gradle.kts b/sqlite-embedder-graalvm/build.gradle.kts
@@ -17,7 +17,7 @@ kotlin {
     sourceSets {
         jvmMain.dependencies {
             api(projects.sqliteCommonApi)
-            implementation(projects.wasiEmscriptenHost)
+            implementation(project(":wasi-emscripten-host"))
             api(libs.graalvm.polyglot.polyglot)
             implementation(libs.graalvm.polyglot.wasm)
             compileOnly(libs.graalvm.wasm.language)

diff --git a/...src/jvmMain/kotlin/ru/pixnews/sqlite/open/helper/graalvm/host/preview1/func/EnvironGet.kt b/...src/jvmMain/kotlin/ru/pixnews/sqlite/open/helper/graalvm/host/preview1/func/EnvironGet.kt
@@ -15,7 +15,7 @@ import ru.pixnews.sqlite.open.helper.common.api.WasmPtr
 import ru.pixnews.sqlite.open.helper.graalvm.ext.asWasmPtr
 import ru.pixnews.sqlite.open.helper.graalvm.host.BaseWasmNode
 import ru.pixnews.sqlite.open.helper.graalvm.host.Host
-import ru.pixnews.sqlite.open.helper.host.wasi.ext.WasiEnvironmentFunc
+import ru.pixnews.sqlite.open.helper.host.wasi.preview1.ext.WasiEnvironmentFunc
 
 internal class EnvironGet(
     language: WasmLanguage,

diff --git a/...vmMain/kotlin/ru/pixnews/sqlite/open/helper/graalvm/host/preview1/func/EnvironSizesGet.kt b/...vmMain/kotlin/ru/pixnews/sqlite/open/helper/graalvm/host/preview1/func/EnvironSizesGet.kt
@@ -15,7 +15,7 @@ import ru.pixnews.sqlite.open.helper.common.api.WasmPtr
 import ru.pixnews.sqlite.open.helper.graalvm.ext.asWasmPtr
 import ru.pixnews.sqlite.open.helper.graalvm.host.BaseWasmNode
 import ru.pixnews.sqlite.open.helper.graalvm.host.Host
-import ru.pixnews.sqlite.open.helper.host.wasi.ext.WasiEnvironmentFunc
+import ru.pixnews.sqlite.open.helper.host.wasi.preview1.ext.WasiEnvironmentFunc
 
 internal class EnvironSizesGet(
     language: WasmLanguage,

diff --git a/...vm/src/jvmMain/kotlin/ru/pixnews/sqlite/open/helper/graalvm/host/preview1/func/FdWrite.kt b/...vm/src/jvmMain/kotlin/ru/pixnews/sqlite/open/helper/graalvm/host/preview1/func/FdWrite.kt
@@ -19,7 +19,7 @@ import ru.pixnews.sqlite.open.helper.host.filesystem.ReadWriteStrategy
 import ru.pixnews.sqlite.open.helper.host.filesystem.ReadWriteStrategy.CHANGE_POSITION
 import ru.pixnews.sqlite.open.helper.host.filesystem.ReadWriteStrategy.DO_NOT_CHANGE_POSITION
 import ru.pixnews.sqlite.open.helper.host.filesystem.SysException
-import ru.pixnews.sqlite.open.helper.host.wasi.preview1.ext.FdWriteExt
+import ru.pixnews.sqlite.open.helper.host.wasi.preview1.ext.FdWriteExt.readCiovecs
 import ru.pixnews.sqlite.open.helper.host.wasi.preview1.type.CioVec
 import ru.pixnews.sqlite.open.helper.host.wasi.preview1.type.CiovecArray
 import ru.pixnews.sqlite.open.helper.host.wasi.preview1.type.Errno
@@ -68,7 +68,7 @@ private class FdWrite(
         cIovCnt: Int,
         pNum: WasmPtr<Int>,
     ): Int {
-        val cioVecs: CiovecArray = FdWriteExt.readCiovecs(memory, pCiov, cIovCnt)
+        val cioVecs: CiovecArray = readCiovecs(memory, pCiov, cIovCnt)
         return try {
             val channel = host.fileSystem.getStreamByFd(fd)
             val writtenBytes = memory.writeToChannel(channel, strategy, cioVecs)

diff --git a/...elper/host/wasi/preview1/ext/FdReadExt.kt → ...elper/host/wasi/preview1/ext/FdReadExt.kt b/...elper/host/wasi/preview1/ext/FdReadExt.kt → ...elper/host/wasi/preview1/ext/FdReadExt.kt
diff --git a/...lper/host/wasi/preview1/ext/FdWriteExt.kt → ...lper/host/wasi/preview1/ext/FdWriteExt.kt b/...lper/host/wasi/preview1/ext/FdWriteExt.kt → ...lper/host/wasi/preview1/ext/FdWriteExt.kt
diff --git a/...lper/host/wasi/ext/WasiEnvironmentFunc.kt → .../wasi/preview1/ext/WasiEnvironmentFunc.kt b/...lper/host/wasi/ext/WasiEnvironmentFunc.kt → .../wasi/preview1/ext/WasiEnvironmentFunc.kt
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package ru.pixnews.sqlite.open.helper.host.wasi.ext
+package ru.pixnews.sqlite.open.helper.host.wasi.preview1.ext
 
 import ru.pixnews.sqlite.open.helper.common.api.WasmPtr
 import ru.pixnews.sqlite.open.helper.common.api.plus