- Fix RML crap

git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6657 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 27, 2010 · dc792e7 · dc792e7
1 parent d1ece24
commit dc792e7
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 108 deletions.
diff --git a/Compiler/AbsynDep.mo b/Compiler/AbsynDep.mo
@@ -449,12 +449,14 @@ protected function doBalance3 "help function to doBalance2"
   output AvlTree outBt;
 algorithm
   outBt := matchcontinue(bt)
-  local AvlTree rr;
-    case(bt) equation
-      true = differenceInHeight(getOption(rightNode(bt))) > 0;
-      rr = rotateRight(getOption(rightNode(bt)));
-      bt = setRight(bt,SOME(rr));
-    then bt;
+    local
+      AvlTree rr;
+    case (bt)
+      equation
+        true = differenceInHeight(getOption(rightNode(bt))) > 0;
+        rr = rotateRight(getOption(rightNode(bt)));
+        bt = setRight(bt,SOME(rr));
+      then bt;
     case(bt) then bt;
   end matchcontinue;
 end doBalance3;
@@ -519,21 +521,23 @@ algorithm
 end rightNode;
 
 protected function exchangeLeft "help function to balance"
-input AvlTree node;
-input AvlTree parent;
-output AvlTree outParent "updated parent";
+  input AvlTree node;
+  input AvlTree parent;
+  output AvlTree outParent "updated parent";
 algorithm
   outParent := matchcontinue(node,parent)
-    local Option<AvlTreeValue> value;
-      Integer height ;
-      AvlTree left,right,bt,leftNode,rightNode;
+    local
+      Option<AvlTreeValue> value;
+      Integer height;
+      AvlTree bt;
 
-    case(node,parent) equation
-      parent = setRight(parent,leftNode(node));
-      parent = balance(parent);
-      node = setLeft(node,SOME(parent));
-      bt = balance(node);
-    then bt;
+    case  (node,parent)
+      equation
+        parent = setRight(parent,leftNode(node));
+        parent = balance(parent);
+        node = setLeft(node,SOME(parent));
+        bt = balance(node);
+      then bt;
   end matchcontinue;
 end exchangeLeft;
 

diff --git a/Compiler/DAEUtil.mo b/Compiler/DAEUtil.mo
@@ -4583,14 +4583,15 @@ algorithm
 end rightNode;
 
 protected function exchangeLeft "help function to balance"
-input DAE.AvlTree node;
-input DAE.AvlTree parent;
-output DAE.AvlTree outParent "updated parent";
+  input DAE.AvlTree node;
+  input DAE.AvlTree parent;
+  output DAE.AvlTree outParent "updated parent";
 algorithm
   outParent := matchcontinue(node,parent)
-    local Option<DAE.AvlTreeValue> value;
-      Integer height ;
-      DAE.AvlTree left,right,bt,leftNode,rightNode;
+    local
+      Option<DAE.AvlTreeValue> value;
+      Integer height;
+      DAE.AvlTree bt;
 
     case(node,parent) equation
       parent = setRight(parent,leftNode(node));

diff --git a/Compiler/Env.mo b/Compiler/Env.mo
@@ -1663,37 +1663,15 @@ public function avlTreeAdd "
   input AvlKey inKey;
   input AvlValue inValue;
   output AvlTree outAvlTree;
-  partial function FuncTypeKeyToInteger
-    input AvlKey inKey;
-    output Integer outInteger;
-  end FuncTypeKeyToInteger;
 algorithm
   outAvlTree := matchcontinue (inAvlTree,inKey,inValue)
     local
-      partial function FuncTypeStringToInteger
-        input AvlKey inString;
-        output Integer outInteger;
-      end FuncTypeStringToInteger;
       AvlKey key,rkey;
       AvlValue value,rval;
       Option<AvlTree> left,right;
-      FuncTypeStringToInteger hashfunc;
       Integer rhval,h;
       AvlTree t_1,t,right_1,left_1,bt;
 
-    /* adrpo 2010-10-07: what is this??? WHAT is "lskf" KEY??
-    // empty tree
-    case (AVLTREENODE(value = NONE(),height=h,left = NONE(),right = NONE()),key as "lskf",value)
-      then AVLTREENODE(SOME(AVLTREEVALUE(key,value)),1,NONE(),NONE());
-    
-		// replace this node
-    case (AVLTREENODE(value = SOME(AVLTREEVALUE(rkey,rval)),height=h,left = left,right = right),key as "lskf",value)
-      equation
-        true = stringEqual(rkey, key);
-        bt = balance(AVLTREENODE(SOME(AVLTREEVALUE(rkey,value)),h,left,right));
-      then
-        bt;*/
-
     // empty tree
     case (AVLTREENODE(value = NONE(),height=h,left = NONE(),right = NONE()),key,value)
     	then AVLTREENODE(SOME(AVLTREEVALUE(key,value)),1,NONE(),NONE());
@@ -1957,14 +1935,15 @@ algorithm
 end rightNode;
 
 protected function exchangeLeft "help function to balance"
-input AvlTree node;
-input AvlTree parent;
-output AvlTree outParent "updated parent";
+  input AvlTree node;
+  input AvlTree parent;
+  output AvlTree outParent "updated parent";
 algorithm
   outParent := matchcontinue(node,parent)
-    local Option<AvlTreeValue> value;
+    local
+      Option<AvlTreeValue> value;
       Integer height ;
-      AvlTree left,right,bt,leftNode,rightNode;
+      AvlTree bt;
 
     case(node,parent) equation
       parent = setRight(parent,leftNode(node));
@@ -2035,22 +2014,13 @@ public function avlTreeGet "  Get a value from the binary tree given a key.
   input AvlTree inAvlTree;
   input AvlKey inKey;
   output AvlValue outValue;
-  partial function FuncTypeKeyToInteger
-    input AvlKey inKey;
-    output Integer outInteger;
-  end FuncTypeKeyToInteger;
 algorithm
   outValue:=
   matchcontinue (inAvlTree,inKey)
     local
-      partial function FuncTypeStringToInteger
-        input AvlKey inString;
-        output Integer outInteger;
-      end FuncTypeStringToInteger;
       AvlKey rkey,key;
       AvlValue rval,res;
       Option<AvlTree> left,right;
-      FuncTypeStringToInteger hashfunc;
       Integer rhval;
 
     // hash func Search to the right