- continue to copy all functions do something with a ComponentRef from Exp into ComponentReference

git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6569 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: Jens Frenkel

Compiler/Algorithm.mo

@@ -49,6 +49,7 @@ package Algorithm
 "
 
 public import Absyn;
+public import ComponentReference;
 public import DAE;
 public import SCode;
 
@@ -168,7 +169,7 @@ algorithm
     case ((lhs as DAE.CREF(componentRef=cr)),lhprop,rhs,rhprop,_,SCode.NON_INITIAL(),source)
       equation
         DAE.C_PARAM() = Types.propAnyConst(lhprop);
-        true = Exp.isRecord(cr);
+        true = ComponentReference.isRecord(cr);
         outStatement = makeAssignment2(lhs,lhprop,rhs,rhprop,source);
       then outStatement;
 
@@ -658,7 +659,7 @@ public function getCrefFromAlg "Returns all crefs from an algorithm"
 input Algorithm alg;
 output list<DAE.ComponentRef> crs;
 algorithm
-  crs := Util.listListUnionOnTrue(Util.listMap(getAllExps(alg),Exp.getCrefFromExp),Exp.crefEqual);
+  crs := Util.listListUnionOnTrue(Util.listMap(getAllExps(alg),Exp.getCrefFromExp),ComponentReference.crefEqual);
 end getCrefFromAlg;
 
 

Compiler/Ceval.mo

@@ -2201,17 +2201,17 @@ algorithm
     case (cache,env ,cr)
       equation
         (env as (Env.FRAME(connectionSet = (crs,prefix))::_)) = Env.stripForLoopScope(env);
-        cr_lst = Util.listSelect1(crs, cr, Exp.crefContainedIn);
+        cr_lst = Util.listSelect1(crs, cr, ComponentReference.crefContainedIn);
         currentPrefixIdent= ComponentReference.crefLastIdent(prefix);
         currentPrefix = ComponentReference.makeCrefIdent(currentPrefixIdent,DAE.ET_OTHER(),{});
  		    //	Select connect references that has cr as suffix and correct Prefix.
-        cr_lst = Util.listSelect1R(cr_lst, currentPrefix, Exp.crefPrefixOf);
+        cr_lst = Util.listSelect1R(cr_lst, currentPrefix, ComponentReference.crefPrefixOf);
 
         // Select connect references that are identifiers (inside connectors)
-        cr_lst2 = Util.listSelect(crs,Exp.crefIsIdent);
-        cr_lst2 = Util.listSelect1(cr_lst2,cr,Exp.crefEqual);
+        cr_lst2 = Util.listSelect(crs,ComponentReference.crefIsIdent);
+        cr_lst2 = Util.listSelect1(cr_lst2,cr,ComponentReference.crefEqual);
 
