From cbd776d6e2c1e9f315262135eee820ecee6f68b0 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Mon, 6 Apr 2026 13:52:36 +0200 Subject: [PATCH] Fix Java warnings from the Eclipse Compiler for Java (ECJ) --- .../src/main/java/org/ruby_lang/prism/ParsingOptions.java | 4 ++-- .../java-templates/org/ruby_lang/prism/Loader.java.erb | 2 -- .../java-templates/org/ruby_lang/prism/Nodes.java.erb | 8 ++++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/java/api/src/main/java/org/ruby_lang/prism/ParsingOptions.java b/java/api/src/main/java/org/ruby_lang/prism/ParsingOptions.java index 8990f72104..c702e3c7b3 100644 --- a/java/api/src/main/java/org/ruby_lang/prism/ParsingOptions.java +++ b/java/api/src/main/java/org/ruby_lang/prism/ParsingOptions.java @@ -36,7 +36,7 @@ public byte getValue() { * * NOTE: positions should match PM_OPTIONS_COMMAND_LINE_* constants values */ - public enum CommandLine { A, E, L, N, P, X }; + public enum CommandLine { A, E, L, N, P, X } /** * The forwarding options for a given scope in the parser. @@ -57,7 +57,7 @@ public enum Forwarding { public byte getValue() { return (byte) value; } - }; + } /** * Represents a scope in the parser. diff --git a/templates/java/api/src/main/java-templates/org/ruby_lang/prism/Loader.java.erb b/templates/java/api/src/main/java-templates/org/ruby_lang/prism/Loader.java.erb index 2d2440b8e6..f1785e5d30 100644 --- a/templates/java/api/src/main/java-templates/org/ruby_lang/prism/Loader.java.erb +++ b/templates/java/api/src/main/java-templates/org/ruby_lang/prism/Loader.java.erb @@ -5,9 +5,7 @@ import java.lang.Short; import java.math.BigInteger; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import java.util.Locale; // GENERATED BY <%= File.basename(__FILE__) %> // @formatter:off diff --git a/templates/java/api/src/main/java-templates/org/ruby_lang/prism/Nodes.java.erb b/templates/java/api/src/main/java-templates/org/ruby_lang/prism/Nodes.java.erb index 9ef03e99cd..bcfe47f7c6 100644 --- a/templates/java/api/src/main/java-templates/org/ruby_lang/prism/Nodes.java.erb +++ b/templates/java/api/src/main/java-templates/org/ruby_lang/prism/Nodes.java.erb @@ -8,7 +8,6 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; @@ -321,6 +320,7 @@ public abstract class Nodes { } <%- end -%> + @Override public void visitChildNodes(AbstractNodeVisitor visitor) { <%- node.semantic_fields.each do |field| -%> <%- case field -%> @@ -338,6 +338,7 @@ public abstract class Nodes { <%- end -%> } + @Override public Node[] childNodes() { <%- if node.semantic_fields.none?(Prism::Template::NodeListField) and node.semantic_fields.none?(Prism::Template::NodeKindField) -%> return EMPTY_ARRAY; @@ -359,6 +360,7 @@ public abstract class Nodes { <%- end -%> } + @Override public T accept(AbstractNodeVisitor visitor) { return visitor.visit<%= node.name -%>(this); } @@ -371,11 +373,13 @@ public abstract class Nodes { builder.append("[Li]"); } builder.append('\n'); + <%- unless [*node.flags, *node.semantic_fields].empty? -%> String nextIndent = indent + " "; + <%- end -%> <%- if node.fields.any?(Prism::Template::NodeListField) or node.fields.any?(Prism::Template::ConstantListField) -%> String nextNextIndent = nextIndent + " "; <%- end -%> - <%- [*node.flags, *node.fields.grep_v(Prism::Template::LocationField).grep_v(Prism::Template::OptionalLocationField)].each do |field| -%> + <%- [*node.flags, *node.semantic_fields].each do |field| -%> builder.append(nextIndent); builder.append("<%= field.name %>: "); <%- case field -%>