[gwt-contrib] [google-web-toolkit commit] r5176 - Tweaks to pretty-printed Java source output

[codesite-noreply]

Author: sco...@google.com
Date: Thu Apr  2 17:54:10 2009
New Revision: 5176

Modified:
     
changes/scottb/memory/dev/core/src/com/google/gwt/dev/jjs/impl/SourceGenerationVisitor.java
     
changes/scottb/memory/dev/core/src/com/google/gwt/dev/jjs/impl/ToStringGenerationVisitor.java
     
changes/scottb/memory/dev/core/src/com/google/gwt/dev/js/JsSourceGenerationVisitor.java
     
changes/scottb/memory/dev/core/src/com/google/gwt/dev/js/JsToStringGenerationVisitor.java

Log:
Tweaks to pretty-printed Java source output

Modified:  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/jjs/impl/SourceGenerationVisitor.java
==============================================================================
---  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/jjs/impl/SourceGenerationVisitor.java
      
(original)
+++  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/jjs/impl/SourceGenerationVisitor.java
      
Thu Apr  2 17:54:10 2009
@@ -20,6 +20,7 @@
  import com.google.gwt.dev.jjs.ast.JField;
  import com.google.gwt.dev.jjs.ast.JInterfaceType;
  import com.google.gwt.dev.jjs.ast.JMethod;
+import com.google.gwt.dev.jjs.ast.JMethodBody;
  import com.google.gwt.dev.jjs.ast.JProgram;
  import com.google.gwt.dev.jjs.ast.JReferenceType;
  import com.google.gwt.dev.util.TextOutput;
@@ -48,10 +49,6 @@

    @Override
    public boolean visit(JClassType x, Context ctx) {
-    // All classes are deemed "static" so the monolithic compile results  
can be
-    // copy/pasted into a single enclosing class.
-    print(CHARS_STATIC);
-
      super.visit(x, ctx);

      openBlock();
@@ -64,6 +61,13 @@
      }
      for (int i = 0; i < x.methods.size(); ++i) {
        JMethod it = x.methods.get(i);
+      // Suppress empty clinit.
+      if (i == 0) {
+        JMethodBody body = (JMethodBody) it.getBody();
+        if (body.getBlock().getStatements().isEmpty()) {
+          continue;
+        }
+      }
        accept(it);
        newline();
        newline();

Modified:  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/jjs/impl/ToStringGenerationVisitor.java
==============================================================================
---  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/jjs/impl/ToStringGenerationVisitor.java
    
(original)
+++  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/jjs/impl/ToStringGenerationVisitor.java
    
Thu Apr  2 17:54:10 2009
@@ -88,6 +88,7 @@
  import com.google.gwt.dev.jjs.ast.js.JsonArray;
  import com.google.gwt.dev.jjs.ast.js.JsonObject;
  import com.google.gwt.dev.jjs.ast.js.JsonObject.JsonPropInit;
+import com.google.gwt.dev.js.JsSourceGenerationVisitor;
  import com.google.gwt.dev.util.TextOutput;

  import java.util.Iterator;
@@ -739,10 +740,13 @@
    }

    @Override
-  public boolean visit(JsniMethodBody x, Context ctx) {
+  public boolean visit(final JsniMethodBody x, Context ctx) {
      print(" /*-");
-    String source = x.getFunc().getBody().toSource();
-    print(source.trim());
+    new JsSourceGenerationVisitor(this) {
+      {
+        printJsBlock(x.getFunc().getBody(), false, false);
+      }
+    };
      print("-*/");
      semi();
      return false;

Modified:  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/js/JsSourceGenerationVisitor.java
==============================================================================
---  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/js/JsSourceGenerationVisitor.java
  
(original)
+++  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/js/JsSourceGenerationVisitor.java
  
Thu Apr  2 17:54:10 2009
@@ -45,7 +45,7 @@

    @Override
    public boolean visit(JsBlock x, JsContext<JsStatement> ctx) {
-    printJsBlockOptionalTruncate(x, false);
+    printJsBlock(x, false, true);
      return false;
    }


Modified:  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/js/JsToStringGenerationVisitor.java
==============================================================================
---  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/js/JsToStringGenerationVisitor.java
        
(original)
+++  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/js/JsToStringGenerationVisitor.java
        
Thu Apr  2 17:54:10 2009
@@ -179,7 +179,7 @@

    @Override
    public boolean visit(JsBlock x, JsContext<JsStatement> ctx) {
-    printJsBlockOptionalTruncate(x, true);
+    printJsBlock(x, true, true);
      return false;
    }

@@ -798,7 +798,7 @@
      p.newlineOpt();
    }

-  protected void printJsBlockOptionalTruncate(JsBlock x, boolean truncate)  
{
+  protected void printJsBlock(JsBlock x, boolean truncate, boolean  
finalNewline) {
      boolean needBraces = !x.isGlobalBlock();

      if (needBraces) {
@@ -849,9 +849,12 @@
      }

      if (needBraces) {
-      // Close braces.
-      //
-      _blockClose();
+      // _blockClose() modified
+      p.indentOut();
+      p.print('}');
+      if (finalNewline) {
+        _newlineOpt();
+      }
      }
      needSemi = false;
    }

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