Skip to content

Commit ca4c4f7

Browse files
author
Christoph Büscher
authored
Remove unused params from SSource and Walker (#31935)
The "source" field in SSource seems unused. If removed, it can also be removed from the ctor, which in turn makes is possible to delete the sourceText in the Walker class.
1 parent a14db2f commit ca4c4f7

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/Walker.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.antlr.v4.runtime.atn.PredictionMode;
3030
import org.antlr.v4.runtime.tree.TerminalNode;
3131
import org.elasticsearch.painless.CompilerSettings;
32-
import org.elasticsearch.painless.lookup.PainlessLookup;
3332
import org.elasticsearch.painless.Globals;
3433
import org.elasticsearch.painless.Location;
3534
import org.elasticsearch.painless.Operation;
@@ -107,6 +106,7 @@
107106
import org.elasticsearch.painless.antlr.PainlessParser.TryContext;
108107
import org.elasticsearch.painless.antlr.PainlessParser.VariableContext;
109108
import org.elasticsearch.painless.antlr.PainlessParser.WhileContext;
109+
import org.elasticsearch.painless.lookup.PainlessLookup;
110110
import org.elasticsearch.painless.node.AExpression;
111111
import org.elasticsearch.painless.node.ANode;
112112
import org.elasticsearch.painless.node.AStatement;
@@ -184,7 +184,6 @@ public static SSource buildPainlessTree(ScriptClassInfo mainMethod, MainMethodRe
184184
private final CompilerSettings settings;
185185
private final Printer debugStream;
186186
private final String sourceName;
187-
private final String sourceText;
188187
private final PainlessLookup painlessLookup;
189188

190189
private final Deque<Reserved> reserved = new ArrayDeque<>();
@@ -198,7 +197,6 @@ private Walker(ScriptClassInfo scriptClassInfo, MainMethodReserved reserved, Str
198197
this.debugStream = debugStream;
199198
this.settings = settings;
200199
this.sourceName = Location.computeSourceName(sourceName);
201-
this.sourceText = sourceText;
202200
this.globals = new Globals(new BitSet(sourceText.length()));
203201
this.painlessLookup = painlessLookup;
204202
this.source = (SSource)visit(buildAntlrTree(sourceText));
@@ -267,7 +265,7 @@ public ANode visitSource(SourceContext ctx) {
267265
statements.add((AStatement)visit(ctx.dstatement()));
268266
}
269267

270-
return new SSource(scriptClassInfo, settings, sourceName, sourceText, debugStream, (MainMethodReserved)reserved.pop(),
268+
return new SSource(scriptClassInfo, settings, sourceName, debugStream, (MainMethodReserved)reserved.pop(),
271269
location(ctx), functions, globals, statements);
272270
}
273271

modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSource.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121

2222
import org.elasticsearch.painless.CompilerSettings;
2323
import org.elasticsearch.painless.Constant;
24-
import org.elasticsearch.painless.lookup.PainlessLookup;
25-
import org.elasticsearch.painless.lookup.PainlessMethod;
26-
import org.elasticsearch.painless.lookup.PainlessMethodKey;
2724
import org.elasticsearch.painless.Globals;
2825
import org.elasticsearch.painless.Locals;
2926
import org.elasticsearch.painless.Locals.Variable;
@@ -32,6 +29,9 @@
3229
import org.elasticsearch.painless.ScriptClassInfo;
3330
import org.elasticsearch.painless.SimpleChecksAdapter;
3431
import org.elasticsearch.painless.WriterConstants;
32+
import org.elasticsearch.painless.lookup.PainlessLookup;
33+
import org.elasticsearch.painless.lookup.PainlessMethod;
34+
import org.elasticsearch.painless.lookup.PainlessMethodKey;
3535
import org.elasticsearch.painless.node.SFunction.FunctionReserved;
3636
import org.objectweb.asm.ClassVisitor;
3737
import org.objectweb.asm.ClassWriter;
@@ -130,7 +130,6 @@ public int getMaxLoopCounter() {
130130
private final ScriptClassInfo scriptClassInfo;
131131
private final CompilerSettings settings;
132132
private final String name;
133-
private final String source;
134133
private final Printer debugStream;
135134
private final MainMethodReserved reserved;
136135
private final List<SFunction> functions;
@@ -141,14 +140,12 @@ public int getMaxLoopCounter() {
141140
private final List<org.objectweb.asm.commons.Method> getMethods;
142141
private byte[] bytes;
143142

144-
public SSource(ScriptClassInfo scriptClassInfo, CompilerSettings settings, String name, String source, Printer debugStream,
145-
MainMethodReserved reserved, Location location,
146-
List<SFunction> functions, Globals globals, List<AStatement> statements) {
143+
public SSource(ScriptClassInfo scriptClassInfo, CompilerSettings settings, String name, Printer debugStream,
144+
MainMethodReserved reserved, Location location, List<SFunction> functions, Globals globals, List<AStatement> statements) {
147145
super(location);
148146
this.scriptClassInfo = Objects.requireNonNull(scriptClassInfo);
149147
this.settings = Objects.requireNonNull(settings);
150148
this.name = Objects.requireNonNull(name);
151-
this.source = Objects.requireNonNull(source);
152149
this.debugStream = debugStream;
153150
this.reserved = Objects.requireNonNull(reserved);
154151
// process any synthetic functions generated by walker (because right now, thats still easy)

0 commit comments

Comments
 (0)