- partial fix for #2858 (does not yet work with for iterators indexin…

…g the array of records)

  * some tests are now actually giving correct results
- partial support for Connections.uniqueRoot and Connections.uniqueRootIndexes
  * non standard operators: Connections.uniqueRoot and Connections.uniqueRootIndices are only partially implemented
  * Connections.uniqueRoot currently does nothing, only collects information
  * Connections.uniqueRootIndices needs to be implemented, it returns an array of ones (1) of size of first input
  * See specification for these here (Modelica_StateGraph2):
    https://github.com/modelica/Modelica_StateGraph2 and
    https://trac.modelica.org/Modelica/ticket/984 and
    http://www.ep.liu.se/ecp/043/041/ecp09430108.pdf
  * any takers for the actual implementation? is not that complicated :)
- changed the way array types are printed out to be easier to follow



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

Compiler/FFrontEnd/FGraph.mo

@@ -1546,7 +1546,8 @@ algorithm
       SCode.Element c;
       Name targetClassName, newTargetClassName;
       InnerOuter.InstHierarchy ih;
-/*
+
+    /*
     case (_, _, _, _, _, _, _)
       equation
         c = inTargetClass;
@@ -1715,7 +1716,8 @@ algorithm
         crefPrefix = PrefixUtil.prefixAdd(inSourceName,{},{},inPrefix,SCode.CONST(),ClassInf.UNKNOWN(Absyn.IDENT(""))); // variability doesn't matter
 
         // name = inTargetClassName +& "$" +& ComponentReference.printComponentRefStr(PrefixUtil.prefixToCref(crefPrefix));
-        name = inTargetClassName +& "$" +& Absyn.pathString2NoLeadingDot(Absyn.stringListPath(listReverse(Absyn.pathToStringList(PrefixUtil.prefixToPath(crefPrefix)))), "$");
+        name = inTargetClassName +& "$" +& Absyn.pathString2NoLeadingDot(Absyn.stringListPath(listReverse(Absyn.pathToStringList(PrefixUtil.prefixToPath(crefPrefix)))), "$")
+               ; // +& "$" +& Absyn.pathString2NoLeadingDot(getGraphName(inSourceEnv), "$");
         // name = "'$" +& inTargetClassName +& "@" +& Absyn.pathString(Absyn.stringListPath(listReverse(Absyn.pathToStringList(PrefixUtil.prefixToPath(crefPrefix))))) +& "'";
         // name = "'$" +& getGraphNameStr(inSourceEnv) +& "." +& Absyn.pathString(Absyn.stringListPath(listReverse(Absyn.pathToStringList(PrefixUtil.prefixToPath(crefPrefix))))) +& "'";
         // name = "$'" +& getGraphNameStr(inSourceEnv) +& "." +&

Compiler/FrontEnd/DAE.mo

@@ -733,7 +733,7 @@ uniontype Var "- Variables"
   record TYPES_VAR
     Ident name "name";
     Attributes attributes "attributes";
-    Type ty "type" ;
+    Type ty "type";
     Binding binding "equation modification";
     Option<Const> constOfForIteratorRange "the constant-ness of the range if this is a for iterator, NONE() if is NOT a for iterator";
   end TYPES_VAR;
@@ -855,7 +855,7 @@ public uniontype Type "models the different front-end and back-end types"
 
   record T_ARRAY
     "an array can be represented in two equivalent ways:
-       1. T_ARRAY(non_array_type, {dim1, dim2, dim3}) =
+       1. T_ARRAY(non_array_type, {dim1, dim2, dim3})
        2. T_ARRAY(T_ARRAY(T_ARRAY(non_array_type, {dim1}), {dim2}), {dim3})
        In general Inst generates 1 and all the others generates 2"
     Type ty "Type";
@@ -872,14 +872,14 @@ public uniontype Type "models the different front-end and back-end types"
   end T_UNKNOWN;
 
   record T_COMPLEX
-    ClassInf.State complexClassType "The type of a class" ;
-    list<Var> varLst "The variables of a complex type" ;
+    ClassInf.State complexClassType "The type of a class";
+    list<Var> varLst "The variables of a complex type";
     EqualityConstraint equalityConstraint;
     TypeSource source;
   end T_COMPLEX;
 
   record T_SUBTYPE_BASIC
-    ClassInf.State complexClassType "The type of a class" ;
+    ClassInf.State complexClassType "The type of a class";
     list<Var> varLst "complexVarLst; The variables of a complex type! Should be empty, kept here to verify!";
     Type complexType "complexType; A complex type can be a subtype of another (primitive) type (through extends)";
     EqualityConstraint equalityConstraint;
@@ -1318,8 +1318,8 @@ uniontype Exp "Expressions
 
   record ARRAY
     Type ty;
-    Boolean scalar "scalar for codegen" ;
-    list<Exp> array "Array constructor, e.g. {1,3,4}" ;
+    Boolean scalar "scalar for codegen";
+    list<Exp> array "Array constructor, e.g. {1,3,4}";
   end ARRAY;
 
   record MATRIX

Compiler/FrontEnd/DAEDump.mo

@@ -2636,6 +2636,7 @@ algorithm
 
       then
         (compWSplElem);
+
   end match;
 end dumpDAEList;
 
@@ -2655,7 +2656,7 @@ algorithm
           Flags.isSet(Flags.DISABLE_RECORD_CONSTRUCTOR_OUTPUT),
           Flags.isSet(Flags.INLINE_FUNCTIONS));
         funcs = sortFunctions(funcs);
-        funList = FUNCTION_LIST(funcs) ;
+        funList = FUNCTION_LIST(funcs);
       then
         (funList);
 

Compiler/FrontEnd/Inst.mo

@@ -230,7 +230,7 @@ algorithm
         //System.startTimer();
         //print("\nInstClass");
         (cache,env_2,ih,_,dae,_,_,_,_,_) = instClass(cache,env_2,ih,
-          UnitAbsynBuilder.emptyInstStore(),DAE.NOMOD(), Prefix.NOPRE(), cdef,
+          UnitAbsynBuilder.emptyInstStore(),DAE.NOMOD(), makeTopComponentPrefix(env_2, n), cdef,
           {}, false, InstTypes.TOP_CALL(), ConnectionGraph.EMPTY, Connect.emptySet) "impl";
         //System.stopTimer();
         //print("\nInstClass: " +& realString(System.getTimerIntervalTime()));
@@ -373,7 +373,7 @@ algorithm
         cdef = SCode.classSetPartial(cdef, SCode.NOT_PARTIAL());
 
         (cache,env_2,ih,_,dae,_,_,_,_,_) =
-          instClass(cache, env_2, ih, UnitAbsynBuilder.emptyInstStore(),DAE.NOMOD(), Prefix.NOPRE(),
+          instClass(cache, env_2, ih, UnitAbsynBuilder.emptyInstStore(),DAE.NOMOD(), makeTopComponentPrefix(env_2, n),
             cdef, {}, false, InstTypes.TOP_CALL(), ConnectionGraph.EMPTY, Connect.emptySet) "impl" ;
         pathstr = Absyn.pathString(path);
 
@@ -395,6 +395,18 @@ algorithm
   end matchcontinue;
 end instantiatePartialClass;
 
+protected function makeTopComponentPrefix
+  input FGraph.Graph inGraph;
+  input Absyn.Ident inName;
+  output Prefix.Prefix outPrefix;
+protected
+  Absyn.Path p;
+algorithm
+  //p := FGraph.joinScopePath(inGraph, Absyn.IDENT(inName));
+  //outPrefix := Prefix.PREFIX(Prefix.PRE("$i", {}, {}, Prefix.NOCOMPPRE(), ClassInf.MODEL(p)), Prefix.CLASSPRE(SCode.VAR()));
+  outPrefix := Prefix.NOPRE();
+end makeTopComponentPrefix;
+
 protected function instClassInProgram
   "Instantiates a specific top level class in a Program."
   input FCore.Cache inCache;
@@ -431,7 +443,7 @@ algorithm
         cls = InstUtil.lookupTopLevelClass(name, inProgram, true);
 
         (cache, env, ih, _, dae, _, _, _, _, _) = instClass(inCache, inEnv,
-          inIH, UnitAbsynBuilder.emptyInstStore(), DAE.NOMOD(), Prefix.NOPRE(),
+          inIH, UnitAbsynBuilder.emptyInstStore(), DAE.NOMOD(), makeTopComponentPrefix(inEnv, name),
           cls, {}, false, InstTypes.TOP_CALL(), ConnectionGraph.EMPTY, Connect.emptySet);
         dae = InstUtil.reEvaluateInitialIfEqns(cache, env, dae, true);
         elts = DAEUtil.daeElements(dae);
@@ -1700,7 +1712,7 @@ algorithm
       Prefix.Prefix pre;
       ClassInf.State ci_state,ci_state_1;
       SCode.Element c;
-      String n;
+      String n, str;
       SCode.Restriction r;
       SCode.ClassDef d;
       SCode.Visibility vis;
@@ -1738,9 +1750,13 @@ algorithm
         System.setPartialInstantiation(partialInst);
       then (cache,env,ih,ci_state,{});
 
-    case (cache,env,ih,mods,pre,ci_state,(c as SCode.CLASS(name = _,restriction = _,classDef = d)),vis,inst_dims,_,_)
+    case (cache,env,ih,mods,pre,ci_state,(c as SCode.CLASS(name = n,restriction = r,classDef = d)),vis,inst_dims,_,_)
       equation
         // t1 = clock();
+
+        // str = Util.if_(valueEq(r, SCode.R_PACKAGE()), "", "Instantiating non package: " +& FGraph.getGraphNameStr(env) +& "/" +& n +& "\n");
+        // print(str);
+
         (cache,env_1,ih,ci_state_1,vars) =
           partialInstClassdef(cache,env,ih, mods, pre, ci_state, c, d, vis, inst_dims, numIter);
 
@@ -1752,12 +1768,6 @@ algorithm
         // s = realString(time);
         // s2 = FGraph.printGraphPathStr(env);
         // Debug.fprintln(Flags.INSTTR, "ICLASSPARTIAL " +& n +& " inst time: " +& s +& " in env " +& s2 +& " mods: " +& Mod.printModStr(mods));
-        //print(Util.if_(b,s,""));
-        //print("inCache:");print(Env.printCacheStr(cache));print("\n");
-        // adrpo: never add a partial environment to the cache!
-        // cache = Env.addCachedEnv(cache,n,env_1);
-        // print("outCache:");print(Env.printCacheStr(cache));print("\n");
-        // print("partialInstClassDef, outenv:");print(FGraph.printGraphStr(env_1));
       then
         (cache,env_1,ih,ci_state_1,vars);
 
@@ -1904,11 +1914,6 @@ algorithm
 
         (cache,env1,ih) = InstUtil.addClassdefsToEnv(cache, env, ih, pre, cdefelts, impl, SOME(mods)) "1. CLASS & IMPORT nodes and COMPONENT nodes(add to env)" ;
         cdefelts_1 = InstUtil.addNomod(cdefelts) "instantiate CDEFS so redeclares are carried out" ;
-        /*
-        (cache,env2,ih,cdefelts_2) =
-          updateCompeltsMods(cache, env1, ih, pre,
-            InstUtil.sortElementList(cdefelts_1, env1, FGraph.inFunctionScope(env1)),
-            ci_state, impl);*/
         env2 = env1;
         cdefelts_2 = cdefelts_1;
 
