Improve DAE.traverseDAE*

- Cleanup and improve DAE.traverseDAE* - Renamed some functions: * traverseDAE2 -> traverseDAEElementList * traverseDAE2_tail2 -> traverseDAEElement
OpenModelica · Apr 12, 2016 · b623cc2 · b623cc2
1 parent a17aa0e
commit b623cc2
Show file tree

Hide file tree

Showing 8 changed files with 302 additions and 377 deletions.
diff --git a/Compiler/BackEnd/BackendDAECreate.mo b/Compiler/BackEnd/BackendDAECreate.mo
@@ -3298,7 +3298,7 @@ algorithm
        params_new = List.map(crefs_new,Expression.crefExp);
        repl = VarTransform.emptyReplacements();
        repl =  VarTransform.addReplacementLst(repl,crefs,params_new);
-       (body,_) = DAEUtil.traverseDAE2(body,replaceParameters,repl);
+       (body,_) = DAEUtil.traverseDAEElementList(body,replaceParameters,repl);
      then DAE.FUNCTION_DEF(body);
    else
      then funcIn;

diff --git a/Compiler/BackEnd/BackendDAEOptimize.mo b/Compiler/BackEnd/BackendDAEOptimize.mo
@@ -1548,7 +1548,7 @@ algorithm
 
     if isSome(f) then
       outUsedFunctions := DAE.AvlTreePathFunction.add(outUsedFunctions, inPath, f);
-      (_, outUsedFunctions) := DAEUtil.traverseDAE2(body,
+      (_, outUsedFunctions) := DAEUtil.traverseDAEElementList(body,
         function checkUnusedFunctions(inFunctions = inFunctions), outUsedFunctions);
     end if;
   end try;

diff --git a/Compiler/FrontEnd/ConnectionGraph.mo b/Compiler/FrontEnd/ConnectionGraph.mo
@@ -979,7 +979,7 @@ algorithm
         //  BaseHashTable.dumpHashTable(table);
         rooted = setRootDistance(inRoots,table,0,{},HashTable.emptyHashTable());
         //  BaseHashTable.dumpHashTable(rooted);
-        (outDae, _) = DAEUtil.traverseDAE2(inDae, evalConnectionsOperatorsHelper, (rooted,inRoots,graph));
+        (outDae, _) = DAEUtil.traverseDAEElementList(inDae, evalConnectionsOperatorsHelper, (rooted,inRoots,graph));
       then outDae;
 
   end matchcontinue;