some small list optimizations

OpenModelica · Oct 5, 2017 · d3f9ab1 · d3f9ab1
1 parent f85f44f
commit d3f9ab1
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 15 deletions.
diff --git a/Compiler/BackEnd/BackendDAEUtil.mo b/Compiler/BackEnd/BackendDAEUtil.mo
@@ -9188,7 +9188,7 @@ algorithm
       eqs := arrayGet(mT, i);
       var := BackendVariable.getVarAt(varsArray, i);
       info := var.source.info;
-      if listLength(eqs) == 0 then
+      if listEmpty(eqs) then
         Error.addSourceMessage(Error.VAR_NO_REMAINING_EQN, {
           ComponentReference.printComponentRefStr(var.varName),
           stringAppendList(list("\n  Equation " + String(eq) + ": " + BackendDump.equationString(BackendEquation.get(eqsArray, eq)) + ", which needs to solve for " + stringDelimitList(list(ComponentReference.printComponentRefStr(Util.tuple21(tpl)) for tpl in arrayGet(solvedEqs, eq)), ", ") for eq in arrayGet(mTOrig, i)))

diff --git a/Compiler/BackEnd/Matching.mo b/Compiler/BackEnd/Matching.mo
@@ -249,7 +249,7 @@ protected
 algorithm
   for i in 1:nEqns loop
     vars := m[i];
-    while not success and (listLength(vars) > 0) loop
+    while not success and not listEmpty(vars) loop
       j::vars := vars;
       // negative entries in adjacence matrix belong to states!!!
       if (j>0 and ass1[j] <= 0) then

diff --git a/Compiler/BackEnd/SynchronousFeatures.mo b/Compiler/BackEnd/SynchronousFeatures.mo
@@ -93,7 +93,7 @@ protected
 algorithm
   (clockedSysts, contSysts) := List.splitOnTrue(inDAE.eqs, BackendDAEUtil.isClockedSyst);
 
-  if listLength(clockedSysts) > 0 then
+  if not listEmpty(clockedSysts) then
     shared := inDAE.shared;
 
     (clockedSysts, shared) := treatClockedStates(clockedSysts, shared);
@@ -124,7 +124,7 @@ algorithm
   (clockedSysts, systs) := List.splitOnTrue(inDAE.eqs, BackendDAEUtil.isClockedSyst);
   shared := inDAE.shared;
 
-  if listLength(systs) > 0 then
+  if not listEmpty(systs) then
     BackendDAE.DAE({syst}, shared) := BackendDAEOptimize.collapseIndependentBlocks(BackendDAE.DAE(systs, shared));
     (systs, clockedSysts1, unpartRemEqs) := baseClockPartitioning(syst, shared);
     assert(listLength(clockedSysts1) == 0, "Get clocked system in SynchronousFeatures.addContVarsEqs");

diff --git a/Compiler/BackEnd/Tearing.mo b/Compiler/BackEnd/Tearing.mo
@@ -377,8 +377,10 @@ protected function getUserTearingSet
   output list<Integer> userResidualsThisComponent={};
 protected
   Integer i=1, start, end_;
+  Integer len;
 algorithm
-  while i < listLength(userTVars) loop
+  len := listLength(userTVars);
+  while i < len loop
       if intEq(listGet(userTVars,i),strongComponentIndex) then
         start := i+2;
         end_ := i + 1 + listGet(userTVars, i+1);
@@ -394,7 +396,8 @@ algorithm
   end while;
   if not listEmpty(userTvarsThisComponent) then
     i := 1;
-    while i < listLength(userResiduals) loop
+    len := listLength(userResiduals);
+    while i < len loop
         if intEq(listGet(userResiduals,i),strongComponentIndex) then
           start := i+2;
           end_ := i + 1 + listGet(userResiduals, i+1);

diff --git a/Compiler/FrontEnd/Types.mo b/Compiler/FrontEnd/Types.mo
@@ -427,24 +427,19 @@ algorithm
       Type at;
       DAE.Dimensions ad;
       DAE.Dimension dim;
-      Integer ll;
       list<DAE.Var> vars;
       ClassInf.State CIS;
       DAE.EqualityConstraint ec;
 
     // convert just the array!
-    case DAE.T_ARRAY(at,dim::ad)
-      equation
-        ll = listLength(ad);
-        true = (ll == 0);
+    case DAE.T_ARRAY(at,{dim})
+  equation
         ty = expTypetoTypesType(at);
         tty = DAE.T_ARRAY(ty,{dim});
       then
         tty;
     case DAE.T_ARRAY(at,dim::ad)
       equation
-        ll = listLength(ad);
-        true = (ll > 0);
         ty = expTypetoTypesType(DAE.T_ARRAY(at,ad));
         tty = DAE.T_ARRAY(ty,{dim});
       then

diff --git a/Compiler/SimCode/SimCodeUtil.mo b/Compiler/SimCode/SimCodeUtil.mo
@@ -890,7 +890,7 @@ protected function setJacobianVars "author: unknown
 protected
   SimCodeVar.SimVars vars;
 algorithm
-  if listLength(iJacobianVars) > 0 then
+  if not listEmpty(iJacobianVars) then
     vars := oModelInfo.vars;
     vars.jacobianVars := iJacobianVars;
     oModelInfo.vars := vars;

diff --git a/Compiler/Util/Util.mo b/Compiler/Util/Util.mo
@@ -496,7 +496,7 @@ protected
    algorithm
        lst:=stringSplitAtChar(inString,delim);
        lst2:=List.map(lst, stringInt);
-       if(intGt(listLength(lst2), 0)) then
+       if not listEmpty(lst2) then
          i := List.fold(lst2,intMul,1);
        else
          i := 0;