Fix DAEUtil.addDaeFunction.

OpenModelica · Apr 11, 2016 · e008b58 · e008b58
1 parent 7007bf4
commit e008b58
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 39 deletions.
diff --git a/Compiler/FrontEnd/DAE.mo b/Compiler/FrontEnd/DAE.mo
@@ -586,6 +586,8 @@ public
   algorithm
     outResult := Absyn.pathCompareNoQual(inKey1,inKey2);
   end keyCompare;
+
+  redeclare function addConflictDefault = addConflictReplace;
 end AvlTreePathFunction;
 
 /* -- Algorithm.mo -- */

diff --git a/Compiler/FrontEnd/DAEUtil.mo b/Compiler/FrontEnd/DAEUtil.mo
@@ -5568,43 +5568,12 @@ algorithm
 end collectFunctionRefVarPaths;
 
 public function addDaeFunction "add functions present in the element list to the function tree"
-  input list<DAE.Function> ifuncs;
-  input DAE.FunctionTree itree;
-  output DAE.FunctionTree outTree;
+  input list<DAE.Function> functions;
+  input output DAE.FunctionTree functionTree;
 algorithm
-  outTree := match (ifuncs,itree)
-    local
-      DAE.Function func, fOld;
-      list<DAE.Function> funcs;
-      DAE.FunctionTree tree;
-      String msg;
-
-    case ({},tree)
-      equation
-        //showCacheFuncs(tree);
-      then
-        tree;
-/*
-    case (func::funcs,tree)
-      equation
-        true = Flags.isSet(Flags.FAILTRACE);
-        // print("Add to cache [check] : " + Absyn.pathString(functionName(func)) + "\n");
-        // print("Function added: \n" + DAEDump.dumpFunctionStr(func) + "\n");
-        fOld = Util.getOption(DAE.AvlTreePathFunction.get(tree, functionName(func)));
-        failure(equality(fOld = func));
-        print("Function already in the tree and different (keep the one already in the tree):" +
-          "\nnew:\n" + DAEDump.dumpFunctionStr(func) +
-          "\nold:\n" + DAEDump.dumpFunctionStr(fOld) + "\n");
-      then
-        fail();
-*/
-    case (func::funcs,tree)
-      equation
-        // print("Add to cache: " + Absyn.pathString(functionName(func)) + "\n");
-        tree = DAE.AvlTreePathFunction.add(tree,functionName(func),SOME(func));
-      then addDaeFunction(funcs,tree);
-
-  end match;
+  for f in functions loop
+    functionTree := DAE.AvlTreePathFunction.add(functionTree, functionName(f), SOME(f));
+  end for;
 end addDaeFunction;
 
 public function addFunctionDefinition

diff --git a/Compiler/Util/BaseAvlTree.mo b/Compiler/Util/BaseAvlTree.mo
@@ -65,6 +65,9 @@ algorithm
   end match;
 end printNodeStr;
 
+replaceable function addConflictDefault = addConflictFail
+  "Default conflict resolving function for add.";
+
 function addConflictFail
   "Conflict resolving function for add which fails on conflict."
   input Value newValue;
@@ -93,7 +96,7 @@ redeclare function add
   input Tree inTree;
   input Key inKey;
   input Value inValue;
-  input ConflictFunc conflictFunc = addConflictFail "Used to resolve conflicts.";
+  input ConflictFunc conflictFunc = addConflictDefault "Used to resolve conflicts.";
   output Tree tree=inTree;
 
   partial function ConflictFunc
@@ -139,7 +142,7 @@ redeclare function addList
   "Adds a list of key-value pairs to the tree."
   input output Tree tree;
   input list<tuple<Key,Value>> inValues;
-  input ConflictFunc conflictFunc = addConflictFail "Used to resolve conflicts.";
+  input ConflictFunc conflictFunc = addConflictDefault "Used to resolve conflicts.";
 
   partial function ConflictFunc
     input Value newValue "The value given by the caller.";
@@ -227,7 +230,7 @@ redeclare function join
   "Joins two trees by adding the second one to the first."
   input output Tree tree;
   input Tree treeToJoin;
-  input ConflictFunc conflictFunc = addConflictFail "Used to resolve conflicts.";
+  input ConflictFunc conflictFunc = addConflictDefault "Used to resolve conflicts.";
 
   partial function ConflictFunc
     input Value newValue "The value given by the caller.";