@@ -2196,11 +2201,6 @@ algorithm
         (cache,env3,ih) = InstUtil.addComponentsToEnv(cache, env2, ih, mods, pre, ci_state, compelts_1, compelts_1, eqs_1, inst_dims, impl);
         //Update the modifiers of elements to typed ones, needed for modifiers
         //on components that are inherited.
-        /*
-        (cache,env4,ih,compelts_2) =
-          updateCompeltsMods(cache, env3, ih, pre,
-            InstUtil.sortElementList(compelts_1, env3, FGraph.inFunctionScope(env3)),
-            ci_state, impl);*/
         compelts_2 = compelts_1;
         env4 = env3;
 
@@ -3002,18 +3002,13 @@ algorithm
                                              lst_constantEls, lst_constantEls, {},
                                              inst_dims, false); // adrpo: here SHOULD BE IMPL=TRUE! not FALSE!
 
-        /*(cache,env3,ih,lst_constantEls) =
-           updateCompeltsMods(cache, env3, ih, pre,
-             InstUtil.sortElementList(lst_constantEls, env3, FGraph.inFunctionScope(env3)),
-             ci_state, true);*/
-
         (cache,env3,ih,_,_,_,ci_state2,vars,_) =
            instElementList(cache, env3, ih, UnitAbsyn.noStore, mods, pre, ci_state1, lst_constantEls,
               inst_dims, true, InstTypes.INNER_CALL(), ConnectionGraph.EMPTY, Connect.emptySet, false) "instantiate constants";
