svn commit: r1081932 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/rewrite/js/ExportJsCompiler.java test/java/org/apache/shindig/gadgets/rewrite/js/ExportJsCompilerTest.java

[mh...@apache.org]

Author: mhermanto
Date: Tue Mar 15 20:37:43 2011
New Revision: 1081932

URL: http://svn.apache.org/viewvc?rev=1081932&view=rev
Log:
Avoid wrapping each feature in anon function. Each wrapper avoids compiler from doing aggressive compilation of symbols shared across features.
http://codereview.appspot.com/4280051/

Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ExportJsCompiler.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/ExportJsCompilerTest.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ExportJsCompiler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ExportJsCompiler.java?rev=1081932&r1=1081931&r2=1081932&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ExportJsCompiler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ExportJsCompiler.java Tue Mar 15 20:37:43 2011
@@ -59,10 +59,8 @@ public class ExportJsCompiler extends De
   public String getJsContent(JsUri jsUri, FeatureBundle bundle) {
     StringBuilder builder = new StringBuilder();
     builder.append("\n/* feature=").append(bundle.getName()).append(" */\n");
-    builder.append("(function() {");
     builder.append(super.getJsContent(jsUri, bundle));
     appendExportsForFeature(builder, jsUri, bundle);
-    builder.append("})();");
     builder.append("\n/* feature=").append(bundle.getName()).append(" */\n");
     return builder.toString();
   }
@@ -73,6 +71,7 @@ public class ExportJsCompiler extends De
     StringBuilder builder = new StringBuilder();
     builder.append(getExportJsFeature(ctx));
     builder.append(content);
+    // TODO: attach this to a real JS compiler jscomp.Compiler.
     return new Result(builder.toString());
   }
 

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/ExportJsCompilerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/ExportJsCompilerTest.java?rev=1081932&r1=1081931&r2=1081932&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/ExportJsCompilerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/js/ExportJsCompilerTest.java Tue Mar 15 20:37:43 2011
@@ -142,8 +142,6 @@ public class ExportJsCompilerTest {
     String actual = compiler.getJsContent(jsUri, bundle);
     assertEquals(
         "\n/* feature=" + RESOURCE_NAME + " */\n" +
-        "(function() {" +
-        "})();" +
         "\n/* feature=" + RESOURCE_NAME + " */\n",
         actual);
   }
@@ -157,14 +155,12 @@ public class ExportJsCompilerTest {
     String actual = compiler.getJsContent(jsUri, bundle);
     assertEquals(
         "\n/* feature=" + RESOURCE_NAME + " */\n" +
-        "(function() {" +
         "document.write('<script src=\"" + RESOURCE_URL_DEB + "\"></script>');\n" +
         RESOURCE_CONTENT_DEB + ";\n" +
         "exportJs('gadgets',[gadgets]);" +
         "exportJs('cc',[cc]);" +
         "exportJs('gadgets.rpc',[gadgets,gadgets.rpc],{call:'call'});" +
         "exportJs('cc.prototype',[cc,cc.prototype],{site:'site'});" +
-        "})();" +
         "\n/* feature=" + RESOURCE_NAME + " */\n",
         actual);
   }