Rewrite the document_stack modules

document_stack now takes a void pointer, but perhaps this module will be
deleted in favour of a more procedural approach based on state machines.

Author: timeout

include/html_parser_document_stack.h

@@ -1,8 +1,6 @@
 #ifndef __document_stack_included__
 #define __document_stack_included__
 
-#include "html_parser_document_node.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -12,11 +10,11 @@ typedef struct T *T;
 
 extern T Stack_stack(void);
 extern int Stack_empty(T stk);
-extern void Stack_push(T stk, Node_T *n);
-extern Node_T *Stack_peek(T stk);
-extern int Stack_find(T stk, const char *tag_name);
-extern Node_T *Stack_pop(T stk);
-extern void Stack_free(T *Stk);
+extern void Stack_push(T stk, void *n);
+extern void *Stack_peek(T stk);
+// extern int Stack_find(T stk, const char *tag_name);
+extern void *Stack_pop(T stk);
+extern void Stack_free(T *stk);
 
 #undef T
 #ifdef __cplusplus

src/html_parser_document_stack.c

@@ -10,7 +10,7 @@
 struct T {
 	int count;
 	struct elem {
-		Node_T *n;
+		void *n;
 		struct elem *link;
 	} *head;
 };
@@ -33,7 +33,7 @@ int Stack_empty(T stk)
 	return (stk->count == 0);
 }
 
-void Stack_push(T stk, Node_T *n)
+void Stack_push(T stk, void *n)
 {
 	struct elem *t;
 
@@ -45,37 +45,37 @@ void Stack_push(T stk, Node_T *n)
 	stk->count++;
 }
 
-Node_T *Stack_peek(T stk)
+void *Stack_peek(T stk)
 {
 	assert(stk);
 	assert(stk->count > 0);
 
 	return stk->head->n;
 }
 
-int Stack_find(T stk, const char *tag_name)
-{
-	int index = 0; 		/* 0 : not found */
+/*int Stack_find(T stk, const char *tag_name)*/
+/*{*/
+	/*int index = 0; 		[> 0 : not found <]*/
 
-	assert(stk);
+	/*assert(stk);*/
 
-	if (!Stack_empty(stk)) {
-		struct elem *t = stk->head;
+	/*if (!Stack_empty(stk)) {*/
+		/*struct elem *t = stk->head;*/
 
-		while (index++ < stk->count) {
-			if (tag_name == Node_name(*t->n))
-				break;
+		/*while (index++ < stk->count) {*/
+			/*if (tag_name == Node_name(*t->n))*/
+				/*break;*/
 
-			t = t->link;
-		}
-	}
+			/*t = t->link;*/
+		/*}*/
+	/*}*/
 
-	index = (index > stk->count) ? 0 : index;
+	/*index = (index > stk->count) ? 0 : index;*/
 
-	return index;
-}
+	/*return index;*/
+/*}*/
 
-Node_T *Stack_pop(T stk)
+void *Stack_pop(T stk)
 {
 	Node_T *n;
 	struct elem *t;

tests/html_parser_document_stack_test.c

@@ -23,7 +23,7 @@ static int Test_stack_stack(T t, void *, const void *);
 static int Test_stack_empty(T t, void *, const void *);
 static int Test_stack_push(T t, void *, const void *);
 static int Test_stack_peek(T t, void *, const void *);
-static int Test_stack_find(T t, void *, const void *);
+// static int Test_stack_find(T t, void *, const void *);
 static int Test_stack_pop(T t, void *, const void *);
 static int Test_stack_free(T t, void *, const void *);
 
@@ -47,8 +47,8 @@ int main(int argc, const char *argv[])
 			(const void *) nodes);
 	Test_add(suite, Test_stack_peek, PREV_INPUT(suite),
 			(const void *) nodes);
-	Test_add(suite, Test_stack_find, PREV_INPUT(suite),
-			(const void *) st);
+//	Test_add(suite, Test_stack_find, PREV_INPUT(suite),
+//			(const void *) st);
 	Test_add(suite, Test_stack_pop, PREV_INPUT(suite),
 			(const void *) nodes);
 	Test_add(suite, Test_stack_free, PREV_INPUT(suite), NULL);