Merge pull request #4071 from andreaTP/chicory-redline

[preview] use chicory-redline in java wasm

Author: kddnewton

java/wasm/pom.xml

@@ -15,6 +15,7 @@
 
   <properties>
     <chicory.version>1.7.5</chicory.version>
+    <redline.version>0.0.2</redline.version>
   </properties>
 
   <dependencyManagement>
@@ -63,14 +64,19 @@
       <version>10.0.5.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.roastedroot</groupId>
+      <artifactId>redline</artifactId>
+      <version>${redline.version}</version>
+    </dependency>
   </dependencies>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>com.dylibso.chicory</groupId>
-        <artifactId>chicory-compiler-maven-plugin</artifactId>
-        <version>${chicory.version}</version>
+        <groupId>io.roastedroot</groupId>
+        <artifactId>redline-compiler-maven-plugin</artifactId>
+        <version>${redline.version}</version>
         <executions>
           <execution>
             <id>prism</id>

java/wasm/src/main/java/org/ruby_lang/prism/wasm/Prism.java

@@ -2,7 +2,7 @@
 
 import com.dylibso.chicory.runtime.ByteArrayMemory;
 import com.dylibso.chicory.runtime.ImportValues;
-import com.dylibso.chicory.runtime.Instance;
+import io.roastedroot.redline.api.RedlineInstance;
 import com.dylibso.chicory.wasi.WasiOptions;
 import com.dylibso.chicory.wasi.WasiPreview1;
 import org.ruby_lang.prism.Loader;
@@ -13,20 +13,18 @@
 public class Prism implements AutoCloseable {
     private final WasiPreview1 wasi;
     protected final Prism_ModuleExports exports;
-    private final Instance instance;
+    private final RedlineInstance instance;
 
     public Prism() {
         this(WasiOptions.builder().build());
     }
 
     public Prism(WasiOptions wasiOpts) {
         wasi = WasiPreview1.builder().withOptions(wasiOpts).build();
-        instance = Instance.builder(PrismParser.load())
-            .withMemoryFactory(ByteArrayMemory::new)
-            .withMachineFactory(PrismParser::create)
+        instance = PrismParser.builder()
             .withImportValues(ImportValues.builder().addFunction(wasi.toHostFunctions()).build())
             .build();
-        exports = new Prism_ModuleExports(instance);
+        exports = new Prism_ModuleExports(instance.instance());
     }
 
     public String version() {
@@ -150,6 +148,9 @@ public ParseResult serializeParse(byte[] packedOptions, String source) {
 
     @Override
     public void close() {
+        if (instance != null) {
+            instance.close();
+        }
         if (wasi != null) {
             wasi.close();
         }