Fix the broken merge of r20192 and r20194

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20195 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 17, 2014 · 7077847 · 7077847
1 parent 79ac433
commit 7077847
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Compiler/BackEnd/EvaluateFunctions.mo b/Compiler/BackEnd/EvaluateFunctions.mo
@@ -1093,12 +1093,12 @@ algorithm
       equation
         //print("the STMT_ASSIGN before: "+&DAEDump.ppStatementStr(List.first(algsIn)));
         cref = Expression.expCref(exp1);
-        _ = getRecordScalars(cref);
+        scalars = getRecordScalars(cref);
         (exp2,changed) = BackendVarTransform.replaceExp(exp2,replIn,NONE());
         ((exp2,(exp1,funcTree,idx,addStmts))) = Expression.traverseExpTopDown(exp2,evaluateConstantFunctionWrapper,(exp1,funcTree,idx,{}));
         (exp2,changed) = Debug.bcallret1_2(changed,ExpressionSimplify.simplify,exp2,exp2,changed);
         (exp2,_) = ExpressionSimplify.simplify(exp2);
-        _ = Expression.getComplexContents(exp2);
+        expLst = Expression.getComplexContents(exp2);
         isCon = Expression.isConst(exp2);
         isRec = ComponentReference.isRecord(cref);
 
@@ -1867,4 +1867,4 @@ algorithm
   stmtOut := DAE.STMT_ASSIGN(ty,lhs,rhs,DAE.emptyElementSource);
 end makeAssignment;
 
-end EvaluateFunctions;
+end EvaluateFunctions;