From bd56505f03dbd774903acdfa83464d32ecf45778 Mon Sep 17 00:00:00 2001
From: jochen <jochen@379699f6-c40d-0410-875b-85095c16579e>
Date: Wed, 14 Apr 1999 20:18:47 +0000
Subject: [PATCH] Types moved to jode.type type bug fix

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@599 379699f6-c40d-0410-875b-85095c16579e
---
 jode/jode/flow/CreateAssignExpression.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/jode/jode/flow/CreateAssignExpression.java b/jode/jode/flow/CreateAssignExpression.java
index f5f1895..48bceb3 100644
--- a/jode/jode/flow/CreateAssignExpression.java
+++ b/jode/jode/flow/CreateAssignExpression.java
@@ -19,7 +19,7 @@
 
 package jode.flow;
 import jode.expr.*;
-import jode.Type;
+import jode.type.Type;
 
 public class CreateAssignExpression {
 
@@ -155,16 +155,17 @@ public class CreateAssignExpression {
 		((LocalLoadOperator)simple).getLocalInfo().combineWith
 		    (((LocalStoreOperator)store).getLocalInfo());
 		
-	    rhsType = Type.tString;
-            
             /* ... and remove it. */
             if (lastExpr.getParent() != null) {
 		ComplexExpression ce = (ComplexExpression)lastExpr.getParent();
 		StringAddOperator addOp = (StringAddOperator) ce.getOperator();
 		addOp.clearFirstType();
 		ce.setSubExpressions(0,lastExpr.getSubExpressions()[1]);
-            } else
+		rhsType = Type.tString;
+            } else {
+		rhsType = lastExpr.getOperator().getOperandType(1);
                 rightHandSide = lastExpr.getSubExpressions()[1]; 
+	    }
 
             opIndex = Operator.ADD_OP;
         }