-        cr_totlst = Util.listUnionOnTrue(listAppend(cr_lst,cr_lst2),{},Exp.crefEqual);
+        cr_totlst = Util.listUnionOnTrue(listAppend(cr_lst,cr_lst2),{},ComponentReference.crefEqual);
         res = listLength(cr_totlst);
 
         /*print("inFrame :");print(Env.printEnvPathStr(env));print("\n");
@@ -5179,7 +5179,7 @@ output Boolean res;
 algorithm
   res := matchcontinue(cr,exp)
     case(cr,exp) equation
-      res = Util.boolOrList(Util.listMap1(Exp.getCrefFromExp(exp),Exp.crefEqual,cr));
+      res = Util.boolOrList(Util.listMap1(Exp.getCrefFromExp(exp),ComponentReference.crefEqual,cr));
     then res;
     case(_,_) then false;
   end matchcontinue;
@@ -5455,7 +5455,7 @@ algorithm outBoolean := matchcontinue(c,v)
   case(c,(v as DAE.EQBOUND(DAE.CREF(c2,_),NONE(),_,_)))
     local DAE.ComponentRef c2;
     equation
-      true = Exp.crefEqual(c,c2);
+      true = ComponentReference.crefEqual(c,c2);
     then
       true;
   case(_,_) then false;

Compiler/CevalScript.mo

@@ -3666,7 +3666,7 @@ algorithm
       equation
         classname_1 = Static.componentRefToPath(classname) "Check cached instantiated class" ;
         Interactive.INSTCLASS(_,dae,env) = Interactive.getInstantiatedClass(ic, classname_1);
-        cref_1 = Exp.joinCrefs(cref, ComponentReference.makeCrefIdent("stateSelect",DAE.ET_OTHER(),{}));
+        cref_1 = ComponentReference.joinCrefs(cref, ComponentReference.makeCrefIdent("stateSelect",DAE.ET_OTHER(),{}));
         (cache,attr,ty,DAE.EQBOUND(exp,_,_,_),_,_,_,_,_) = Lookup.lookupVar(cache, env, cref_1); 
         str = Exp.printExpStr(exp);
       then
@@ -3691,7 +3691,7 @@ algorithm
         ci_state = ClassInf.start(r, Env.getEnvName(env3));
         (cache,env4,_,_,dae1,csets_1,ci_state_1,tys,_,_,_,_) = Inst.instClassIn(cache,env3, InnerOuter.emptyInstHierarchy,UnitAbsyn.noStore,DAE.NOMOD(), Prefix.NOPRE(), Connect.emptySet,
           ci_state, c, false, {}, false, Inst.INNER_CALL, ConnectionGraph.EMPTY,NONE());
-        cref_1 = Exp.joinCrefs(cref, ComponentReference.makeCrefIdent("stateSelect",DAE.ET_OTHER(),{}));
+        cref_1 = ComponentReference.crefPrependIdent(cref, "stateSelect",{},DAE.ET_OTHER());
         (cache,attr,ty,DAE.EQBOUND(exp,_,_,_),_,_,_,_,_) = Lookup.lookupVar(cache, env4, cref_1);
         ic_1 = Interactive.addInstantiatedClass(ic, Interactive.INSTCLASS(classname_1,dae1,env4));
         str = Exp.printExpStr(exp);
@@ -3708,7 +3708,7 @@ algorithm
       equation
         classname_1 = Static.componentRefToPath(classname);
         Interactive.INSTCLASS(_,dae,env) = Interactive.getInstantiatedClass(ic, classname_1);
-        cref_1 = Exp.joinCrefs(cref, ComponentReference.makeCrefIdent(attribute,DAE.ET_OTHER(),{}));
+        cref_1 = ComponentReference.crefPrependIdent(cref, attribute,{},DAE.ET_OTHER());
         (cache,attr,ty,DAE.VALBOUND(v,_),_,_,_,_,_) = Lookup.lookupVar(cache, env, cref_1);
       then
         (cache,v,st);
@@ -3732,7 +3732,7 @@ algorithm
         ci_state = ClassInf.start(r, Env.getEnvName(env3));
         (cache,env4,_,_,dae1,csets_1,ci_state_1,tys,_,_,_,_) = Inst.instClassIn(cache,env3, InnerOuter.emptyInstHierarchy, UnitAbsyn.noStore,DAE.NOMOD(), Prefix.NOPRE(), Connect.emptySet,
           ci_state, c, false, {}, false, Inst.INNER_CALL, ConnectionGraph.EMPTY,NONE());
-        cref_1 = Exp.joinCrefs(cref, ComponentReference.makeCrefIdent(attribute,DAE.ET_OTHER(),{}));
+        cref_1 = ComponentReference.crefPrependIdent(cref,attribute,DAE.ET_OTHER(),{});
         (cache,attr,ty,DAE.VALBOUND(v,_),_,_,_,_,_) = Lookup.lookupVar(cache, env4, cref_1);
         ic_1 = Interactive.addInstantiatedClass(ic, Interactive.INSTCLASS(classname_1,dae1,env4));
       then