[gwt-contrib] Some Java AST cleanups. (issue1422805)

Tue, 19 Apr 2011 13:13:13 -0700 

Reviewers: jbrosenberg,

Message:
Just a few cleanups separate from a larger patch I'm working on.



Please review this at http://gwt-code-reviews.appspot.com/1422805/

Affected files:
  M dev/core/src/com/google/gwt/dev/jjs/ast/HasType.java
  M dev/core/src/com/google/gwt/dev/jjs/ast/JAbsentArrayDimension.java
  M dev/core/src/com/google/gwt/dev/jjs/ast/JNameOf.java
  M dev/core/src/com/google/gwt/dev/jjs/ast/JNewArray.java
  M dev/core/src/com/google/gwt/dev/jjs/ast/JNonNullType.java
  M dev/core/src/com/google/gwt/dev/jjs/impl/CloneExpressionVisitor.java
M dev/core/src/com/google/gwt/dev/jjs/impl/ImplementClassLiteralsAsFields.java 
  M dev/core/src/com/google/gwt/dev/jjs/impl/ReplaceRebinds.java
  M dev/core/src/com/google/gwt/dev/jjs/impl/TypeRemapper.java


Index: dev/core/src/com/google/gwt/dev/jjs/ast/HasType.java
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 d0a0c9d28ef7827f504bb42c610f3771e6ea6890..5b594fdc146623fa26ca6bd40001c0ab0f13254f 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 @@ package com.google.gwt.dev.jjs.ast;
* Interface implemented by Java entities that have a type associated with them. 
  */
 public interface HasType {
+  /**
+   * Returns the type of this expression.
+   */
   JType getType();
 }
Index: dev/core/src/com/google/gwt/dev/jjs/ast/JAbsentArrayDimension.java
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 6881fc48c99efed184becdf50968656184afccaf..51fe3c8943c21dd7874d746cc0e69d1bc1f02780 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 class JAbsentArrayDimension extends JLiteral {
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);
   }

Index: dev/core/src/com/google/gwt/dev/jjs/ast/JNameOf.java
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 776ed3a5584a0f9376301c09460a4b9abae6e2ab..104e910f3d325c70d7d350ea0aadeb44bf730389 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 @@ import com.google.gwt.dev.jjs.SourceInfo;
 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 class JNameOf extends JExpression {
   }

   public JNonNullType getType() {
-    return stringType;
+    return stringType.getNonNull();
   }

   @Override
Index: dev/core/src/com/google/gwt/dev/jjs/ast/JNewArray.java
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 b0980d9bcc50a0f29d4ad214a780ba16457a5e78..4ceec032292124fac09ac161b5e466cefd500739 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 @@ public class JNewArray extends JExpression {
       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 @@ public class JNewArray extends JExpression {
    */
   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 class JNewArray extends JExpression {
   }

   public JNonNullType getType() {
-    return type;
+    return type.getNonNull();
   }

   @Override
@@ -120,8 +120,7 @@ public class JNewArray extends JExpression {
     return false;
   }

-  public void setType(JNonNullType type) {
-    assert type.getUnderlyingType() instanceof JArrayType;
+  public void setType(JArrayType type) {
     this.type = type;
   }

Index: dev/core/src/com/google/gwt/dev/jjs/ast/JNonNullType.java
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 32b53afa5ff163ad6ab4338efa96cedcdc3a15c3..e87aff2839be9396be1b8b89f963d2cf950a8d5b 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 @@ public class JNonNullType extends JReferenceType {
     return ref.isAbstract();
   }

+  @Override
+  public boolean isExternal() {
+    return ref.isExternal();
+  }
+
   public boolean isFinal() {
     return ref.isFinal();
   }
Index: dev/core/src/com/google/gwt/dev/jjs/impl/CloneExpressionVisitor.java
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 510b28b08b375237a1c112be00926b97e3c9b9f9..b953a47f6ca1b6820d9d371deba2f6bb0a864ebc 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.JBooleanLiteral;
 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 @@ public class CloneExpressionVisitor extends JVisitor {

   @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;
   }
Index: dev/core/src/com/google/gwt/dev/jjs/impl/ImplementClassLiteralsAsFields.java 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 511dbc680a2a062cc754024026350e49e8dfd8f0..a391c534027b123a2a4b78d2222ca44c5e1fb0f2 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 @@ public class ImplementClassLiteralsAsFields {
     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
Index: dev/core/src/com/google/gwt/dev/jjs/impl/ReplaceRebinds.java
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 66db95404cbdf84063e4974b5b243672c0141d08..60e46492102c46328c2537fa4460cee6d0d843d4 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 @@ public class ReplaceRebinds {
         // 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)); 
       }
     }
   }
Index: dev/core/src/com/google/gwt/dev/jjs/impl/TypeRemapper.java
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 94a2625a6453c8aef895ff9a56ee1e447469d360..ef5bf10465a7b1f209794fa9ff4f126b993e462b 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.JGwtCreate;
 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 @@ public class TypeRemapper extends JModVisitor {

   @Override
   public void endVisit(JNewArray x, Context ctx) {
-    x.setType((JNonNullType) remap(x.getType()));
+    x.setType((JArrayType) remap(x.getArrayType()));
   }

   @Override


--
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to