Mercurial > hg > Members > Moririn

changeset 157:7cd629c29050

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author mir3636
date Tue, 15 Nov 2016 22:34:48 +0900
parents 0aa2265660a0
children 3fdb3334c7a9
files src/parallel_execution/rb_tree.cbc
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/parallel_execution/rb_tree.cbc	Tue Nov 15 20:17:31 2016 +0900
+++ b/src/parallel_execution/rb_tree.cbc	Tue Nov 15 22:34:48 2016 +0900
@@ -111,7 +111,7 @@
         traverse->current = traverse->grandparent;
         nodeStack->stack = (union Data*)traverse->nodeStack;
         nodeStack->next = insertCase1;
-        goto traverse->nodeStack->pop2();
+        goto traverse->nodeStack->pop2(nodeStack);
     }
     goto insertCase4(traverse, traverse->rotateTree);
 }
@@ -128,7 +128,7 @@
 
         nodeStack->stack = (union Data*)traverse->nodeStack;
         nodeStack->next = rotateLeft;
-        goto meta(context, nodeStack->pop);
+        goto nodeStack->pop(nodeStack);
     } else if ((traverse->current == traverse->parent->left) && (traverse->parent == traverse->grandparent->right)) {
         traverse->parent = traverse->grandparent;
         traverse->current = traverse->current->right;
@@ -138,7 +138,7 @@
 
         nodeStack->stack = (union Data*)traverse->nodeStack;
         nodeStack->next = rotateRight;
-        goto nodeStack->pop();
+        goto nodeStack->pop(nodeStack);
     }
 
     goto insertCase5(traverse);
@@ -148,7 +148,7 @@
     Stack* stack = new Stack;
     nodeStack->stack = (union Data*)traverse->nodeStack;
     nodeStack->next = insertCase51;
-    goto traverse->nodeStack->pop2();
+    goto traverse->nodeStack->pop2(nodeStack);
 }
 
 __code insertCase51(struct Traverse* traverse, struct RotateTree *rotateTree, struct Node* current, struct Node* parent, struct Node* grandparent) {
@@ -173,7 +173,7 @@
     Stack* nodeStack = new Stack();
     nodeStack->stack = (union Data*)traverse->nodeStack;
     nodeStack->next = rotateLeft1;
-    goto traverse->nodeStack->get();
+    goto traverse->nodeStack->get(nodeStack);
 }
 
 __code rotateLeft1(struct Node* node, struct Tree* tree, struct Traverse* traverse, struct Node *parent,struct RotateTree *rotateTree) {
@@ -199,7 +199,7 @@
     Stack* nodeStack = new Stack();
     nodeStack->stack = (union Data*)traverse->nodeStack;
     nodeStack->next = rotateRight1;
-    goto traverse->nodeStack->get();
+    goto traverse->nodeStack->get(nodeStack);
 }
 
 __code rotateRight1(struct Node* node, struct Tree* tree, struct Traverse* traverse,struct Node *parent,struct RotateTree *rotateTree) {
@@ -226,7 +226,7 @@
     traverse->current = 0;
     nodeStack->stack = (union Data*)traverse->nodeStack;
     nodeStack->next = context->next;
-    goto traverse->nodeStack->clear();
+    goto traverse->nodeStack->clear(nodeStack);
 }
 
 __code get(struct Tree* tree, struct Traverse* traverse) {
@@ -245,7 +245,7 @@
     if (traverse->result == EQ) {
         *node = *traverse->current;
         
-        goto meta(context, traverse->next);
+        goto traverse->next(...);
     } else if (traverse->result == GT) {
         traverse->current = traverse->current->right;
     } else {
@@ -253,7 +253,7 @@
     }
         
     if (traverse->current)
-        goto search(traverse);
+        goto search(traverse, traverse->node);
 
     goto traverse->next(...);
 }