Implement the "in select" insertion mode, and add some more utility functions.

svn path=/trunk/hubbub/; revision=4446

5 files changed, 184 insertions, 1 deletions

diff --git a/src/treebuilder/Makefile b/src/treebuilder/Makefile
index aea3426..72c6bab 100644
--- a/src/treebuilder/Makefile
+++ b/src/treebuilder/Makefile
@@ -36,7 +36,7 @@ SRCS_$(d) := treebuilder.c \
 		initial.c before_html.c before_head.c in_head.c \
 		in_head_noscript.c after_head.c in_body.c \
 		in_caption.c in_column_group.c in_table_body.c in_row.c \
-		in_cell.c \
+		in_cell.c in_select.c \
 		generic_rcdata.c script_collect.c
 
 # Append to sources for component
diff --git a/src/treebuilder/in_select.c b/src/treebuilder/in_select.c
new file mode 100644
index 0000000..eb35317
--- /dev/null
+++ b/src/treebuilder/in_select.c
@@ -0,0 +1,142 @@
+/*
+ * This file is part of Hubbub.
+ * Licensed under the MIT License,
+ *                http://www.opensource.org/licenses/mit-license.php
+ * Copyright 2008 Andrew Sidwell
+ */
+
+#include <assert.h>
+#include <string.h>
+
+#include "treebuilder/modes.h"
+#include "treebuilder/internal.h"
+#include "treebuilder/treebuilder.h"
+#include "utils/utils.h"
+
+
+/**
+ * Handle token in "in head" insertion mode
+ *
+ * \param treebuilder  The treebuilder instance
+ * \param token        The token to handle
+ * \return True to reprocess token, false otherwise
+ */
+bool handle_in_select(hubbub_treebuilder *treebuilder,
+		const hubbub_token *token)
+{
+	bool reprocess = false;
+
+	element_type otype;
+	void *node;
+
+	switch (token->type) {
+	case HUBBUB_TOKEN_CHARACTER:
+		append_text(treebuilder, &token->data.character);
+		break;
+	case HUBBUB_TOKEN_COMMENT:
+		process_comment_append(treebuilder, token,
+				treebuilder->context.element_stack[
+				treebuilder->context.current_node].node);
+		break;
+	case HUBBUB_TOKEN_DOCTYPE:
+		/** \todo parse error */
+		break;
+	case HUBBUB_TOKEN_START_TAG:
+	{
+		element_type type = element_type_from_name(treebuilder,
+				&token->data.tag.name);
+
+		if (type == HTML) {
+			/* Process as if "in body" */
+			process_tag_in_body(treebuilder, token);
+		} else if (type == OPTION) {
+			if (current_node(treebuilder) == OPTION) {
+				if (!element_stack_pop(treebuilder, &otype,
+						&node)) {
+					/** \todo errors */
+				}
+			}
+
+			insert_element(treebuilder, &token->data.tag);
+		} else if (type == OPTGROUP) {
+			if (current_node(treebuilder) == OPTION) {
+				if (!element_stack_pop(treebuilder, &otype,
+						&node)) {
+					/** \todo errors */
+				}
+			}
+
+			if (current_node(treebuilder) == OPTGROUP) {
+				if (!element_stack_pop(treebuilder, &otype,
+						&node)) {
+					/** \todo errors */
+				}
+			}
+
+			insert_element(treebuilder, &token->data.tag);
+		} else if (type == SELECT || type == INPUT ||
+				type == TEXTAREA) {
+
+			if (element_in_scope(treebuilder, SELECT, true)) {
+				element_stack_pop_until(treebuilder, SELECT);
+				reset_insertion_mode(treebuilder);
+			} else {
+				/* fragment case */
+				/** \todo parse error */
+			}
+
+			if (type != SELECT) reprocess = true;
+		} else {
+			/** \todo parse error */
+		}
+	}
+		break;
+	case HUBBUB_TOKEN_END_TAG:
+	{
+		element_type type = element_type_from_name(treebuilder,
+				&token->data.tag.name);
+
+		if (type == OPTGROUP) {
+			if (current_node(treebuilder) == OPTION &&
+					prev_node(treebuilder) == OPTGROUP) {
+				if (!element_stack_pop(treebuilder, &otype,
+						&node)) {
+					/** \todo errors */
+				}
+			}
+
+			if (current_node(treebuilder) == OPTGROUP) {
+				if (!element_stack_pop(treebuilder, &otype,
+						&node)) {
+					/** \todo errors */
+				}
+			} else {
+				/** \todo parse error */
+			}
+		} else if (type == OPTION) {
+			if (current_node(treebuilder) == OPTION) {
+				if (!element_stack_pop(treebuilder, &otype,
+						&node)) {
+					/** \todo errors */
+				}
+			} else {
+				/** \todo parse error */
+			}
+		} else if (type == SELECT) {
+			if (element_in_scope(treebuilder, SELECT, true)) {
+				element_stack_pop_until(treebuilder, SELECT);
+				reset_insertion_mode(treebuilder);
+			} else {
+				/* fragment case */
+				/** \todo parse error */
+			}
+		}
+	}
+		break;
+	case HUBBUB_TOKEN_EOF:
+		break;
+	}
+
+	return reprocess;
+}
+
diff --git a/src/treebuilder/internal.h b/src/treebuilder/internal.h
index 184dd61..7d3d672 100644
--- a/src/treebuilder/internal.h
+++ b/src/treebuilder/internal.h
@@ -141,7 +141,10 @@ bool element_stack_push(hubbub_treebuilder *treebuilder,
 		element_type type, void *node);
 bool element_stack_pop(hubbub_treebuilder *treebuilder,
 		element_type *type, void **node);
