[gwt-contrib] [google-web-toolkit commit] r4942 - in trunk/dev/core/src/com/google/gwt/dev/jjs: ast impl

[codesite-noreply]

Author: b...@google.com
Date: Thu Mar  5 09:34:06 2009
New Revision: 4942

Modified:
    trunk/dev/core/src/com/google/gwt/dev/jjs/ast/JTypeOracle.java
     
trunk/dev/core/src/com/google/gwt/dev/jjs/impl/JavaScriptObjectNormalizer.java

Log:
Clean up how tag interfaces are assigned to JavaScriptObject when  
implemented by SingleJsoImpl types.

Patch by: bobv
Review by: scottb
Reported by: macpherson


Modified: trunk/dev/core/src/com/google/gwt/dev/jjs/ast/JTypeOracle.java
==============================================================================
--- trunk/dev/core/src/com/google/gwt/dev/jjs/ast/JTypeOracle.java       
(original)
+++ trunk/dev/core/src/com/google/gwt/dev/jjs/ast/JTypeOracle.java      Thu Mar 
  
5 09:34:06 2009
@@ -652,6 +652,13 @@
      dualImpl.clear();
      jsoSingleImpls.clear();

+    JClassType jsoType = program.getJavaScriptObject();
+    if (jsoType == null) {
+      return;
+    }
+
+    jsoType.implments.clear();
+
      for (JReferenceType type : program.getDeclaredTypes()) {
        if (!program.isJavaScriptObject(type)) {
          if (type instanceof JClassType) {
@@ -675,6 +682,7 @@
            assert intr.methods.size() == 0
                || intr.methods.get(0).getName().equals("$clinit");
            jsoSingleImpls.put(intr, program.getJavaScriptObject());
+          jsoType.implments.add(intr);
            continue;
          }


Modified:  
trunk/dev/core/src/com/google/gwt/dev/jjs/impl/JavaScriptObjectNormalizer.java
==============================================================================
---  
trunk/dev/core/src/com/google/gwt/dev/jjs/impl/JavaScriptObjectNormalizer.java  
 
(original)
+++  
trunk/dev/core/src/com/google/gwt/dev/jjs/impl/JavaScriptObjectNormalizer.java  
 
Thu Mar  5 09:34:06 2009
@@ -37,7 +37,6 @@
  import com.google.gwt.dev.jjs.ast.JProgram;
  import com.google.gwt.dev.jjs.ast.JReferenceType;
  import com.google.gwt.dev.jjs.ast.JType;
-import com.google.gwt.dev.jjs.ast.JVisitor;
  import com.google.gwt.dev.jjs.ast.js.JMultiExpression;

  import java.util.Map;
@@ -48,19 +47,6 @@
   * Replace references to JSO subtypes with JSO itself.
   */
  public class JavaScriptObjectNormalizer {
-  private class Collector extends JVisitor {
-
-    @Override
-    public void endVisit(JClassType x, Context ctx) {
-      if (program.isJavaScriptObject(x)) {
-        for (JInterfaceType intr : x.implments) {
-          if (isTagInterface(intr) && !jsoType.implments.contains(intr)) {
-            jsoType.implments.add(intr);
-          }
-        }
-      }
-    }
-  }
    /**
     * Map types from JSO subtypes to JSO itself.
     */
@@ -275,43 +261,16 @@
     */
    private final Map<JInterfaceType, JClassType> jsoSingleImpls;

-  private final JClassType jsoType;
-
    private final JProgram program;

    private JavaScriptObjectNormalizer(JProgram program) {
      this.program = program;
      dualImpl = program.typeOracle.getInterfacesWithJavaAndJsoImpls();
      jsoSingleImpls = program.typeOracle.getSingleJsoImpls();
-
-    jsoType = program.getJavaScriptObject();
-    jsoType.implments.addAll(dualImpl);
    }

    private void execImpl() {
-    new Collector().accept(program);
-
      NormalizeVisitor visitor = new NormalizeVisitor();
      visitor.accept(program);
-  }
-
-  private boolean isTagInterface(JReferenceType intr) {
-    if (!(intr instanceof JInterfaceType)) {
-      return false;
-    }
-
-    if (intr.methods.size() > 1) {
-      assert intr.methods.size() == 0
-          || intr.methods.get(0).getName().equals("$clinit");
-      return false;
-    }
-
-    for (JInterfaceType t : intr.implments) {
-      if (!isTagInterface(t)) {
-        return false;
-      }
-    }
-
-    return true;
    }
  }

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