Some Java AST cleanups.
http://gwt-code-reviews.appspot.com/1422805/
Review by: jbrosenberg@google.com
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10038 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/HasType.java b/dev/core/src/com/google/gwt/dev/jjs/ast/HasType.java
index d0a0c9d..5b594fd 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/ast/HasType.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/ast/HasType.java
@@ -19,5 +19,8 @@
* Interface implemented by Java entities that have a type associated with them.
*/
public interface HasType {
+ /**
+ * Returns the type of this expression.
+ */
JType getType();
}
diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JAbsentArrayDimension.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JAbsentArrayDimension.java
index 6881fc4..51fe3c8 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/ast/JAbsentArrayDimension.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/ast/JAbsentArrayDimension.java
@@ -26,10 +26,7 @@
public static final JExpression INSTANCE = new JAbsentArrayDimension(SourceOrigin.UNKNOWN);
- /**
- * These are only supposed to be constructed by JProgram.
- */
- JAbsentArrayDimension(SourceInfo sourceInfo) {
+ private JAbsentArrayDimension(SourceInfo sourceInfo) {
super(sourceInfo);
}
diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JNameOf.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JNameOf.java
index 776ed3a..104e910 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/ast/JNameOf.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/ast/JNameOf.java
@@ -23,12 +23,13 @@
public class JNameOf extends JExpression {
private final HasName node;
- private final JNonNullType stringType;
+ private final JClassType stringType;
- public JNameOf(SourceInfo info, JNonNullType stringType, HasName node) {
+ public JNameOf(SourceInfo info, JClassType stringType, HasName node) {
super(info);
this.node = node;
this.stringType = stringType;
+ assert stringType.getName().equals("java.lang.String");
}
public HasName getNode() {
@@ -36,7 +37,7 @@
}
public JNonNullType getType() {
- return stringType;
+ return stringType.getNonNull();
}
@Override
diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JNewArray.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JNewArray.java
index b0980d9..4ceec03 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/ast/JNewArray.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/ast/JNewArray.java
@@ -44,14 +44,14 @@
classLiterals.add(classLit);
cur = ((JArrayType) cur).getElementType();
}
- return new JNewArray(info, arrayType.getNonNull(), dims, null, classLiterals);
+ return new JNewArray(info, arrayType, dims, null, classLiterals);
}
public static JNewArray createInitializers(SourceInfo info, JArrayType arrayType,
List<JExpression> initializers) {
List<JClassLiteral> classLiterals = new ArrayList<JClassLiteral>();
classLiterals.add(new JClassLiteral(info.makeChild(), arrayType));
- return new JNewArray(info, arrayType.getNonNull(), null, initializers, classLiterals);
+ return new JNewArray(info, arrayType, null, initializers, classLiterals);
}
public final List<JExpression> dims;
@@ -63,12 +63,12 @@
*/
private final List<JClassLiteral> classLiterals;
- private JNonNullType type;
+ private JArrayType type;
- public JNewArray(SourceInfo info, JNonNullType type, List<JExpression> dims,
+ public JNewArray(SourceInfo info, JArrayType type, List<JExpression> dims,
List<JExpression> initializers, List<JClassLiteral> classLits) {
super(info);
- setType(type);
+ this.type = type;
this.dims = dims;
this.initializers = initializers;
this.classLiterals = classLits;
@@ -97,7 +97,7 @@
}
public JNonNullType getType() {
- return type;
+ return type.getNonNull();
}
@Override
@@ -120,8 +120,7 @@
return false;
}
- public void setType(JNonNullType type) {
- assert type.getUnderlyingType() instanceof JArrayType;
+ public void setType(JArrayType type) {
this.type = type;
}
diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JNonNullType.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JNonNullType.java
index 32b53af..e87aff2 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/ast/JNonNullType.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/ast/JNonNullType.java
@@ -53,6 +53,11 @@
return ref.isAbstract();
}
+ @Override
+ public boolean isExternal() {
+ return ref.isExternal();
+ }
+
public boolean isFinal() {
return ref.isFinal();
}
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/CloneExpressionVisitor.java b/dev/core/src/com/google/gwt/dev/jjs/impl/CloneExpressionVisitor.java
index 510b28b..b953a47 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/CloneExpressionVisitor.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/CloneExpressionVisitor.java
@@ -25,6 +25,7 @@
import com.google.gwt.dev.jjs.ast.JCastOperation;
import com.google.gwt.dev.jjs.ast.JCharLiteral;
import com.google.gwt.dev.jjs.ast.JClassLiteral;
+import com.google.gwt.dev.jjs.ast.JClassType;
import com.google.gwt.dev.jjs.ast.JConditional;
import com.google.gwt.dev.jjs.ast.JDoubleLiteral;
import com.google.gwt.dev.jjs.ast.JExpression;
@@ -232,14 +233,15 @@
@Override
public boolean visit(JNameOf x, Context ctx) {
- expression = new JNameOf(x.getSourceInfo(), x.getType(), x.getNode());
+ expression =
+ new JNameOf(x.getSourceInfo(), (JClassType) x.getType().getUnderlyingType(), x.getNode());
return false;
}
@Override
public boolean visit(JNewArray x, Context ctx) {
expression =
- new JNewArray(x.getSourceInfo(), x.getType(), cloneExpressions(x.dims),
+ new JNewArray(x.getSourceInfo(), x.getArrayType(), cloneExpressions(x.dims),
cloneExpressions(x.initializers), x.getClassLiterals());
return false;
}
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/EnumOrdinalizer.java b/dev/core/src/com/google/gwt/dev/jjs/impl/EnumOrdinalizer.java
index a1f35fd..7cdbdc5 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/EnumOrdinalizer.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/EnumOrdinalizer.java
@@ -33,6 +33,7 @@
import com.google.gwt.dev.jjs.ast.JMethodCall;
import com.google.gwt.dev.jjs.ast.JModVisitor;
import com.google.gwt.dev.jjs.ast.JNode;
+import com.google.gwt.dev.jjs.ast.JNonNullType;
import com.google.gwt.dev.jjs.ast.JPrimitiveType;
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.jjs.ast.JReferenceType;
@@ -770,13 +771,14 @@
return JPrimitiveType.INT;
}
- JType uType = getPossiblyUnderlyingType(type);
+ boolean nonNull = type instanceof JNonNullType;
+ JType uType = nonNull ? ((JNonNullType) type).getUnderlyingType() : type;
if (uType instanceof JArrayType) {
JArrayType aType = (JArrayType) uType;
JType leafType = aType.getLeafType();
if (canBeOrdinal(leafType)) {
JArrayType newAType = program.getTypeArray(JPrimitiveType.INT, aType.getDims());
- return newAType.getNonNull();
+ return nonNull ? newAType.getNonNull() : newAType;
}
}
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementClassLiteralsAsFields.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementClassLiteralsAsFields.java
index 511dbc6..a391c53 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementClassLiteralsAsFields.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementClassLiteralsAsFields.java
@@ -171,11 +171,11 @@
if (type instanceof JArrayType) {
// There's only one seed function for all arrays
JDeclaredType arrayType = program.getIndexedType("Array");
- call.addArg(new JNameOf(info, className.getType(), arrayType));
+ call.addArg(new JNameOf(info, program.getTypeJavaLangString(), arrayType));
} else if (type instanceof JClassType) {
// Add the name of the seed function for concrete types
- call.addArg(new JNameOf(info, className.getType(), type));
+ call.addArg(new JNameOf(info, program.getTypeJavaLangString(), type));
} else if (type instanceof JPrimitiveType) {
// And give primitive types an illegal, though meaningful, value
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ReplaceRebinds.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ReplaceRebinds.java
index 66db954..60e4649 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/ReplaceRebinds.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/ReplaceRebinds.java
@@ -138,7 +138,7 @@
// Not found, must be null
ctx.replaceMe(JNullLiteral.INSTANCE);
} else {
- ctx.replaceMe(new JNameOf(x.getSourceInfo(), stringLiteral.getType(), named));
+ ctx.replaceMe(new JNameOf(x.getSourceInfo(), program.getTypeJavaLangString(), named));
}
}
}
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/TypeRemapper.java b/dev/core/src/com/google/gwt/dev/jjs/impl/TypeRemapper.java
index 94a2625..ef5bf10 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/TypeRemapper.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/TypeRemapper.java
@@ -16,6 +16,7 @@
package com.google.gwt.dev.jjs.impl;
import com.google.gwt.dev.jjs.ast.Context;
+import com.google.gwt.dev.jjs.ast.JArrayType;
import com.google.gwt.dev.jjs.ast.JBinaryOperation;
import com.google.gwt.dev.jjs.ast.JCastOperation;
import com.google.gwt.dev.jjs.ast.JConditional;
@@ -24,7 +25,6 @@
import com.google.gwt.dev.jjs.ast.JMethod;
import com.google.gwt.dev.jjs.ast.JModVisitor;
import com.google.gwt.dev.jjs.ast.JNewArray;
-import com.google.gwt.dev.jjs.ast.JNonNullType;
import com.google.gwt.dev.jjs.ast.JType;
import com.google.gwt.dev.jjs.ast.JVariable;
@@ -75,7 +75,7 @@
@Override
public void endVisit(JNewArray x, Context ctx) {
- x.setType((JNonNullType) remap(x.getType()));
+ x.setType((JArrayType) remap(x.getArrayType()));
}
@Override