-        /*
-        ci_state2 = ci_state1;
-        vars = {};
-        */
+
+        //ci_state2 = ci_state1;
+        //vars = {};
+
         // Debug.traceln("partialInstClassdef OK " +& className);
       then
         (cache,env3,ih,ci_state2,vars);
@@ -3410,7 +3405,7 @@ algorithm
               "\n");*/
 
         (cache,env_1,ih,store,DAE.DAE(elts),csets,ci_state_1,tys1,graph) =
-          instElement(cache,env,ih,store, mod, pre, ci_state, el, inst_dims, impl, callscope, graph, csets);
+          instElement(cache, env, ih, store, mod, pre, ci_state, el, inst_dims, impl, callscope, graph, csets);
         /*s1 = Util.if_(stringEq("n", str),DAE.dumpElementsStr(dae1),"");
         print(s1) "To print what happened to a specific var";*/
         Error.updateCurrentComponent("",Absyn.dummyInfo);
@@ -3508,28 +3503,14 @@ algorithm
     case (_, _, _, _, _, _, _,(SCode.IMPORT(imp = _),_), _, _, _, _, _)
       then (inCache, inEnv, inIH, inUnitStore, DAE.emptyDae, inSets, inState, {}, inGraph);
 
-    // A new class definition. Put it in the current frame in the environment
-    case (cache, env, ih, _, _, _, _, (SCode.CLASS(name = name,
-        prefixes = SCode.PREFIXES(replaceablePrefix = SCode.REPLACEABLE(_))), _),
-        _, _, _, _, _)
-      equation
-        /*/Redeclare of class definition, replaceable is true
-        (class_mod as DAE.REDECL(tplSCodeElementModLst = (cls,_)::_)) =
-          Mod.lookupModificationP(inMod, Absyn.IDENT(name));
-        class_mod = Mod.removeMod(class_mod, name);
-        env = FGraph.mkClassNode(env, cls, inPrefix, class_mod);*/
-      then
-        (cache, env, ih, inUnitStore, DAE.emptyDae, inSets, inState, {}, inGraph);
-
-    // Classdefinition without redeclaration
+    // classdefinitions
     case (cache, env, ih, _, _, _, _, (cls as SCode.CLASS(name = name), _), _, _, _, _, _)
       equation
