- Changed argument order of Util.listMap01 to conform to the map(list…

…, function, extra args) convention. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@9811 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Sep 14, 2011 · f61b7df · f61b7df
1 parent f4cc8a7
commit f61b7df
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 24 deletions.
diff --git a/Compiler/BackEnd/BackendDAEOptimize.mo b/Compiler/BackEnd/BackendDAEOptimize.mo
@@ -3142,7 +3142,7 @@ algorithm
   tmp := listArray(rs);
   tmp2 := Util.listMap(Util.listFill(tmp,size),arrayCopy);
   valarr := listArray(tmp2);
-  Util.listMap01(jac,valarr,evaluateConstantJacobian2);
+  Util.listMap01(jac,evaluateConstantJacobian2,valarr);
   tmp2 := arrayList(valarr);
   vals := Util.listMap(tmp2,arrayList);
 end evaluateConstantJacobian;

diff --git a/Compiler/FrontEnd/InnerOuter.mo b/Compiler/FrontEnd/InnerOuter.mo
@@ -1028,7 +1028,7 @@ protected function checkMissingInnerDecl1
   input DAE.DAElist innerVarsDae;
   input DAE.DAElist outerVarsDae;
 algorithm
-  Util.listMap01(DAEUtil.daeElements(outerVarsDae),DAEUtil.daeElements(innerVarsDae),checkMissingInnerDecl2);
+  Util.listMap01(DAEUtil.daeElements(outerVarsDae),checkMissingInnerDecl2,DAEUtil.daeElements(innerVarsDae));
 end checkMissingInnerDecl1;
 
 protected function checkMissingInnerDecl2

diff --git a/Compiler/FrontEnd/Inst.mo b/Compiler/FrontEnd/Inst.mo
@@ -11497,7 +11497,7 @@ algorithm
   invars := checkExternalDeclInputUsed(invars,decl);
   invars := Util.listSelect1(invars,vars,checkVarBindingsInputUsed);
   (_,invars) := DAEUtil.traverseDAE2(algs,checkExpInputUsed,invars);
-  Util.listMap01(invars,name,warnUnusedFunctionVar);
+  Util.listMap01(invars,warnUnusedFunctionVar,name);
 end checkFunctionInputUsed;
 
 protected function warnUnusedFunctionVar

diff --git a/Compiler/FrontEnd/SCodeDependency.mo b/Compiler/FrontEnd/SCodeDependency.mo
@@ -425,10 +425,10 @@ algorithm
         annotationLst = annl, comment = cmt), _, _, _, _)
       equation
         Util.listMap02(el, analyseElement, inEnv, inRestriction);
-        Util.listMap01(nel, inEnv, analyseEquation);
-        Util.listMap01(iel, inEnv, analyseEquation);
-        Util.listMap01(nal, inEnv, analyseAlgorithm);
-        Util.listMap01(ial, inEnv, analyseAlgorithm);
+        Util.listMap01(nel, analyseEquation, inEnv);
+        Util.listMap01(iel, analyseEquation, inEnv);
+        Util.listMap01(nal, analyseAlgorithm, inEnv);
+        Util.listMap01(ial, analyseAlgorithm, inEnv);
         analyseExternalDecl(ext_decl, inEnv, inInfo);
         Util.listMap02(annl, analyseAnnotation, inEnv, inInfo);
         analyseComment(cmt, inEnv, inInfo);
@@ -1445,7 +1445,7 @@ protected
   list<SCode.Statement> stmts;
 algorithm
   SCode.ALGORITHM(stmts) := inAlgorithm;
-  Util.listMap01(stmts, inEnv, analyseStatement);
+  Util.listMap01(stmts, analyseStatement, inEnv);
 end analyseAlgorithm;
 
 protected function analyseStatement

diff --git a/Compiler/FrontEnd/Types.mo b/Compiler/FrontEnd/Types.mo
@@ -7051,7 +7051,7 @@ algorithm
       equation
         verifyExpressionType2(ety1, inType);
         ty = unliftArray(inType);
-        Util.listMap01(expl, ty, verifyExpressionType);
+        Util.listMap01(expl, verifyExpressionType, ty);
       then
         ();
     case (DAE.MATRIX(ty = ety1), _)
@@ -7078,7 +7078,7 @@ algorithm
         ();
     case (DAE.TUPLE(PR = expl), _)
       equation
-        Util.listMap01(expl, inType, verifyExpressionType);
+        Util.listMap01(expl, verifyExpressionType, inType);
       then
         ();
     case (DAE.CAST(ty = ety1), _)

diff --git a/Compiler/Util/Util.mo b/Compiler/Util/Util.mo
@@ -2643,27 +2643,29 @@ end listMap0;
 public function listMap01 "
   See listMap0
 "
-  input list<Type_a> inTypeALst;
-  input Type_b b;
-  input FuncTypeType_aTo inFuncTypeTypeATo;
+  input list<Type_a> inList;
+  input FuncType inFunc;
+  input Type_b inArg;
+
   replaceable type Type_a subtypeof Any;
   replaceable type Type_b subtypeof Any;
-  partial function FuncTypeType_aTo
-    input Type_a inTypeA;
-    input Type_b b;
-  end FuncTypeType_aTo;
+
+  partial function FuncType
+    input Type_a inElement;
+    input Type_b inArg;
+  end FuncType;
 algorithm
   _:=
-  match (inTypeALst,b,inFuncTypeTypeATo)
+  match (inList, inFunc, inArg)
     local
-      Type_a f;
-      list<Type_a> r;
-      FuncTypeType_aTo fn;
+      Type_a e;
+      list<Type_a> rest_e;
+
     case ({},_,_) then ();
-    case ((f :: r),b,fn)
+    case ((e :: rest_e), _, _)
       equation
-        fn(f,b);
-        listMap01(r, b,fn);
+        inFunc(e, inArg);
+        listMap01(rest_e, inFunc, inArg);
       then
         ();
   end match;