Skip to content

Commit 365d3df

Browse files
headiuskddnewton
authored andcommitted
Move WASM parser to a JRuby package
* org.jruby.parser is base package for JRuby parsers * org.jruby.parser.prism is for parsers based on Prism * org.jruby.parser.prism.wasm is for the WASM Prism wrapper
1 parent d716178 commit 365d3df

6 files changed

Lines changed: 13 additions & 6 deletions

File tree

java-wasm/perf-test/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import java.util.EnumSet;
1212

1313
import org.jruby.Ruby;
1414

15-
import org.prism.Prism;
15+
import org.jruby.parser.prism.wasm.Prism;
1616
import org.prism.ParsingOptions;
1717

1818
public class test {

java-wasm/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
<goal>compile</goal>
131131
</goals>
132132
<configuration>
133-
<name>org.prism.PrismParser</name>
133+
<name>org.jruby.parser.prism.wasm.PrismParser</name>
134134
<wasmFile>src/test/resources/prism.wasm</wasmFile>
135135
</configuration>
136136
</execution>

java-wasm/src/main/java-templates/org/prism/WasmResource.java renamed to java-wasm/src/main/java-templates/org/jruby/parser/prism/wasm/WasmResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.prism;
1+
package org.jruby.parser.prism.wasm;
22

33
public final class WasmResource {
44
public static final String absoluteFile = "file://${project.basedir}/src/test/resources/prism.wasm";

java-wasm/src/main/java/org/prism/Prism.java renamed to java-wasm/src/main/java/org/jruby/parser/prism/wasm/Prism.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
package org.prism;
1+
package org.jruby.parser.prism.wasm;
22

33
import com.dylibso.chicory.annotations.WasmModuleInterface;
44
import com.dylibso.chicory.runtime.ByteArrayMemory;
55
import com.dylibso.chicory.runtime.ImportValues;
66
import com.dylibso.chicory.runtime.Instance;
77
import com.dylibso.chicory.wasi.WasiOptions;
88
import com.dylibso.chicory.wasi.WasiPreview1;
9+
import org.prism.Loader;
10+
import org.prism.ParseResult;
911

1012
import java.nio.charset.StandardCharsets;
1113

java-wasm/src/test/java/org/prism/DummyTest.java renamed to java-wasm/src/test/java/org/jruby/parser/prism/DummyTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
package org.prism;
1+
package org.jruby.parser.prism;
22

3+
import org.jruby.parser.prism.wasm.Prism;
34
import org.junit.jupiter.api.Test;
5+
import org.prism.ParseResult;
6+
import org.prism.ParsingOptions;
47

58
import java.util.EnumSet;
69

java-wasm/src/test/java/org/prism/JRubyTest.java renamed to java-wasm/src/test/java/org/jruby/parser/prism/JRubyTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
package org.prism;
1+
package org.jruby.parser.prism;
22

33
import org.jruby.Ruby;
4+
import org.jruby.parser.prism.wasm.Prism;
45
import org.junit.jupiter.api.Test;
6+
import org.prism.ParsingOptions;
57

68
import java.io.DataInputStream;
79
import java.io.InputStream;

0 commit comments

Comments
 (0)