Rename GwtAstBuilder to JackIrBuilder

- Remove also some references to GWT

Change-Id: I8669d599d3b29b7eaf914c418f4cca81110d7cdc

10 files changed, 24 insertions, 25 deletions

diff --git a/jack/src/com/android/jack/JackEventType.java b/jack/src/com/android/jack/JackEventType.java
index 50227d5..81b3591 100644
--- a/jack/src/com/android/jack/JackEventType.java
+++ b/jack/src/com/android/jack/JackEventType.java
@@ -35,7 +35,7 @@ public enum JackEventType implements EventType {
   METHOD_ID_MERGER("Method id merger"),
   PRELOOKUP("Pre-lookup"),
   ECJ_COMPILATION("ECJ compilation"),
-  GWT_AST_BUILDER("GwtAstBuilder"),
+  JACK_IR_BUILDER("Jack IR Builder"),
   J_AST_BUILDER("JAstBuilder"),
   DX_OPTIMIZATION("Dx optimizations on RopMethod"),
   REMOVE_DEAD_CODE("Remove dead code"),
diff --git a/jack/src/com/android/jack/backend/dex/rop/RopHelper.java b/jack/src/com/android/jack/backend/dex/rop/RopHelper.java
index b561df4..d62208e 100644
--- a/jack/src/com/android/jack/backend/dex/rop/RopHelper.java
+++ b/jack/src/com/android/jack/backend/dex/rop/RopHelper.java
@@ -176,10 +176,10 @@ public class RopHelper {
   }
 
   /**
-   * Converts a {@code JType} of GWT IR into a {@code Type} of dx.
+   * Converts a {@code JType} into a {@code Type} of dx.
    *
-   * @param type The GWT type to convert.
-   * @return The dx type representing the GWT Type.
+   * @param type The {@code JType} to convert.
+   * @return The dx type representing the {@code JType}.
    */
   @Nonnull
   public static Type convertTypeToDx(@Nonnull JType type) {
diff --git a/jack/src/com/android/jack/frontend/FrontendCompilationException.java b/jack/src/com/android/jack/frontend/FrontendCompilationException.java
index e44a5d8..bd2154a 100644
--- a/jack/src/com/android/jack/frontend/FrontendCompilationException.java
+++ b/jack/src/com/android/jack/frontend/FrontendCompilationException.java
@@ -20,7 +20,7 @@ import javax.annotation.Nonnull;
 
 
 /**
- * Exception representing a problem during conversion of java source file to GWT IR.
+ * Exception representing a problem during conversion of java source file to Jack IR.
  */
 public class FrontendCompilationException extends RuntimeException {
 
diff --git a/jack/src/com/android/jack/frontend/java/JAstBuilder.java b/jack/src/com/android/jack/frontend/java/JAstBuilder.java
index 4f38468..51201f9 100644
--- a/jack/src/com/android/jack/frontend/java/JAstBuilder.java
+++ b/jack/src/com/android/jack/frontend/java/JAstBuilder.java
@@ -23,7 +23,7 @@ import com.android.jack.ir.ast.JDefinedClassOrInterface;
 import com.android.jack.ir.ast.JPackage;
 import com.android.jack.ir.ast.JSession;
 import com.android.jack.ir.impl.EcjSourceTypeLoader;
-import com.android.jack.ir.impl.GwtAstBuilder;
+import com.android.jack.ir.impl.JackIrBuilder;
 import com.android.jack.ir.impl.ReferenceMapper;
 import com.android.sched.util.location.FileLocation;
 import com.android.sched.util.log.Event;
@@ -61,7 +61,7 @@ class JAstBuilder extends JavaParser {
   private final JSession session;
 
   @Nonnull
-  private final GwtAstBuilder astBuilder;
+  private final JackIrBuilder astBuilder;
 
   @Nonnull
   private final JayceFileImporter jayceImporter;
@@ -92,7 +92,7 @@ class JAstBuilder extends JavaParser {
         out,
         progress);
     this.session = session;
-    astBuilder = new GwtAstBuilder(lookupEnvironment, session);
+    astBuilder = new JackIrBuilder(lookupEnvironment, session);
     this.jayceImporter = jayceImporter;
   }
 
@@ -127,16 +127,16 @@ class JAstBuilder extends JavaParser {
 
         loadLocalClasses(unit);
 
-        // Generate GWT IR after each compilation of CompilationUnitDeclaration.
+        // Generate Jack IR after each compilation of CompilationUnitDeclaration.
         // It could not be done at the end of compile(ICompilationUnit[] sourceUnits) method since
         // reset method of ecj was called by super.compile(sourceUnits) and after the lookup
         // environment is no longer usable.
-        Event gwtEvent = tracer.start(JackEventType.GWT_AST_BUILDER);
+        Event jackIrBuilderEvent = tracer.start(JackEventType.JACK_IR_BUILDER);
         List<JDefinedClassOrInterface> types;
         try {
           types = astBuilder.process(unit);
         } finally {
-          gwtEvent.end();
+          jackIrBuilderEvent.end();
         }
 
         for (JDefinedClassOrInterface type : types) {
diff --git a/jack/src/com/android/jack/ir/ast/JDefinedClassOrInterface.java b/jack/src/com/android/jack/ir/ast/JDefinedClassOrInterface.java
index d0a9477..faff0b2 100644
--- a/jack/src/com/android/jack/ir/ast/JDefinedClassOrInterface.java
+++ b/jack/src/com/android/jack/ir/ast/JDefinedClassOrInterface.java
@@ -49,8 +49,7 @@ public abstract class JDefinedClassOrInterface extends JDefinedReferenceType
   /**
    * The type which originally enclosed this type. Null if this class was a
    * top-level type. Note that all classes are converted to top-level types in
-   * {@code com.android.gwt.dev.jjs.impl.GenerateJavaAST}; this information is
-   * for tracking purposes.
+   * {@code JackIrBuilder}; this information is for tracking purposes.
    */
   private JClassOrInterface enclosingType;
 
diff --git a/jack/src/com/android/jack/ir/ast/JModifier.java b/jack/src/com/android/jack/ir/ast/JModifier.java
index 5dfdc81..d4af47d 100644
--- a/jack/src/com/android/jack/ir/ast/JModifier.java
+++ b/jack/src/com/android/jack/ir/ast/JModifier.java
@@ -45,7 +45,7 @@ public class JModifier {
   public static final int CLASS_COMPILED_WITH_JACK = 0x80000;
   public static final int DEPRECATED   = 0x100000;
 
-  // Extra GWT modifiers
+  // Extra Jack modifiers
   public static final int COMPILE_TIME_CONSTANT = 0x20000;
   public static final int ANONYMOUS_TYPE        = 0x40000;
 
diff --git a/jack/src/com/android/jack/ir/ast/JNode.java b/jack/src/com/android/jack/ir/ast/JNode.java
index 25f24e5..c15ef5a 100644
--- a/jack/src/com/android/jack/ir/ast/JNode.java
+++ b/jack/src/com/android/jack/ir/ast/JNode.java
@@ -212,7 +212,7 @@ public abstract class JNode extends LocalMarkerManager
     int indexOfExisting = list.indexOf(existingNode);
     if (indexOfExisting != -1) {
       // TODO(jmhenaff): Rethink how this is done eventually.
-      // The fact that GWT uses Lists lead to this implementation.
+      // The fact that Jack uses Lists lead to this implementation.
       switch (transformation) {
         case INSERT_AFTER:
           assert newNode != null;
diff --git a/jack/src/com/android/jack/ir/impl/EcjSourceTypeLoader.java b/jack/src/com/android/jack/ir/impl/EcjSourceTypeLoader.java
index 6e202ad..7bc06ad 100644
--- a/jack/src/com/android/jack/ir/impl/EcjSourceTypeLoader.java
+++ b/jack/src/com/android/jack/ir/impl/EcjSourceTypeLoader.java
@@ -261,7 +261,7 @@ public class EcjSourceTypeLoader implements ClassOrInterfaceLoader {
 
   @Override
   public void ensureAnnotations(@Nonnull JDefinedClassOrInterface loaded) {
-    // Not yet supported here, only done by GwtAstBuilder in full pass
+    // Not yet supported here, only done by JackIrBuilder in full pass
   }
 
   @Override
@@ -368,7 +368,7 @@ public class EcjSourceTypeLoader implements ClassOrInterfaceLoader {
       if (binding.isAnonymousType()) {
         accessFlags |= JModifier.ANONYMOUS_TYPE;
         // add missing static flag on static anonymous classes
-        if (GwtAstBuilder.isNested(binding)) {
+        if (JackIrBuilder.isNested(binding)) {
           NestedTypeBinding nestedBinding = (NestedTypeBinding) binding;
           accessFlags |= JModifier.STATIC;
           if (nestedBinding.enclosingInstances != null) {
diff --git a/jack/src/com/android/jack/ir/impl/GwtAstBuilder.java b/jack/src/com/android/jack/ir/impl/JackIrBuilder.java
index b3c0e37..49c89f5 100644
--- a/jack/src/com/android/jack/ir/impl/GwtAstBuilder.java
+++ b/jack/src/com/android/jack/ir/impl/JackIrBuilder.java
@@ -240,11 +240,11 @@ import javax.annotation.Nonnegative;
 import javax.annotation.Nonnull;
 
 /**
- * Constructs a GWT Java AST from a single isolated compilation unit. The AST is
+ * Constructs a Jack IR from a single isolated compilation unit. The AST is
  * not associated with any {@link com.android.jack.ir.ast.JSession} and will
  * contain unresolved references.
  */
-public class GwtAstBuilder {
+public class JackIrBuilder {
 
   /**
    * Visit the JDT AST and produce our own AST. By the end of this pass, the
@@ -2171,12 +2171,12 @@ public class GwtAstBuilder {
      *
      * <p>
      * This method should only be called once all regular, non-bridge methods
-     * have been installed on the GWT types.
+     * have been installed on the Jack types.
      * </p>
      */
     private void addBridgeMethods(SourceTypeBinding clazzBinding) {
       /*
-       * JDT adds bridge methods in all the places GWT needs them. Use JDT's
+       * JDT adds bridge methods in all the places Jack needs them. Use JDT's
        * bridge methods.
        */
       if (clazzBinding.syntheticMethods() != null) {
@@ -3219,7 +3219,7 @@ public class GwtAstBuilder {
   @Nonnull
   private final JSession session;
 
-  public GwtAstBuilder(@Nonnull LookupEnvironment lookupEnvironment,
+  public JackIrBuilder(@Nonnull LookupEnvironment lookupEnvironment,
       @Nonnull JSession session) {
     this.lookupEnvironment = lookupEnvironment;
     typeMap = new ReferenceMapper(session.getLookup(), lookupEnvironment);
@@ -3303,7 +3303,7 @@ public class GwtAstBuilder {
 
   @Nonnull
   static SourceInfo makeSourceInfo(@Nonnull CudInfo cuInfo, @Nonnull ASTNode x) {
-    return GwtAstBuilder.makeSourceInfo(cuInfo, x.sourceStart, x.sourceEnd);
+    return JackIrBuilder.makeSourceInfo(cuInfo, x.sourceStart, x.sourceEnd);
   }
 
   @Nonnull
diff --git a/jack/src/com/android/jack/ir/impl/ReferenceMapper.java b/jack/src/com/android/jack/ir/impl/ReferenceMapper.java
index f698020..0de0369 100644
--- a/jack/src/com/android/jack/ir/impl/ReferenceMapper.java
+++ b/jack/src/com/android/jack/ir/impl/ReferenceMapper.java
@@ -193,7 +193,7 @@ public class ReferenceMapper {
     Set<String> alreadyNamedVariables = new HashSet<String>();
     JDefinedClassOrInterface enclosingType = (JDefinedClassOrInterface) get(declaringClass);
     JMethod method;
-    boolean isNested = GwtAstBuilder.isNested(declaringClass);
+    boolean isNested = JackIrBuilder.isNested(declaringClass);
     int flags = b.getAccessFlags();
 
     if (b.isDeprecated()) {
@@ -552,7 +552,7 @@ public class ReferenceMapper {
 
   @Nonnull
   static SourceInfo makeSourceInfo(@Nonnull CudInfo cuInfo, @Nonnull ASTNode x) {
-    return GwtAstBuilder.makeSourceInfo(cuInfo, x.sourceStart, x.sourceEnd);
+    return JackIrBuilder.makeSourceInfo(cuInfo, x.sourceStart, x.sourceEnd);
   }
 
   static boolean isCompileTimeConstant(@Nonnull FieldBinding binding) {