--- a/src/parallel_execution/rb_tree.c	Tue Nov 08 17:35:03 2016 +0900
+++ b/src/parallel_execution/rb_tree.c	Tue Nov 08 19:39:40 2016 +0900
@@ -3,7 +3,6 @@
 #include "context.h"
 #include "origin_cs.h"
 
-extern union Data* allocator(struct Context* context);
 extern enum Relational compare(struct Node* node1, struct Node* node2);
 
 void printTree1(union Data* data) {
@@ -31,9 +30,7 @@
     if (root) {
         traverse->current = root;
         traverse->result = compare(traverse->current, node);
-        nodeStack->data = (union Data*)(newNode);
-        nodeStack->next = Replace1;
-        goto meta(context, nodeStack->push);
+        goto meta(context, Replace);
     }
 
     goto meta(context, Insert);
@@ -42,7 +39,7 @@
 __code put_stub(struct Context* context) {
     struct Node* newNode = &ALLOCATE(context, Node)->node;
     goto put(context,
-             context->data[Traverse]->traverse.nodeStack,
+             &context->data[Stack]->stack,
              &context->data[Tree]->tree,
              &context->data[Node]->node,
              &context->data[Traverse]->traverse,
@@ -52,10 +49,12 @@
 }
 
 __code replaceNode(struct Context* context, struct Traverse* traverse, struct Node* oldNode, struct Node* newNode, struct Stack* nodeStack) {
+    traverse->previous = newNode;
     *newNode = *oldNode;
+    nodeStack->stack = (union Data*)traverse->nodeStack;
     nodeStack->data = (union Data*)(newNode);
     nodeStack->next = Replace1;
-    goto meta(context, nodeStack->push);
+    goto meta(context, traverse->nodeStack->push);
 }
 
 __code replaceNode_stub(struct Context* context) {
@@ -63,7 +62,7 @@
                   &context->data[Traverse]->traverse,
                   context->data[Traverse]->traverse.current,
                   context->data[Traverse]->traverse.newNode,
-                  context->data[Traverse]->traverse.nodeStack);
+                  &context->data[Stack]->stack);
 }
 
 __code replaceNode1(struct Context* context, struct Traverse* traverse, struct Node* node, struct Node* oldNode, struct Node* newNode, struct Node* newnewNode, int result) {
@@ -94,7 +93,7 @@
                      &context->data[Traverse]->traverse,
                      &context->data[Node]->node,
                      context->data[Traverse]->traverse.current,
-                     &context->data[Traverse]->traverse.nodeStack->data->node,
+                     context->data[Traverse]->traverse.previous,
                      newnewNode,
                      context->data[Traverse]->traverse.result);
 }
@@ -127,21 +126,21 @@
         &context->data[Traverse]->traverse.nodeStack->stack->singleLinkedStack);
 }
 
-__code insertCase2(struct Context* context, struct Stack* nodeStack, struct Node* parent) {
+__code insertCase2(struct Context* context, struct Traverse* traverse, struct Stack* nodeStack, struct Node* parent) {
     if (parent->color == Black) {
         goto meta(context, StackClear);
     }
+    nodeStack->stack = (union Data*)traverse->nodeStack;
     nodeStack->next = InsertCase3;
-    goto meta(context, nodeStack->get2);
+    goto meta(context, traverse->nodeStack->get2);
 }
 
 __code insert2_stub(struct Context* context) {
     struct SingleLinkedStack *nodeStack = (struct SingleLinkedStack*)context->data[Traverse]->traverse.nodeStack->stack;
-    goto insertCase2(context, context->data[Traverse]->traverse.nodeStack, &nodeStack->top->data->node);
+    goto insertCase2(context, &context->data[Traverse]->traverse, &context->data[Stack]->stack, &nodeStack->top->data->node);
 }
 
-__code insertCase3(struct Context* context, struct Traverse* traverse, struct Node* parent, struct Node* grandparent) {
-    struct Stack* nodeStack = traverse->nodeStack;
+__code insertCase3(struct Context* context, struct Traverse* traverse, struct Stack* nodeStack, struct Node* parent, struct Node* grandparent) {
     struct Node* uncle;
 
     if (grandparent->left == parent)
@@ -155,15 +154,18 @@
         uncle->color = Black;
         grandparent->color = Red;
         traverse->current = grandparent;
+        nodeStack->stack = (union Data*)traverse->nodeStack;
         nodeStack->next = InsertCase1;
-        goto meta(context, nodeStack->pop2);
+        goto meta(context, traverse->nodeStack->pop2);
     }
+    nodeStack->stack = (union Data*)traverse->nodeStack;
     nodeStack->next = InsertCase4;
-    goto meta(context, nodeStack->get2);
+    goto meta(context, traverse->nodeStack->get2);
 }
 
 __code insert3_stub(struct Context* context) {
     goto insertCase3(context, &context->data[Traverse]->traverse,
+                     &context->data[Stack]->stack,
                      &context->data[Traverse]->traverse.nodeStack->data->node,
                      &context->data[Traverse]->traverse.nodeStack->data1->node
         );
@@ -176,11 +178,13 @@
     if ((current == parent->right) && (parent == grandparent->left)) {
         traverse->current = traverse->current->left;
         traverse->rotateNext = InsertCase5;
+        nodeStack->stack = (union Data*)traverse->nodeStack;
         nodeStack->next = RotateL;
         goto meta(context, nodeStack->get);
     } else if ((current == parent->left) && (parent == grandparent->right)) {
         traverse->current = traverse->current->right;
         traverse->rotateNext = InsertCase5;
+        nodeStack->stack = (union Data*)traverse->nodeStack;
         nodeStack->next = RotateR;
         goto meta(context, nodeStack->get);
     }
@@ -197,6 +201,7 @@
 
 __code insertCase5(struct Context* context, struct Traverse* traverse) {
     struct Stack* nodeStack = traverse->nodeStack;
+    nodeStack->stack = (union Data*)traverse->nodeStack;
     nodeStack->next = InsertCase51;
     goto meta(context, nodeStack->pop2);
 }
@@ -227,6 +232,7 @@
 // put rotateLeft's continuation as argument
 __code rotateLeft(struct Context* context, struct Traverse* traverse) {
     struct Stack* nodeStack = traverse->nodeStack;
+    nodeStack->stack = (union Data*)traverse->nodeStack;
     nodeStack->next = RotateL1;
     goto meta(context, nodeStack->get);
 }