set type of right hand side

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@372 379699f6-c40d-0410-875b-85095c16579e

jode/jode/flow/CreateAssignExpression.java

@@ -19,6 +19,7 @@
 
 package jode.flow;
 import jode.expr.*;
+import jode.Type;
 
 public class CreateAssignExpression {
 
@@ -91,6 +92,7 @@ public class CreateAssignExpression {
 	}
         int opIndex;
         Expression rightHandSide;
+	Type rhsType;
 
         if (expr.getOperator() instanceof ConvertOperator
             && expr.getSubExpressions()[0] instanceof ComplexExpression
@@ -120,6 +122,7 @@ public class CreateAssignExpression {
                 || !store.matches((Operator) loadExpr))
                 return false;
             rightHandSide = expr.getSubExpressions()[1];
+	    rhsType = binop.getOperandType(1);
         } else {
 	    /* For String += the situation is more complex.
 	     * what is marked as load(stack) * rightHandSide above is
@@ -142,6 +145,8 @@ public class CreateAssignExpression {
                 || !store.matches((Operator) simple))
                 return false;
 
+	    rhsType = lastExpr.getOperator().getOperandType(1);
+            
             /* ... and remove it. */
             if (lastExpr.getParent() != null) {
 		ComplexExpression ce = (ComplexExpression)lastExpr.getParent();
@@ -158,7 +163,7 @@ public class CreateAssignExpression {
 	    dup.removeBlock();
         ib.setInstruction(rightHandSide);
         
-        store.makeOpAssign(store.OPASSIGN_OP+opIndex);
+        store.makeOpAssign(store.OPASSIGN_OP+opIndex, rhsType);
 
         if (isAssignOp)
             store.makeNonVoid();