Skip to content

Commit 3f9ce4c

Browse files
authored
Remove JavaSourceParser (#10085)
This class is only used by the typemodel for reading parameter names, but as written it can only ever return null - the parser is never populated with resources, so must always return null.
1 parent b9d1d99 commit 3f9ce4c

File tree

5 files changed

+1
-531
lines changed

5 files changed

+1
-531
lines changed

dev/core/src/com/google/gwt/dev/javac/JavaSourceParser.java

Lines changed: 0 additions & 319 deletions
This file was deleted.

dev/core/src/com/google/gwt/dev/javac/typemodel/JAbstractMethod.java

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ public abstract class JAbstractMethod implements
3939

4040
private List<JParameter> params = Lists.create();
4141

42-
private String[] realParameterNames = null;
43-
4442
private List<JClassType> thrownTypes = Lists.create();
4543

4644
private List<JTypeParameter> typeParams = Lists.create();
@@ -255,20 +253,11 @@ void addThrows(JClassType type) {
255253

256254
// Called only by a JParameter, passing itself as a reference for lookup.
257255
String getRealParameterName(JParameter parameter) {
258-
if (realParameterNames == null) {
259-
fetchRealParameterNames();
260-
}
261256
int n = params.size();
262257
for (int i = 0; i < n; ++i) {
263258
// Identity tests are ok since identity is durable within an oracle.
264259
if (params.get(i) == parameter) {
265-
String realParameterName;
266-
if (realParameterNames == null) {
267-
realParameterName = StringInterner.get().intern("arg" + i);
268-
} else {
269-
realParameterName = StringInterner.get().intern(realParameterNames[i]);
270-
}
271-
return realParameterName;
260+
return StringInterner.get().intern("arg" + i);
272261
}
273262
}
274263
// TODO: report error if we are asked for an unknown JParameter?
@@ -294,9 +283,4 @@ boolean hasParamTypes(JType[] paramTypes) {
294283
void setVarArgs() {
295284
isVarArgs = true;
296285
}
297-
298-
private void fetchRealParameterNames() {
299-
realParameterNames = getEnclosingType().getOracle().getJavaSourceParser().getArguments(
300-
this);
301-
}
302286
}

dev/core/src/com/google/gwt/dev/javac/typemodel/TypeOracle.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.google.gwt.core.ext.typeinfo.NotFoundException;
2323
import com.google.gwt.core.ext.typeinfo.ParseException;
2424
import com.google.gwt.core.ext.typeinfo.TypeOracleException;
25-
import com.google.gwt.dev.javac.JavaSourceParser;
2625
import com.google.gwt.dev.jjs.InternalCompilerException;
2726
import com.google.gwt.dev.util.Name;
2827
import com.google.gwt.dev.util.collect.HashMap;
@@ -248,8 +247,6 @@ private static List<String> modifierBitsToNamesForMethodsAndFields(int bits) {
248247
*/
249248
private JClassType javaScriptObject;
250249

251-
private final JavaSourceParser javaSourceParser = new JavaSourceParser();
252-
253250
/**
254251
* Maps SingleJsoImpl interfaces to the implementing JSO subtype.
255252
*/
@@ -665,10 +662,6 @@ void finish() {
665662
recentTypes.clear();
666663
}
667664

668-
JavaSourceParser getJavaSourceParser() {
669-
return javaSourceParser;
670-
}
671-
672665
private List<JClassType> classChain(JClassType cls) {
673666
LinkedList<JClassType> chain = new LinkedList<JClassType>();
674667
while (cls != null) {

dev/core/test/com/google/gwt/dev/javac/JavaCompilationSuite.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public static Test suite() {
4646
suite.addTestSuite(CompilationUnitFileReferenceTest.class);
4747
suite.addTestSuite(CompiledClassTest.class);
4848
suite.addTestSuite(GWTProblemTest.class);
49-
suite.addTestSuite(JavaSourceParserTest.class);
5049
suite.addTestSuite(JdtBehaviorTest.class);
5150
suite.addTestSuite(JdtCompilerTest.class);
5251
suite.addTestSuite(Java7JdtCompilerTest.class);

0 commit comments

Comments
 (0)