Merge pull request #132 from lppedd/build/wasi

Support the WASI target
Strumenta · Dec 23, 2023 · a9e2cf0 · a9e2cf0
2 parents d7fd141 + 68153c1
commit a9e2cf0
Show file tree

Hide file tree

Showing 32 changed files with 834 additions and 219 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,6 +38,9 @@ jobs:
           - java: '17'
             target: wasmJS
             task: wasmJsTest
+          - java: '17'
+            target: WASI
+            task: wasmWasiTest
     runs-on: ubuntu-latest
     name: Build (${{ matrix.java }} / ${{ matrix.target }})
     steps:

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ or use the [com.strumenta.antlr-kotlin][1] plugin, which instructs ANTLR automat
 ## Kotlin Runtime
 
 The Kotlin runtime for the Kotlin target is derived from the Java runtime, and is built
-as a multiplatform project running on JVM, JS, WebAssembly, and Native.
+as a multiplatform project running on JVM, JS, WebAssembly (including WASI), and Native.
 
 > :warning: The Native runtime is **not** thread safe
 

diff --git a/antlr-kotlin-runtime/build.gradle.kts b/antlr-kotlin-runtime/build.gradle.kts
@@ -16,6 +16,7 @@ plugins {
 strumentaMultiplatform {
   applyJvm()
   applyJs()
+  applyWasi()
 
   // Opting-in for native targets should be explicit,
   // as it makes the build and test process slower.

diff --git a/antlr-kotlin-runtime/src/commonMain/kotlin/com/strumenta/antlrkotlin/runtime/Environment.kt b/antlr-kotlin-runtime/src/commonMain/kotlin/com/strumenta/antlrkotlin/runtime/Environment.kt
@@ -11,4 +11,4 @@ package com.strumenta.antlrkotlin.runtime
  *
  * @author Edoardo Luppi
  */
-internal expect inline fun platformGetEnv(name: String): String?
+internal expect fun platformGetEnv(name: String): String?