Merge pull request ruby#1806 from enebo/jruby_loader_fixes

Fix template generation of Loader.java for JRuby
makenowjust · Nov 10, 2023 · b083822 · b083822
2 parents 7bf28ea + 09d561e
commit b083822
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/templates/java/org/prism/Loader.java.erb b/templates/java/org/prism/Loader.java.erb
@@ -79,16 +79,18 @@ public class Loader {
 
     private final ByteBuffer buffer;
     private final Nodes.Source source;
-    private String encodingName;
+    protected String encodingName;
+    <%- if string_type == "String" -%>
     private Charset encodingCharset;
+    <%- end -%>
     private ConstantPool constantPool;
 
-    private Loader(byte[] serialized, Nodes.Source source) {
+    protected Loader(byte[] serialized, Nodes.Source source) {
         this.buffer = ByteBuffer.wrap(serialized).order(ByteOrder.nativeOrder());
         this.source = source;
     }
 
-    private ParseResult load() {
+    protected ParseResult load() {
         expect((byte) 'P', "incorrect prism header");
         expect((byte) 'R', "incorrect prism header");
         expect((byte) 'I', "incorrect prism header");
@@ -106,7 +108,9 @@ public class Loader {
         byte[] encodingNameBytes = new byte[encodingLength];
         buffer.get(encodingNameBytes);
         this.encodingName = new String(encodingNameBytes, StandardCharsets.US_ASCII);
+        <%- if string_type == "String" -%>
         this.encodingCharset = getEncodingCharset(this.encodingName);
+        <%- end -%>
 
         source.setStartLine(loadVarInt());