-Merged -r 4222 from MathCoreOSMC branch (connect two-dimensional array of components)

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

Author: Peter Aronsson

Compiler/Env.mo

@@ -1523,7 +1523,7 @@ algorithm
         ((flatArrayType as (Types.T_COMPLEX(_,tvars,_,_),_)),adims) = Types.flattenArrayType(tmpty);
         false = Types.isComplexConnector(flatArrayType);
 
-        indexSubscriptLists = createSubs(adims);
+        indexSubscriptLists = createSubs(listReverse(adims));
 
         lst1 = localInsideConnectorFlowvars3_2(tvars, id, indexSubscriptLists);
         lst2 = localInsideConnectorFlowvars2(l);

Compiler/Error.mo

@@ -450,7 +450,7 @@ protected constant list<tuple<Integer, MessageType, Severity, String>> errorTabl
           (ASSERT_CONSTANT_FALSE_ERROR,SYMBOLIC(),ERROR(),
           "assert triggered during translation: %s"),
           (SETTING_FIXED_ATTRIBUTE,TRANSLATION(),WARNING(),
-          "No variable has fixed=false but model contains initial equations. Setting fixed=false to the following variables: %s"),
+          "Using overdeterimed solver for initialization. Setting fixed=false to the following variables: %s"),
           (PROPAGATE_START_VALUE,TRANSLATION(),WARNING(),
           "Failed to propagate the start value from variable dummy state %s to state %s. Provide a start value for the selected state instead"),  
           (SEMI_SUPPORTED_FUNCTION,TRANSLATION(),WARNING(),

Compiler/Inst.mo

@@ -9031,7 +9031,10 @@ protected function daeDeclare
 "function: daeDeclare 
   Given a global component name, a type, and a set of attributes, this function declares a component for the DAE result.  
   Altough this function returns a list of DAE.Element, only one component is actually declared.
-  The functions daeDeclare2 and daeDeclare3 below are helper functions that perform parts of the task."
+  The functions daeDeclare2 and daeDeclare3 below are helper functions that perform parts of the task.
+  Note: Currently, this function can only declare scalar variables, i.e. the element type of an array type is used. To indicate that the variable
+  is an array, the InstDims attribute is used. This will need to be redesigned in the futurue, when array variables should not be flattened out in the frontend. 
+  "
   input Exp.ComponentRef inComponentRef;
   input ClassInf.State inState;
   input Types.Type inType;

Compiler/Types.mo

@@ -1955,6 +1955,43 @@ algorithm
   end matchcontinue;
 end makeArray;
 
+public function makeArraySubscripts "function: makeArray
+   This function makes an array type given a Type and a list of Exp.Subscript
+"
+  input Type inType;
+  input list<Exp.Subscript> lst;
+  output Type outType;
+algorithm 
+  outType:=
+  matchcontinue (inType,lst)
+    local
+      Type t;
+      Integer i;
+      Exp.Exp e;
+    case (t,{}) then t; 
+    case (t,Exp.WHOLEDIM::lst)
+      equation 
+        t = makeArraySubscripts((T_ARRAY(DIM(NONE),t),NONE),lst);
+      then
+        t;
+    case (t,Exp.SLICE(e)::lst)
+      equation 
+        t = makeArraySubscripts((T_ARRAY(DIM(NONE),t),NONE),lst);
+      then
+        t;
+      
+    case (t,Exp.INDEX(Exp.ICONST(i))::lst)
+      equation 
+        t = makeArraySubscripts((T_ARRAY(DIM(SOME(i)),t),NONE),lst);
+      then
+        t;
+     case (t,Exp.INDEX(_)::lst)
+      equation 
+        t = makeArraySubscripts((T_ARRAY(DIM(NONE),t),NONE),lst);
+      then
+        t;
+  end matchcontinue;
+end makeArraySubscripts;
 
 public function dimensionsEqual "Returns true if two dimensions are 'equal', i.e. if both
 are specified, return comparison of dimension size,