Changeset 1226 for to-imperative/trunk/runtime/rf_table.cc

Timestamp:

Aug 15, 2003, 10:11:57 AM (17 years ago)

Author:

pooh

Message:

• Table::insert_node() fixes.

File:

• to-imperative/trunk/runtime/rf_table.cc (modified) (1 diff)

to-imperative/trunk/runtime/rf_table.cc

@@ -11 +11 @@
 size_t Table::count = 0;
 
-//  
-// inserting of element newNode in this-Table 
+//
+// inserting of element newNode in this-Table
 void Table::insert_node (TableNode* _node)
-{ 
+{
   TableNode* x;
   TableNode* y;
   int flag;
   y = TableNode::nil;
-  x = root;   
+  x = root;
   while (x != TableNode::nil) {
     y=x;
-    if ((_node->hash_key) == (x->hash_key)) {  
+    if ((_node->hash_key) == (x->hash_key)) {
       flag = Expr::compare(_node->key, x->key);
-      if (!flag)                    //   case 0 :  ==
+      if (!flag) {                      //   case 0 :  ==
         return;
-      if (flag < 0) {               //   case < 0 : <
+      } else if (flag < 0) {            //   case < 0 : <
         x = x->left;
-        continue;
       } else {
         x = x->right;
-        continue;
-      }
+      }
+    } else if ((_node->hash_key) < (x->hash_key)) {
+      x = x->left;
+    } else {
+      x = x->right;
     }
-    if ((_node->hash_key) < (x->hash_key))
-      x = x->left;
-    else
-      x = x->right;
   }
   _node->p = y;
-  if (y == TableNode::nil)
-    root = _node;  
-  else
-    if ((_node->hash_key) == (x->hash_key)) {  
-      flag = Expr::compare(_node->key, x->key);
+  if (y == TableNode::nil) {
+    root = _node;
+  } else {
+    //
+    // FIXME: Here we already chosen valid direction, so probably we
+    // should introduce a flag indicating that direction to avoid possible
+    // duplicated compare(). [pooh 2003-08-15]
+    if ((_node->hash_key) == (y->hash_key)) {
+      flag = Expr::compare(_node->key, y->key);
       if (flag < 0) {
         y->left = _node;
-        return;
       } else {
         y->right = _node;
-        return;
-      }
-    }   
-  if ((_node->hash_key) < (y->hash_key))
-    y->left = _node;
-  else
-    y->right = _node;
+      }
+    } else if ((_node->hash_key) < (y->hash_key)) {
+      y->left = _node;
+    } else {
+      y->right = _node;
+    }
+  }
 }