Skip to content

[preview] use chicory-redline in java wasm #4071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
andreaTP wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −9
Draft

[preview] use chicory-redline in java wasm #4071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions java/wasm/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,19 @@
<version>10.0.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.roastedroot</groupId>
<artifactId>redline</artifactId>
<version>0.0.1</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>0.0.1</version>
<executions>
<execution>
<id>prism</id>
Expand Down
13 changes: 7 additions & 6 deletions java/wasm/src/main/java/org/ruby_lang/prism/wasm/Prism.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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() {
Expand Down Expand Up @@ -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();
}
Expand Down