Changeset 13389

Timestamp:

2012-10-15T14:56:06+02:00 (12 years ago)

Author:

jfrenkel

Message:

• check for cyclic bindings in start values while merging alias variables

File:

• trunk/Compiler/BackEnd/BackendVariable.mo (modified) (6 diffs)

trunk/Compiler/BackEnd/BackendVariable.mo

@@ -46 +46 @@
 protected import Absyn;
 protected import BackendDAEUtil;
+protected import BaseHashSet;
 protected import ComponentReference;
 protected import DAEUtil;
@@ -55 +56 @@
 protected import Flags;
 protected import HashTable2;
+protected import HashSet;
 protected import List;
 protected import SCode;
@@ -3423 +3425 @@
   sv := varStartValueOption(inVar);
   sva := varStartValueOption(inAVar);
-  (v1) := mergeStartFixed(inVar,fixed,sv,inAVar,fixeda,sva,negate,knVars);
+  v1 := mergeStartFixed(inVar,fixed,sv,inAVar,fixeda,sva,negate,knVars);
   // nominal
   v2 := mergeNominalAttribute(inAVar,v1,negate);
@@ -3589 +3591 @@
 end mergeStartFixed1;
 
-public function replaceCrefWithBindExp
-  input tuple<DAE.Exp, tuple<BackendDAE.Variables,Boolean>> inTuple;
-  output tuple<DAE.Exp, tuple<BackendDAE.Variables,Boolean>> outTuple;
+protected function replaceCrefWithBindExp
+  input tuple<DAE.Exp, tuple<BackendDAE.Variables,Boolean,HashSet.HashSet>> inTuple;
+  output tuple<DAE.Exp, tuple<BackendDAE.Variables,Boolean,HashSet.HashSet>> outTuple;
 algorithm
   outTuple := matchcontinue(inTuple)
@@ -3599 +3601 @@
       DAE.ComponentRef cr;
       Boolean b;
+      HashSet.HashSet hs;
     // true if crefs replaced in expression
-    case ((DAE.CREF(componentRef=cr), (vars,_)))
-      equation
-         ({BackendDAE.VAR(bindExp = SOME(e))}, _) = getVar(cr, vars);
-         ((e, _)) = Expression.traverseExp(e, replaceCrefWithBindExp, (vars,false));
-      then
-        ((e, (vars,true)));
+    case ((DAE.CREF(componentRef=cr), (vars,_,hs)))
+      equation
+        // check for cyclic bindings in start value
+        false = BaseHashSet.has(cr, hs);
+        ({BackendDAE.VAR(bindExp = SOME(e))}, _) = getVar(cr, vars);
+        hs = BaseHashSet.add(cr,hs);
+        ((e, (_,_,hs))) = Expression.traverseExp(e, replaceCrefWithBindExp, (vars,false,hs));
+      then
+        ((e, (vars,true,hs)));
     // true if crefs in expression
-    case ((e as DAE.CREF(componentRef=cr), (vars,_)))
-      then
-        ((e, (vars,true)));        
+    case ((e as DAE.CREF(componentRef=cr), (vars,_,hs)))
+      then
+        ((e, (vars,true,hs)));        
     else then inTuple;
   end matchcontinue;
@@ -3641 +3647 @@
       equation
         // simple evaluation, by replace crefs with bind expressions recursivly
-        ((exp1_1, (_,b))) = Expression.traverseExp(exp1, replaceCrefWithBindExp, (knVars,false));
-        ((exp2_1, _)) = Expression.traverseExp(exp2, replaceCrefWithBindExp, (knVars,false));
+        ((exp1_1, (_,b,_))) = Expression.traverseExp(exp1, replaceCrefWithBindExp, (knVars,false,HashSet.emptyHashSet()));
+        ((exp2_1, _)) = Expression.traverseExp(exp2, replaceCrefWithBindExp, (knVars,false,HashSet.emptyHashSet()));
         true = Expression.expEqual(exp1_1, exp2_1);
         exp1_1 = Util.if_(b,exp1,exp2);