+bool element_stack_pop_until(hubbub_treebuilder *treebuilder,
+		element_type type);
 element_type current_node(hubbub_treebuilder *treebuilder);
+element_type prev_node(hubbub_treebuilder *treebuilder);
 
 bool formatting_list_append(hubbub_treebuilder *treebuilder,
 		element_type type, void *node, uint32_t stack_index);
diff --git a/src/treebuilder/modes.h b/src/treebuilder/modes.h
index 4af9036..4d53b56 100644
--- a/src/treebuilder/modes.h
+++ b/src/treebuilder/modes.h
@@ -63,6 +63,8 @@ bool handle_in_row(hubbub_treebuilder *treebuilder,
 		const hubbub_token *token);
 bool handle_in_cell(hubbub_treebuilder *treebuilder,
 		const hubbub_token *token);
+bool handle_in_select(hubbub_treebuilder *treebuilder,
+		const hubbub_token *token);
 bool handle_generic_rcdata(hubbub_treebuilder *treebuilder,
 		const hubbub_token *token);
 bool handle_script_collect_characters(hubbub_treebuilder *treebuilder,
diff --git a/src/treebuilder/treebuilder.c b/src/treebuilder/treebuilder.c
index e29ecab..35768fc 100644
--- a/src/treebuilder/treebuilder.c
+++ b/src/treebuilder/treebuilder.c
@@ -1101,6 +1101,27 @@ bool element_stack_pop(hubbub_treebuilder *treebuilder,
 }
 
 /**
+ * Pop elements until an element of type "element" has been popped.
+ *
+ * \return True on success, false on memory exhaustion.
+ */
+bool element_stack_pop_until(hubbub_treebuilder *treebuilder,
+		element_type type)
+{
+	element_type otype = UNKNOWN;
+	void *node;
+
+	while (otype != type) {
+		if (!element_stack_pop(treebuilder, &otype, &node)) {
+			/** \todo error -- never happens */
+			return false;
+		}
+	}
+
+	return true;
+}
+
+/**
  * Peek at the top element of the element stack.
  *
  * \param treebuilder  Treebuilder instance
@@ -1112,6 +1133,21 @@ element_type current_node(hubbub_treebuilder *treebuilder)
 			[treebuilder->context.current_node].type;
 }
 
+/**
+ * Peek at the element below the top of the element stack.
+ *
+ * \param treebuilder  Treebuilder instance
+ * \return Element type of the element one below the top of the stack
+ */
+element_type prev_node(hubbub_treebuilder *treebuilder)
+{
+	if (treebuilder->context.current_node == 0)
+		return UNKNOWN;
+
+	return treebuilder->context.element_stack
+			[treebuilder->context.current_node - 1].type;
+}
+
 
 
 /**