- Added DAE.Const to typeExp

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13034 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: sjoelund

Compiler/FrontEnd/Inst.mo

@@ -141,6 +141,7 @@ protected import HashTable;
 protected import HashTable5;
 protected import InstSection;
 protected import InstExtends;
+protected import InstUtil;
 protected import Interactive;
 protected import List;
 protected import Lookup;
@@ -8531,7 +8532,7 @@ algorithm
           PrefixUtil.prefixToCrefOpt(inPrefix), NONE(), NONE());
 
         // Instantiate the components binding.
-        opt_binding = makeVariableBinding(ty, inMod, toConst(vt), inPrefix, inName, source);
+        opt_binding = makeVariableBinding(ty, inMod, InstUtil.toConst(vt), inPrefix, inName, source);
         start = instStartBindingExp(inMod, ty, vt);
 
         // Add the component to the DAE.
@@ -17047,18 +17048,6 @@ algorithm
   end matchcontinue;
 end mergeClassComments;
 
-public function toConst
-"Translates SCode.Variability to DAE.Const"
-input SCode.Variability inVar;
-output DAE.Const outConst;
-algorithm
-  outConst := matchcontinue (inVar)
-    case(SCode.CONST()) then DAE.C_CONST();
-    case(SCode.PARAM()) then DAE.C_PARAM();
-    case _ then DAE.C_VAR();
-  end matchcontinue;
-end toConst;
-
 protected function makeNonExpSubscript
   input DAE.Subscript inSubscript;
   output DAE.Subscript outSubscript;

Compiler/FrontEnd/InstSection.mo

@@ -63,6 +63,7 @@ protected import ExpressionDump;
 protected import ExpressionSimplify;
 protected import Flags;
 protected import Inst;
+protected import InstUtil;
 protected import List;
 protected import Lookup;
 protected import MetaUtil;
@@ -4077,8 +4078,8 @@ algorithm
         crefExp1 = Expression.crefExp(c1_1);
         crefExp2 = Expression.crefExp(c2_1);
         // Evaluate constant crefs away
-        const1 = Inst.toConst(vt1);
-        const2 = Inst.toConst(vt2);
+        const1 = InstUtil.toConst(vt1);
+        const2 = InstUtil.toConst(vt2);
         (cache, crefExp1, _) = Ceval.cevalIfConstant(cache, env, crefExp1, DAE.PROP(t1,const1), true, info);
         (cache, crefExp2, _) = Ceval.cevalIfConstant(cache, env, crefExp2, DAE.PROP(t2,const2), true, info);
         (exp,_) = ExpressionSimplify.simplify(DAE.RELATION(crefExp1,DAE.EQUAL(DAE.T_BOOL_DEFAULT),crefExp2,-1,NONE()));

Compiler/FrontEnd/InstUtil.mo

@@ -1930,4 +1930,16 @@ algorithm
   end match;
 end typeCrefWithComponent2;
 
+public function toConst
+"Translates SCode.Variability to DAE.Const"
+input SCode.Variability inVar;
+output DAE.Const outConst;
+algorithm
+  outConst := matchcontinue (inVar)
+    case(SCode.CONST()) then DAE.C_CONST();
+    case(SCode.PARAM()) then DAE.C_PARAM();
+    case _ then DAE.C_VAR();
+  end matchcontinue;
+end toConst;
+
 end InstUtil;

Compiler/FrontEnd/SCodeInst.mo

@@ -3562,7 +3562,7 @@ algorithm
     case (InstTypes.CONDITIONAL_COMPONENT(name, cond_exp, sel, mod, prefs, env,
         prefix, info), st, functions)
       equation
-        (cond_exp, ty, st) = Typing.typeExp(cond_exp, Typing.EVAL_CONST_PARAM(),
+        (cond_exp, ty, _, st) = Typing.typeExp(cond_exp, Typing.EVAL_CONST_PARAM(),
           Typing.CONTEXT_MODEL(), st);
         (cond_exp, _) = ExpressionSimplify.simplify(cond_exp);
         cond = evaluateConditionalExp(cond_exp, ty, name, info);