-        /*class_mod = Mod.lookupModificationP(inMod, Absyn.IDENT(name));
-        // This was an attempt to fix multiple class definition bug. Unfortunately, it breaks some tests. -- alleb
-        // _ = InstUtil.checkMultiplyDeclared(cache,env,mods,pre,csets,ci_state,(comp,cmod),inst_dims,impl);
-        env = FGraph.mkClassNode(env, cls, inPrefix, class_mod);*/
+        //(cache, cenv, ih, store, dae, csets, ty, ci_state, _, graph) = instClass(cache, env, ih, inUnitStore, inMod, inPrefix, cls, inInstDims, inImplicit, inCallingScope, inGraph, inSets);
+        //env = FGraph.updateClass(env, cls, inPrefix, inMod, FCore.CLS_INSTANCE(name), cenv);
       then
-        (cache, env, ih, inUnitStore, DAE.emptyDae, inSets, inState, {}, inGraph);
+        //(cache, env, ih, store, dae, csets, ci_state, {}, graph);
+        (inCache, inEnv, inIH, inUnitStore, DAE.emptyDae, inSets, inState, {}, inGraph);
 
     // A component
     // This is the rule for instantiating a model component.  A component can be
@@ -3608,7 +3589,7 @@ algorithm
 
         // can call instVar
         (cache, env2, ih) = updateComponentsInEnv(cache, env, ih, pre, mods, crefs, ci_state, impl);
