commit c6b398130c6c9ccbc1577c42c0f656d175859d5c
author scottb@google.com <scottb@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Sat Mar 29 04:07:02 2008 +0000
committer scottb@google.com <scottb@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Sat Mar 29 04:07:02 2008 +0000
tree 0b1f4779ad4dfd339e4c20cd686323e7f8753e86
parent 647966b582cb2c5bdb9131797245d6cf485e5308

Better debug printing of Method / MethodBody.


git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@2284 8db76d5a-ed1c-0410-87a9-c151d255dfc7

dev/core/src/com/google/gwt/dev/jjs/impl/ToStringGenerationVisitor.java

diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ToStringGenerationVisitor.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ToStringGenerationVisitor.java
index 5d3ddac..c87a63d 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/ToStringGenerationVisitor.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/ToStringGenerationVisitor.java
@@ -37,6 +37,7 @@
 import com.google.gwt.dev.jjs.ast.JClassType;
 import com.google.gwt.dev.jjs.ast.JConditional;
 import com.google.gwt.dev.jjs.ast.JContinueStatement;
+import com.google.gwt.dev.jjs.ast.JDeclarationStatement;
 import com.google.gwt.dev.jjs.ast.JDoStatement;
 import com.google.gwt.dev.jjs.ast.JDoubleLiteral;
 import com.google.gwt.dev.jjs.ast.JExpression;
@@ -52,11 +53,9 @@
 import com.google.gwt.dev.jjs.ast.JLabel;
 import com.google.gwt.dev.jjs.ast.JLabeledStatement;
 import com.google.gwt.dev.jjs.ast.JLocal;
-import com.google.gwt.dev.jjs.ast.JDeclarationStatement;
 import com.google.gwt.dev.jjs.ast.JLocalRef;
 import com.google.gwt.dev.jjs.ast.JLongLiteral;
 import com.google.gwt.dev.jjs.ast.JMethod;
-import com.google.gwt.dev.jjs.ast.JMethodBody;
 import com.google.gwt.dev.jjs.ast.JMethodCall;
 import com.google.gwt.dev.jjs.ast.JNewArray;
 import com.google.gwt.dev.jjs.ast.JNewInstance;
@@ -81,7 +80,6 @@
 import com.google.gwt.dev.jjs.ast.JWhileStatement;
 import com.google.gwt.dev.jjs.ast.js.JMultiExpression;
 import com.google.gwt.dev.jjs.ast.js.JsniFieldRef;
-import com.google.gwt.dev.jjs.ast.js.JsniMethodBody;
 import com.google.gwt.dev.jjs.ast.js.JsniMethodRef;
 import com.google.gwt.dev.jjs.ast.js.JsonArray;
 import com.google.gwt.dev.jjs.ast.js.JsonObject;
@@ -585,38 +583,24 @@
       if (x.isStatic()) {
         print(CHARS_STATIC);
       }
-      if (shouldPrintMethodBody()) {
-        accept(x.getBody());
-      } else {
-        print("{ ... }");
-        newlineOpt();
+      if (!shouldPrintMethodBody()) {
+        print("{...}");
       }
     } else {
       printMethodHeader(x);
-      if (shouldPrintMethodBody() && !x.isAbstract()) {
-        space();
-        accept(x.getBody());
-      } else {
-        semi();
-        newlineOpt();
-      }
+    }
+
+    if (x.isAbstract() || !shouldPrintMethodBody()) {
+      semi();
+      newlineOpt();
+    } else {
+      accept(x.getBody());
     }
 
     return false;
   }
 
   @Override
-  public boolean visit(JMethodBody x, Context ctx) {
-    if (shouldPrintMethodBody()) {
-      accept(x.getBlock());
-      return false;
-    } else {
-      visitCollectionWithCommas(x.locals.iterator());
-      return false;
-    }
-  }
-
-  @Override
   public boolean visit(JMethodCall x, Context ctx) {
     JExpression instance = x.getInstance();
     JMethod target = x.getTarget();
@@ -751,16 +735,6 @@
   }
 
   @Override
-  public boolean visit(JsniMethodBody x, Context ctx) {
-    print("/*-{");
-    // don't visit my block
-    newline();
-    print("}-*/");
-    semi();
-    return false;
-  }
-
-  @Override
   public boolean visit(JsniMethodRef x, Context ctx) {
     printMethodHeader(x.getTarget());
     return false;