[gwt-contrib] [google-web-toolkit commit] r5159 - SQUASH into "Remove Correlations & SourceInfo burden from non-SOYC builds."

[codesite-noreply]

Author: sco...@google.com
Date: Wed Apr  1 18:09:10 2009
New Revision: 5159

Modified:
    changes/scottb/memory/dev/core/src/com/google/gwt/dev/jjs/ast/JNode.java
     
changes/scottb/memory/dev/core/src/com/google/gwt/dev/jjs/impl/CompoundAssignmentNormalizer.java

Log:
SQUASH into "Remove Correlations & SourceInfo burden from non-SOYC builds."

There was a missing null SourceInfo case in here.  Also fixed assertion  
message.

Modified:  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/jjs/ast/JNode.java
==============================================================================
---  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/jjs/ast/JNode.java        
 
(original)
+++  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/jjs/ast/JNode.java        
 
Wed Apr  1 18:09:10 2009
@@ -31,7 +31,7 @@
    private final SourceInfo info;

    protected JNode(SourceInfo info) {
-    assert info != null : "SourceInfo must be provided for JsNodes";
+    assert info != null : "SourceInfo must be provided for JNodes";
      this.info = info;
    }


Modified:  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/jjs/impl/CompoundAssignmentNormalizer.java
==============================================================================
---  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/jjs/impl/CompoundAssignmentNormalizer.java
         
(original)
+++  
changes/scottb/memory/dev/core/src/com/google/gwt/dev/jjs/impl/CompoundAssignmentNormalizer.java
         
Wed Apr  1 18:09:10 2009
@@ -99,9 +99,9 @@
        JBinaryOperation operation = new JBinaryOperation(x.getSourceInfo(),
            newLhs.getType(), op.getNonAssignmentOf(), newLhs, x.getRhs());
        // newLhs is cloned below because it was used in operation
-      JBinaryOperation asg = new JBinaryOperation(x.getSourceInfo(),  
newLhs.getType(),
-          JBinaryOperator.ASG, cloner.cloneExpression(newLhs),
-          operation);
+      JBinaryOperation asg = new JBinaryOperation(x.getSourceInfo(),
+          newLhs.getType(), JBinaryOperator.ASG,
+          cloner.cloneExpression(newLhs), operation);

        JMultiExpression multiExpr = replacer.getMultiExpr();
        if (multiExpr.exprs.isEmpty()) {
@@ -147,8 +147,8 @@

        // t = x
        JLocalRef tempRef = new JLocalRef(x.getSourceInfo(), tempLocal);
-      JBinaryOperation asg = new JBinaryOperation(x.getSourceInfo(),  
x.getType(),
-          JBinaryOperator.ASG, tempRef, expressionReturn);
+      JBinaryOperation asg = new JBinaryOperation(x.getSourceInfo(),
+          x.getType(), JBinaryOperator.ASG, tempRef, expressionReturn);
        multi.exprs.add(asg);

        // x += 1
@@ -212,8 +212,8 @@
          one = program.getLiteralInt(1);
        }
        // arg is cloned below because the caller is allowed to use it  
somewhere
-      JBinaryOperation asg = new JBinaryOperation(arg.getSourceInfo(),  
arg.getType(),
-          newOp, cloner.cloneExpression(arg), one);
+      JBinaryOperation asg = new JBinaryOperation(arg.getSourceInfo(),
+          arg.getType(), newOp, cloner.cloneExpression(arg), one);
        return asg;
      }
    }
@@ -283,8 +283,8 @@

        // Create an assignment for this temp and add it to multi.
        JLocalRef tempRef = new JLocalRef(x.getSourceInfo(), tempLocal);
-      JBinaryOperation asg = new JBinaryOperation(x.getSourceInfo(),  
x.getType(),
-          JBinaryOperator.ASG, tempRef, x);
+      JBinaryOperation asg = new JBinaryOperation(x.getSourceInfo(),
+          x.getType(), JBinaryOperator.ASG, tempRef, x);
        multi.exprs.add(asg);
        // Update me with the temp
        return cloner.cloneExpression(tempRef);
@@ -439,7 +439,7 @@
      }

      if (temp == null) {
-      temp = program.createLocal(null,
+      temp = program.createLocal(currentMethodBody.getSourceInfo(),
            (getTempPrefix() + localCounter++).toCharArray(), type, false,
            currentMethodBody);
      }

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