summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Sidwell <andy@entai.co.uk>2008-07-03 12:47:49 +0000
committerAndrew Sidwell <andy@entai.co.uk>2008-07-03 12:47:49 +0000
commit95a5f32cd305571579109fea002b47701e76f82e (patch)
tree7284cee7649918b97febc45516a86af68ffb1af7 /src
parent6017454967bfa76f12f986bc1374c6239db04017 (diff)
downloadlibhubbub-95a5f32cd305571579109fea002b47701e76f82e.tar.gz
libhubbub-95a5f32cd305571579109fea002b47701e76f82e.tar.bz2
Implement the "in table" insertion mode, at least partially. (The adoption agency algorithm hasn't been tweaked to respect in_table_foster.)
svn path=/trunk/hubbub/; revision=4500
Diffstat (limited to 'src')
-rw-r--r--src/treebuilder/Makefile2
-rw-r--r--src/treebuilder/in_table.c193
-rw-r--r--src/treebuilder/internal.h19
-rw-r--r--src/treebuilder/modes.h2
4 files changed, 211 insertions, 5 deletions
diff --git a/src/treebuilder/Makefile b/src/treebuilder/Makefile
index eba67c2..8c50b8e 100644
--- a/src/treebuilder/Makefile
+++ b/src/treebuilder/Makefile
@@ -34,7 +34,7 @@ d := $(DIR)
# Sources
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_head_noscript.c after_head.c in_body.c in_table.c \
in_caption.c in_column_group.c in_table_body.c in_row.c \
in_cell.c in_select.c in_select_in_table.c \
in_foreign_content.c after_body.c in_frameset.c \
diff --git a/src/treebuilder/in_table.c b/src/treebuilder/in_table.c
new file mode 100644
index 0000000..a648585
--- /dev/null
+++ b/src/treebuilder/in_table.c
@@ -0,0 +1,193 @@
+/*
+ * This file is part of Hubbub.
+ * Licensed under the MIT License,
+ * http://www.opensource.org/licenses/mit-license.php
+ * Copyright 2008 Andrew Sidwell <takkaria@netsurf-browser.org>
+ */
+
+#include <assert.h>
+#include <string.h>
+
+#include "treebuilder/modes.h"
+#include "treebuilder/internal.h"
+#include "treebuilder/treebuilder.h"
+#include "utils/utils.h"
+#include "utils/string.h"
+
+
+/**
+ * Clear the stack back to a table context: "the UA must, while the current
+ * node is not a table element or an html element, pop elements from the stack
+ * of open elements."
+ */
+static inline void clear_stack_table_context(hubbub_treebuilder *treebuilder)
+{
+ hubbub_ns ns;
+ element_type type = UNKNOWN;
+ void *node;
+
+ while (type != TABLE && type != HTML) {
+ element_stack_pop(treebuilder, &ns, &type, &node);
+ }
+
+ return;
+}
+
+
+/**
+ * Process an <input> tag in the "in table" insertion mode.
+ */
+static inline bool process_input_in_table(hubbub_treebuilder *treebuilder,
+ const hubbub_token *token)
+{
+ for (size_t i = 0; i < token->data.tag.n_attributes; i++) {
+ hubbub_attribute *attr = &token->data.tag.attributes[i];
+
+ if (!hubbub_string_match(treebuilder->input_buffer +
+ attr->name.data.off,
+ attr->name.len, (uint8_t *) "hidden",
+ SLEN("hidden"))) {
+ continue;
+ }
+
+ /** \todo parse error */
+ insert_element(treebuilder, &token->data.tag);
+
+ if (treebuilder->context.form_element != NULL) {
+ treebuilder->tree_handler->form_associate(
+ treebuilder->tree_handler->ctx,
+ treebuilder->context.form_element,
+ treebuilder->context.element_stack[
+ treebuilder->context.current_node].node);
+ }
+
+ return true;
+ }
+
+ return false;
+}
+
+
+/**
+ * Handle token in "in table" insertion mode
+ *
+ * \param treebuilder The treebuilder instance
+ * \param token The token to handle
+ * \return True to reprocess token, false otherwise
+ */
+bool handle_in_table(hubbub_treebuilder *treebuilder,
+ const hubbub_token *token)
+{
+ bool reprocess = false;
+ bool handled = true;
+
+ switch (token->type) {
+ case HUBBUB_TOKEN_CHARACTER:
+ treebuilder->context.element_stack[
+ treebuilder->context.current_table
+ ].tainted = true;
+
+ reprocess = process_characters_expect_whitespace(treebuilder,
+ token, true);
+ 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);
+ bool tainted = treebuilder->context.element_stack[
+ treebuilder->context.current_table
+ ].tainted;
+
+ if (type == CAPTION) {
+ clear_stack_table_context(treebuilder);
+ formatting_list_append(treebuilder, type,
+ treebuilder->context.element_stack[
+ treebuilder->context.current_node].node,
+ treebuilder->context.current_node);
+
+ insert_element(treebuilder, &token->data.tag);
+ treebuilder->context.mode = IN_CAPTION;
+ } else if (type == COLGROUP || type == COL) {
+ clear_stack_table_context(treebuilder);
+ insert_element(treebuilder, &token->data.tag);
+ treebuilder->context.mode = IN_COLUMN_GROUP;
+
+ if (type == COL) {
+ reprocess = true;
+ }
+ } else if (type == TBODY || type == TFOOT || type == THEAD ||
+ type == TD || type == TH || type == TR) {
+ clear_stack_table_context(treebuilder);
+ insert_element(treebuilder, &token->data.tag);
+ treebuilder->context.mode = IN_TABLE_BODY;
+
+ if (type == TD || type == TH || type == TR) {
+ reprocess = true;
+ }
+ } else if (type == TABLE) {
+ /** \todo parse error */
+
+ /* This should match "</table>" handling */
+ element_stack_pop_until(treebuilder, TABLE);
+ reset_insertion_mode(treebuilder);
+
+ reprocess = true;
+ } else if (!tainted && (type == STYLE || type == SCRIPT)) {
+ process_in_head(treebuilder, token);
+ } else if (!tainted && type == INPUT) {
+ handled = process_input_in_table(treebuilder, token);
+ } else {
+ handled = false;
+ }
+ }
+ break;
+ case HUBBUB_TOKEN_END_TAG:
+ {
+ element_type type = element_type_from_name(treebuilder,
+ &token->data.tag.name);
+
+ if (type == TABLE) {
+ /** \todo fragment case */
+
+ element_stack_pop_until(treebuilder, TABLE);
+ reset_insertion_mode(treebuilder);
+ } else if (type == BODY || type == CAPTION || type == COL ||
+ type == COLGROUP || type == HTML ||
+ type == TBODY || type == TD || type == TFOOT ||
+ type == TH || type == THEAD || type == TR) {
+ /** \todo parse error */
+ } else {
+ handled = false;
+ }
+ }
+ break;
+ case HUBBUB_TOKEN_EOF:
+ break;
+ }
+
+ if (!handled) {
+ element_type cur_node = current_node(treebuilder);
+
+ if (cur_node == TABLE || cur_node == TBODY ||
+ cur_node == TFOOT || cur_node == THEAD ||
+ cur_node == TR) {
+ treebuilder->context.in_table_foster = true;
+ }
+
+ /** \todo parse error */
+ process_tag_in_body(treebuilder, token);
+
+ treebuilder->context.in_table_foster = false;
+ }
+
+
+ return reprocess;
+}
diff --git a/src/treebuilder/internal.h b/src/treebuilder/internal.h
index f9fd09e..c1ebe71 100644
--- a/src/treebuilder/internal.h
+++ b/src/treebuilder/internal.h
@@ -35,9 +35,16 @@ typedef enum
typedef struct element_context
{
- hubbub_ns ns;
- element_type type;
- void *node;
+ hubbub_ns ns; /**< Element namespace */
+ element_type type; /**< Element type */
+
+ bool tainted; /**< Only for tables. "Once the
+ * current table has been tainted,
+ * whitespace characters are inserted
+ * into the foster parent element
+ * instead of the current node." */
+
+ void *node; /**< Node pointer */
} element_context;
typedef struct formatting_list_entry
@@ -80,9 +87,13 @@ typedef struct hubbub_treebuilder_context
hubbub_string string; /**< Text data */
} collect; /**< Context for character collecting */
- bool strip_leading_lr; /**< Whether to strip a LR from the
+ bool strip_leading_lr; /**< Whether to strip a LR from the
* start of the next character sequence
* received */
+
+ bool in_table_foster; /**< Whether nodes that would be
+ * inserted into the current node should
+ * be foster parented */
} hubbub_treebuilder_context;
struct hubbub_treebuilder
diff --git a/src/treebuilder/modes.h b/src/treebuilder/modes.h
index 23e861e..ada817b 100644
--- a/src/treebuilder/modes.h
+++ b/src/treebuilder/modes.h
@@ -55,6 +55,8 @@ bool handle_after_head(hubbub_treebuilder *treebuilder,
const hubbub_token *token);
bool handle_in_body(hubbub_treebuilder *treebuilder,
const hubbub_token *token);
+bool handle_in_table(hubbub_treebuilder *treebuilder,
+ const hubbub_token *token);
bool handle_in_caption(hubbub_treebuilder *treebuilder,
const hubbub_token *token);
bool handle_in_column_group(hubbub_treebuilder *treebuilder,