- Fixed handling of partially bound record in CevalFunction.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10659 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Dec 6, 2011 · a789be6 · a789be6
1 parent 7812ec3
commit a789be6
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Compiler/FrontEnd/CevalFunction.mo b/Compiler/FrontEnd/CevalFunction.mo
@@ -2385,21 +2385,23 @@ algorithm
       Values.Value val;
       String id;
       DAE.Type ty;
+      DAE.Binding binding;
 
     // The component is a record itself.
     case (DAE.TYPES_VAR(
         name = id, 
-        ty   = ty as DAE.T_COMPLEX(complexClassType = ClassInf.RECORD(path = _))), _)
+        ty = ty as DAE.T_COMPLEX(complexClassType = ClassInf.RECORD(path = _))), _)
       equation
         val = getRecordValue(Absyn.IDENT(id), ty, inEnv);
       then
         val;
 
     // A non-record variable.
-    case (DAE.TYPES_VAR(name = id), _)
+    case (DAE.TYPES_VAR(name = id, ty = ty), _)
       equation
-        (_, DAE.TYPES_VAR(binding = DAE.VALBOUND(valBound = val)), _, _, _) =
+        (_, DAE.TYPES_VAR(binding = binding), _, _, _) =
           Lookup.lookupIdentLocal(Env.emptyCache(), inEnv, id);
+        val = getBindingOrDefault(binding, ty);
       then
         val;
   end match;