[Laszlo-checkins] r6385 - openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc

[ptw@openlaszlo.org]

Author: ptw
Date: 2007-09-06 11:57:54 -0700 (Thu, 06 Sep 2007)
New Revision: 6385

Modified:
   openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java
   openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc/JavascriptCompressor.java
Log:
Change 20070906-ptw-D by ptw at dueling-banjos.local on 2007-09-06 14:47:23 EDT
    in /Users/ptw/OpenLaszlo/wafflecone
    for http://svn.openlaszlo.org/openlaszlo/branches/wafflecone

Summary: Fix lossage in binary compressor

Bugs Fixed:
LPP-4665 'Compilation of some binary libraries fails'

Technical Reviewer: hminsky (pending)
QA Reviewer: ewinard (pending)

Details:
    

Tests:
    Test case from bug now compiles



Modified: openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java
===================================================================
--- openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java	2007-09-06 18:56:58 UTC (rev 6384)
+++ openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc/Compiler.java	2007-09-06 18:57:54 UTC (rev 6385)
@@ -1269,12 +1269,13 @@
         thisPrec = prec(Ops.COLON, false);
       } else if (node instanceof ASTNewExpression) {
         thisPrec = prec(Ops.NEW, true);
-      } else if (node instanceof ASTCallExpression) {
+      } else if (node instanceof ASTCallExpression ||
+                 node instanceof ASTSuperCallExpression) {
         thisPrec = prec(Ops.LPAREN, true);
       } else if (node instanceof ASTPropertyValueReference) {
+        thisPrec = prec(Ops.LBRACKET, true);
+      } else if (node instanceof ASTPropertyIdentifierReference) {
         thisPrec = prec(Ops.DOT, true);
-      } else if (node instanceof ASTPropertyIdentifierReference) {
-        thisPrec = prec(Ops.LBRACKET, true);
       } else if (node instanceof ASTExpressionList) {
         thisPrec = prec(Ops.COMMA, false);
       } else if (// Our compiler is broken -- if one of these shows up

Modified: openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc/JavascriptCompressor.java
===================================================================
--- openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc/JavascriptCompressor.java	2007-09-06 18:56:58 UTC (rev 6384)
+++ openlaszlo/branches/wafflecone/WEB-INF/lps/server/src/org/openlaszlo/sc/JavascriptCompressor.java	2007-09-06 18:57:54 UTC (rev 6385)
@@ -37,7 +37,7 @@
 
   // Don't transform super calls for compression
   public SimpleNode visitSuperCallExpression(SimpleNode node, boolean isReferenced, SimpleNode[] children) {
-    assert children.length == 2;
+    assert children.length == 3;
     for (int i = 0, len = children.length; i < len; i++) {
       SimpleNode child = children[i];
       children[i] = visitExpression(child, isReferenced);