summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Sidwell <andy@entai.co.uk>2008-08-13 12:14:27 +0000
committerAndrew Sidwell <andy@entai.co.uk>2008-08-13 12:14:27 +0000
commitb61c223b23b1cede7fe5fb16262a1ff0906dda3c (patch)
treed695197d0949cbacd9ffc5b49d648c4c8981cfa4
parent1e55c5ba81e9a8883c41d0e991d245c5397c44b9 (diff)
downloadlibhubbub-b61c223b23b1cede7fe5fb16262a1ff0906dda3c.tar.gz
libhubbub-b61c223b23b1cede7fe5fb16262a1ff0906dda3c.tar.bz2
Fix script collection now that pointers can change between calls.
svn path=/trunk/hubbub/; revision=5082
-rw-r--r--src/treebuilder/script_collect.c64
1 files changed, 30 insertions, 34 deletions
diff --git a/src/treebuilder/script_collect.c b/src/treebuilder/script_collect.c
index eb6f67b..248001f 100644
--- a/src/treebuilder/script_collect.c
+++ b/src/treebuilder/script_collect.c
@@ -29,12 +29,36 @@ hubbub_error handle_script_collect_characters(hubbub_treebuilder *treebuilder,
switch (token->type) {
case HUBBUB_TOKEN_CHARACTER:
- if (treebuilder->context.collect.string.len == 0) {
- treebuilder->context.collect.string.ptr =
- token->data.character.ptr;
+ {
+ int success;
+ void *text, *appended;
+
+ success = treebuilder->tree_handler->create_text(
+ treebuilder->tree_handler->ctx,
+ &token->data.character,
+ &text);
+ if (success != 0) {
+ /** \todo errors */
}
- treebuilder->context.collect.string.len +=
- token->data.character.len;
+
+ /** \todo fragment case -- skip this lot entirely */
+
+ success = treebuilder->tree_handler->append_child(
+ treebuilder->tree_handler->ctx,
+ treebuilder->context.collect.node,
+ text, &appended);
+ if (success != 0) {
+ /** \todo errors */
+ treebuilder->tree_handler->unref_node(
+ treebuilder->tree_handler->ctx,
+ text);
+ }
+
+ treebuilder->tree_handler->unref_node(
+ treebuilder->tree_handler->ctx, appended);
+ treebuilder->tree_handler->unref_node(
+ treebuilder->tree_handler->ctx, text);
+ }
break;
case HUBBUB_TOKEN_END_TAG:
{
@@ -62,35 +86,7 @@ hubbub_error handle_script_collect_characters(hubbub_treebuilder *treebuilder,
if (done) {
int success;
- void *text, *appended;
-
- if (treebuilder->context.collect.string.len) {
- success = treebuilder->tree_handler->create_text(
- treebuilder->tree_handler->ctx,
- &treebuilder->context.collect.string,
- &text);
- if (success != 0) {
- /** \todo errors */
- }
-
- /** \todo fragment case -- skip this lot entirely */
-
- success = treebuilder->tree_handler->append_child(
- treebuilder->tree_handler->ctx,
- treebuilder->context.collect.node,
- text, &appended);
- if (success != 0) {
- /** \todo errors */
- treebuilder->tree_handler->unref_node(
- treebuilder->tree_handler->ctx,
- text);
- }
-
- treebuilder->tree_handler->unref_node(
- treebuilder->tree_handler->ctx, appended);
- treebuilder->tree_handler->unref_node(
- treebuilder->tree_handler->ctx, text);
- }
+ void *appended;
/** \todo insertion point manipulation */