思路楼乱了

src/graph.c

@@ -906,36 +906,68 @@ const void *graph_iter_next(struct _iterator *iter)
 
         stack_t stack = self->stack;
 
-        while (!self->stack->empty(self->stack) || cur_node != NULL)
+        // while (!self->stack->empty(self->stack) || cur_node != NULL)
+        do
         {
-            if (cur_edge != NULL)
+            if(cur_node == NULL)
+            {
+                break;
+            }
+
+            if(cur_node->visited == true)
+            {
+                stack->pop(stack, &cur_node);
+                cur_node->visited = true;
+                node = cur_node;
+                break;
+            }
+
+            bool accessible_vertex_exists = false;
+
+            // 1. add cur_node to stack
+            stack->push(stack, &cur_node);
+
+            // 2. find the first unvisited vertex
+            cur_edge = cur_node->edgehead;
+            while(cur_edge != NULL)
             {
                 target = cur_edge->target;
                 if(target != NULL && target->visited != true)
                 {
-                    stack->push(stack, &target);
+                    accessible_vertex_exists = true;
+
+                    cur_node = target;
+                    break;
                 }
                 cur_edge = cur_edge->next;
             }
-            else
+            
-            {
             iterator_t iter = stack->iter(stack);
+            struct _graph_node *temp_node = NULL;
             while (iter->hasnext(iter))
             {
-                    struct _graph_node* g_node = *(struct _graph_node **)iter->next(iter);
+                temp_node = *(struct _graph_node **)iter->next(iter);
-                    self->print_obj(g_node->obj);
+                self->print_obj(temp_node->obj);
             }
             printf("\n");
 
-                self->stack->pop(self->stack, &cur_node);
+            if(accessible_vertex_exists != true ||
-                node = cur_node;
+                cur_edge == NULL)
-                cur_node = cur_node->next;
+            {
+                // if no accessible vertex, pop from stack
+                stack->pop(stack, &node);
+                node->visited = true;
+
+                stack->peek(stack, &cur_node);
                 break;
             }
-        }
+        }while(!stack->empty(stack));
 
-        iter->_cur_node = node;
+        printf("--- end ---\n");
-        obj = cur_node->obj;
+        iter->_cur_node = cur_node;
+        printf("--- end1 ---\n");
+        obj = node->obj;
+        printf("--- end2 ---\n");
     }
     break;
     default:

test/test_graph.c

@@ -166,7 +166,7 @@ void test_graph_iter(void)
     while(iter_vertex->hasnext(iter_vertex))
     {
         temp = *(int *)iter_vertex->next(iter_vertex);
-        // graph->print_obj(&temp);
+        printf("temp = %d\n", temp);
     }
 
     graph_free(&graph);