-        //env2 = env;
+        // env2 = env;
 
         // Update the untyped modifiers to typed ones, and extract class and
         // component modifiers again.
@@ -3658,6 +3639,8 @@ algorithm
         //Instantiate the component
         // Start a new "set" of inst_dims for this component (in instance hierarchy), see InstDims
         inst_dims = listAppend(inst_dims,{{}});
+
+        (cache,mod) = Mod.updateMod(cache, env2 /* cenv */, ih, pre, mod, impl, info);
         (cache,mod_1) = Mod.updateMod(cache, env2 /* cenv */, ih, pre, mod_1, impl, info);
 
         // print("Before InstUtil.selectModifiers:\n\tmod: " +& Mod.printModStr(mod) +& "\n\t" +&"mod_1: " +& Mod.printModStr(mod_1) +& "\n\t" +&"comp: " +& SCodeDump.unparseElementStr(comp) +& "\n");
@@ -4007,7 +3990,7 @@ algorithm
       list<Absyn.ComponentRef> crefs;
       FCore.Graph env_1,env;
       DAE.Mod m_1,old_m_1,m_2,m_3,m,rmod,innerCompMod,compMod;
-      SCode.Element redecl,newcomp,comp,redComp;
+      SCode.Element redecl,newcomp,comp,redComp, cl;
       String n1,n2;
       SCode.Final finalPrefix,redfin;
       SCode.Each each_;
@@ -4542,7 +4525,7 @@ algorithm
     // if we don't have a redeclare, take the binding from mod_3
     case (cache,env,cenv,ih,_,_,_,_,_,_,_,_,_,_,_,mod,_,_,_,updatedComps)
       equation
-        (cache, m_1) = updateComponentInEnv3(cache, env, ih, m, impl, Mod.COMPONENT(name), info);
+        (cache, m_1) = updateComponentInEnv3(cache, env, ih, SCode.mergeModifiers(m, SCodeUtil.getConstrainedByModifiers(inPrefixes)), impl, Mod.COMPONENT(name), info);
         classmod = Mod.lookupModificationP(mod, path);
         mm = Mod.lookupCompModification(mod, name);
         // make sure is not a redeclare
@@ -4594,7 +4577,7 @@ algorithm
     // mod is a redeclare, take binding from m!
     case (cache,env,cenv,ih,_,_,_,_,_,_,_,_,_,_,_,mod,_,_,_,updatedComps)
       equation
-        (cache, m_1) = updateComponentInEnv3(cache, env, ih, m, impl, Mod.COMPONENT(name), info);
+        (cache, m_1) = updateComponentInEnv3(cache, env, ih, SCode.mergeModifiers(m, SCodeUtil.getConstrainedByModifiers(inPrefixes)), impl, Mod.COMPONENT(name), info);
         classmod = Mod.lookupModificationP(mod, path);
         mm = Mod.lookupCompModification(mod, name);
         mod = Mod.merge(classmod, mm, env, Prefix.NOPRE());

Compiler/FrontEnd/InstBinding.mo

@@ -670,7 +670,7 @@ algorithm
         (cache,binding) = makeBinding(cache,inEnv,inAttributes,startValueModification,inType,inPrefix,componentName,inInfo);
         binding = DAEUtil.setBindingSource(binding, DAE.BINDING_FROM_START_VALUE());
 
-        // lochel: I moved the waring to the back end for now
+        // lochel: I moved the warning to the back end for now
         // s = componentName;
         // pre_str = PrefixUtil.printPrefixStr2(inPrefix);
         // s = pre_str +& s;