Merged revisions 4631-4838 via svnmerge from

svn://source.netsurf-browser.org/branches/takkaria/hubbub-parserutils

........
  r4631 | takkaria | 2008-07-13 12:54:30 +0100 (Sun, 13 Jul 2008) | 2 lines
  
  Initial hatchet job moving to libparserutils (search and replace and a bit of cleaning up).  This doesn't compile.
........
  r4632 | takkaria | 2008-07-13 15:28:52 +0100 (Sun, 13 Jul 2008) | 2 lines
  
  libparserutilize everything up to the "before attribute name" state.  (Not compiling)
........
  r4633 | takkaria | 2008-07-13 15:32:14 +0100 (Sun, 13 Jul 2008) | 2 lines
  
  Replace all uses of "current_{comment|chars}" with just "chars".
........
  r4634 | takkaria | 2008-07-13 16:12:06 +0100 (Sun, 13 Jul 2008) | 2 lines
  
  Fix lots of compile errors, lpuise "before attribute name" state.
........
  r4636 | takkaria | 2008-07-13 17:23:17 +0100 (Sun, 13 Jul 2008) | 2 lines
  
  Finish lpuising the tag states, apart from character references.
........
  r4637 | takkaria | 2008-07-13 19:58:52 +0100 (Sun, 13 Jul 2008) | 2 lines
  
  lpuise the comment states.
........
  r4638 | takkaria | 2008-07-13 20:04:31 +0100 (Sun, 13 Jul 2008) | 2 lines
  
  Switch to setting hubbub_string::len to 0 instead of hubbub_string::ptr to NULL to indicate an empty buffer, as it was previously.
........
  r4639 | takkaria | 2008-07-13 21:02:11 +0100 (Sun, 13 Jul 2008) | 2 lines
  
  "lpu up" about half of the DOCTYPE handling stages.
........
  r4640 | takkaria | 2008-07-13 21:23:00 +0100 (Sun, 13 Jul 2008) | 2 lines
  
  Finish off LPUing the doctype modes.
........
  r4641 | takkaria | 2008-07-13 21:37:33 +0100 (Sun, 13 Jul 2008) | 2 lines
  
  The tokeniser uses lpu apart from the entity matcher, now.
........
  r4643 | takkaria | 2008-07-14 01:20:36 +0100 (Mon, 14 Jul 2008) | 2 lines
  
  Fix up the character reference matching stuff--still not properly dealt with, but compiles futher.
........
  r4644 | takkaria | 2008-07-14 01:24:49 +0100 (Mon, 14 Jul 2008) | 2 lines
  
  Get the tokeniser compiling in its LPU'd form.
........
  r4645 | takkaria | 2008-07-14 01:26:34 +0100 (Mon, 14 Jul 2008) | 2 lines
  
  Remember to advance the stream position after emitting tokens.
........
  r4646 | takkaria | 2008-07-14 01:34:36 +0100 (Mon, 14 Jul 2008) | 2 lines
  
  Nuke the src/input directory and start work on the treebuilder.
........
  r4647 | takkaria | 2008-07-14 01:56:27 +0100 (Mon, 14 Jul 2008) | 2 lines
  
  Get hubbub building in its LPU'd form.
........
  r4648 | takkaria | 2008-07-14 02:41:03 +0100 (Mon, 14 Jul 2008) | 2 lines
  
  Get the tokeniser2 testrunner working.
........
  r4649 | takkaria | 2008-07-14 02:48:55 +0100 (Mon, 14 Jul 2008) | 2 lines
  
  Fix test LDFLAGS so things link properly.
........
  r4650 | takkaria | 2008-07-14 16:25:51 +0100 (Mon, 14 Jul 2008) | 2 lines
  
  Get testcases compiling, remove ones now covered by libparserutils.
........
  r4651 | takkaria | 2008-07-14 16:37:09 +0100 (Mon, 14 Jul 2008) | 2 lines
  
  Remove more tests covered by libpu.
........
  r4652 | takkaria | 2008-07-14 17:53:18 +0100 (Mon, 14 Jul 2008) | 2 lines
  
  Fix up the tokeniser a bit.
........
  r4653 | takkaria | 2008-07-14 19:02:15 +0100 (Mon, 14 Jul 2008) | 3 lines
  
   - Remove the buffer_handler stuff from hubbub
   - Add the basics of a buffer for attribute values and text.
........
  r4654 | takkaria | 2008-07-14 20:00:45 +0100 (Mon, 14 Jul 2008) | 2 lines
  
  Get character references working in attribute values, start trying to make them work in character tokens.
........
  r4656 | takkaria | 2008-07-14 23:28:52 +0100 (Mon, 14 Jul 2008) | 2 lines
  
  Get entities working a bit better.
........
  r4657 | takkaria | 2008-07-14 23:37:16 +0100 (Mon, 14 Jul 2008) | 2 lines
  
  Get entities working properly.  (!)
........
  r4658 | takkaria | 2008-07-14 23:56:10 +0100 (Mon, 14 Jul 2008) | 2 lines
  
  Make doctypes work a bit better.
........
  r4659 | takkaria | 2008-07-15 00:18:49 +0100 (Tue, 15 Jul 2008) | 2 lines
  
  Get DOCTYPEs working.
........
  r4660 | takkaria | 2008-07-15 00:26:36 +0100 (Tue, 15 Jul 2008) | 2 lines
  
  Fix CDATA sections.
........
  r4661 | takkaria | 2008-07-15 01:01:16 +0100 (Tue, 15 Jul 2008) | 2 lines
  
  Get comments working again.
........
  r4662 | takkaria | 2008-07-15 01:14:19 +0100 (Tue, 15 Jul 2008) | 2 lines
  
  Fix EOF in "after attribute name" state.
........
  r4664 | takkaria | 2008-07-15 01:30:27 +0100 (Tue, 15 Jul 2008) | 2 lines
  
  Put the tests in better order, remove one now superceded with libpu.
........
  r4665 | takkaria | 2008-07-15 01:46:29 +0100 (Tue, 15 Jul 2008) | 2 lines
  
  Remove a lot of now-redunant clearings of the current stream offset.
........
  r4667 | jmb | 2008-07-15 11:56:54 +0100 (Tue, 15 Jul 2008) | 2 lines
  
  Completely purge charset stuff from hubbub. Parserutils handles this now.
........
  r4677 | takkaria | 2008-07-15 21:03:42 +0100 (Tue, 15 Jul 2008) | 2 lines
  
  Get more tests passing, handle NUL bytes in data state.
........
  r4694 | takkaria | 2008-07-18 17:55:44 +0100 (Fri, 18 Jul 2008) | 3 lines
  
   - Handle CRs correctly in some token states.
   - Handle NULs correctly in the CDATA state.
........
  r4706 | takkaria | 2008-07-19 14:58:48 +0100 (Sat, 19 Jul 2008) | 2 lines
  
  Improve the tokeniser2 output a bit.
........
  r4721 | takkaria | 2008-07-21 20:57:29 +0100 (Mon, 21 Jul 2008) | 2 lines
  
  Get a better framework in place to allow switching to using a buffer mid-collect.  This fails a couple of testcases and doesn't implement proper CR or NUL support yet.
........
  r4725 | takkaria | 2008-07-23 17:20:07 +0100 (Wed, 23 Jul 2008) | 2 lines
  
  Make comment tokens in tokeniser2 display both expected and actual output.
........
  r4726 | takkaria | 2008-07-23 19:10:23 +0100 (Wed, 23 Jul 2008) | 4 lines
  
   - Add FINISH() macro which stops using buffered character collection.
   - Make the encoding U+FFFD in UTF-8 a global varabile, for sanity
   - Make the bogus comment state deal with NULs correctly.
........
  r4730 | takkaria | 2008-07-24 00:35:16 +0100 (Thu, 24 Jul 2008) | 2 lines
  
  Try to get NUL bytes handled as the spec says.
........
  r4731 | takkaria | 2008-07-24 00:40:59 +0100 (Thu, 24 Jul 2008) | 2 lines
  
  Get CRs working in the data state.
........
  r4732 | takkaria | 2008-07-24 00:47:45 +0100 (Thu, 24 Jul 2008) | 2 lines
  
  Set force-quirks correctly when failing to match PUBLIC or SYSTEM in DOCTYPEs.
........
  r4773 | takkaria | 2008-07-28 15:34:41 +0100 (Mon, 28 Jul 2008) | 2 lines
  
  Fix up the tokeniser, finally.
........
  r4801 | takkaria | 2008-07-29 15:59:31 +0100 (Tue, 29 Jul 2008) | 2 lines
  
  Refactor macros a bit.
........
  r4802 | takkaria | 2008-07-29 16:04:17 +0100 (Tue, 29 Jul 2008) | 2 lines
  
  Do s/HUBBUB_TOKENISER_STATE_/STATE_/, for shorter line lengths.
........
  r4805 | takkaria | 2008-07-29 16:58:37 +0100 (Tue, 29 Jul 2008) | 4 lines
  
  Start cleaning up the hubbub tokeniser;
   - refactor to use new inline emit_character_token() and emit_current_tag() functions; makes code clearer
   - check EOF before using the CHAR() macro, so eventually it can be removed.
........
  r4806 | takkaria | 2008-07-29 17:45:36 +0100 (Tue, 29 Jul 2008) | 2 lines
  
  More cleanup like the previous commit.
........
  r4807 | takkaria | 2008-07-29 19:48:44 +0100 (Tue, 29 Jul 2008) | 2 lines
  
  Rewrite comment-handling code to be just the one function, whilst updating it to handle CRs and NULs properly.  (All comments now always use the buffer.)
........
  r4820 | takkaria | 2008-07-30 14:14:49 +0100 (Wed, 30 Jul 2008) | 2 lines
  
  Finish off the first sweep of cleaning up and refactoring the tokeniser.
........
  r4821 | takkaria | 2008-07-30 15:12:22 +0100 (Wed, 30 Jul 2008) | 2 lines
  
  Add copyright statement.
........
  r4822 | takkaria | 2008-07-30 17:23:01 +0100 (Wed, 30 Jul 2008) | 2 lines
  
  Apply changes made to tokeniser2 to tokeniser3.
........
  r4829 | takkaria | 2008-07-31 01:59:07 +0100 (Thu, 31 Jul 2008) | 4 lines
  
   - Make the tokeniser save everything into the buffer, at least for now.
   - Fix logic errors introduced in refactoring
   - Avoid emitting more tokens than we have to (e.g. instead of emitting "<>" and switching back to the data state, just switch back to the data state and let it take care of it)
........
  r4830 | takkaria | 2008-07-31 02:03:08 +0100 (Thu, 31 Jul 2008) | 2 lines
  
  Small treebuilder <isindex> fix.
........
  r4831 | takkaria | 2008-07-31 02:32:29 +0100 (Thu, 31 Jul 2008) | 2 lines
  
  Stop holding on to pointers to character data across treebuilder calls.
........
  r4832 | takkaria | 2008-07-31 02:45:09 +0100 (Thu, 31 Jul 2008) | 18 lines
  
  Merge revisions 4620-4831 from trunk hubbub to libinputstream hubbub, modulo one change to test/Makefile which makes the linker choke when linking tests.
  
  	------------------------------------------------------------------------
  	r4666 | jmb | 2008-07-15 11:52:13 +0100 (Tue, 15 Jul 2008) | 3 lines
  	
  	Make tree2 perform reference counting.
  	Fix bits of the treebuilder to perform reference counting correctly in the face of *result not pointing to the same object as the node passed in to the treebuilder client callbacks.
  	------------------------------------------------------------------------
  	r4668 | jmb | 2008-07-15 12:37:30 +0100 (Tue, 15 Jul 2008) | 2 lines
  	
  	Fully document treebuilder callbacks.
  	------------------------------------------------------------------------
  	r4675 | takkaria | 2008-07-15 21:01:03 +0100 (Tue, 15 Jul 2008) | 2 lines
  	
  	Fix memory leak in tokeniser2.
  	------------------------------------------------------------------------
........
  r4834 | jmb | 2008-07-31 09:57:51 +0100 (Thu, 31 Jul 2008) | 2 lines
  
  Fix infinite loop in charset detector
........
  r4835 | jmb | 2008-07-31 13:01:24 +0100 (Thu, 31 Jul 2008) | 2 lines
  
  Actually store namespaces on formatting list. Otherwise we read uninitialised memory. Add some semblance of filling allocations with junk to myrealloc().
........
  r4836 | jmb | 2008-07-31 13:06:07 +0100 (Thu, 31 Jul 2008) | 2 lines
  
  Lose debug again
........
  r4837 | jmb | 2008-07-31 15:09:19 +0100 (Thu, 31 Jul 2008) | 2 lines
  
  Lose obsolete testdata (this is now part of lpu)
........

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

1 files changed, 0 insertions, 605 deletions

diff --git a/src/input/utf16_stream.c b/src/input/utf16_stream.c
deleted file mode 100644
index e69f124..0000000
--- a/src/input/utf16_stream.c
+++ /dev/null
@@ -1,605 +0,0 @@
-/*
- * This file is part of Hubbub.
- * Licensed under the MIT License,
- *                http://www.opensource.org/licenses/mit-license.php
- * Copyright 2007 John-Mark Bell <jmb@netsurf-browser.org>
- */
-
-#include <stdbool.h>
-#include <string.h>
-
-#include "charset/aliases.h"
-#include "charset/detect.h"
-#include "input/streamimpl.h"
-#include "utils/utf16.h"
-#include "utils/utils.h"
-
-#define BUFFER_CHUNK (4096)
-
-static bool hubbub_utf16stream_uses_encoding(const char *int_enc);
-static hubbub_inputstream *hubbub_utf16stream_create(const char *enc,
-		const char *int_enc, hubbub_alloc alloc, void *pw);
-static void hubbub_utf16stream_destroy(hubbub_inputstream *stream);
-static hubbub_error hubbub_utf16stream_append(hubbub_inputstream *stream,
-		const uint8_t *data, size_t len);
-static hubbub_error hubbub_utf16stream_insert(hubbub_inputstream *stream,
-		const uint8_t *data, size_t len);
-static uint32_t hubbub_utf16stream_peek(hubbub_inputstream *stream);
-static uint32_t hubbub_utf16stream_cur_pos(hubbub_inputstream *stream,
-		size_t *len);
-static void hubbub_utf16stream_lowercase(hubbub_inputstream *stream);
-static void hubbub_utf16stream_uppercase(hubbub_inputstream *stream);
-static void hubbub_utf16stream_advance(hubbub_inputstream *stream);
-static hubbub_error hubbub_utf16stream_push_back(hubbub_inputstream *stream,
-		uint32_t character);
-static int hubbub_utf16stream_compare_range_ci(hubbub_inputstream *stream,
-		uint32_t r1, uint32_t r2, size_t len);
-static int hubbub_utf16stream_compare_range_cs(hubbub_inputstream *stream,
-		uint32_t r1, uint32_t r2, size_t len);
-static int hubbub_utf16stream_compare_range_ascii(hubbub_inputstream *stream,
-		uint32_t off, size_t len, const char *data, size_t dlen);
-static hubbub_error hubbub_utf16stream_replace_range(
-		hubbub_inputstream *stream,
-		uint32_t start, size_t len, uint32_t ucs4);
-
-/**
- * Determine whether a stream implementation uses an internal encoding
- *
- * \param int_enc  The desired encoding
- * \return true if handled, false otherwise
- */
-bool hubbub_utf16stream_uses_encoding(const char *int_enc)
-{
-	return (hubbub_mibenum_from_name(int_enc, strlen(int_enc)) ==
-			hubbub_mibenum_from_name("UTF-16", SLEN("UTF-16")));
-}
-
-/**
- * Create an input stream
- *
- * \param enc      Document charset, or NULL if unknown
- * \param int_enc  Desired encoding of document
- * \param alloc    Memory (de)allocation function
- * \param pw       Pointer to client-specific private data (may be NULL)
- * \return Pointer to stream instance, or NULL on failure
- */
-hubbub_inputstream *hubbub_utf16stream_create(const char *enc,
-		const char *int_enc, hubbub_alloc alloc, void *pw)
-{
-	hubbub_inputstream *stream;
-
-	if (hubbub_mibenum_from_name(int_enc, strlen(int_enc)) !=
-			hubbub_mibenum_from_name("UTF-16", SLEN("UTF-16")))
-		return NULL;
-
-	stream = alloc(NULL, sizeof(hubbub_inputstream), pw);
-	if (stream == NULL)
-		return NULL;
-
-	stream->buffer = alloc(NULL, BUFFER_CHUNK, pw);
-	if (stream->buffer == NULL) {
-		alloc(stream, 0, pw);
-		return NULL;
-	}
-
-	stream->buffer_len = 0;
-	stream->buffer_alloc = BUFFER_CHUNK;
-
-	stream->cursor = 0;
-
-	stream->had_eof = false;
-
-	stream->input = hubbub_filter_create(int_enc, alloc, pw);
-	if (stream->input == NULL) {
-		alloc(stream->buffer, 0, pw);
-		alloc(stream, 0, pw);
-		return NULL;
-	}
-
-	if (enc != NULL) {
-		hubbub_error error;
-		hubbub_filter_optparams params;
-
-		stream->mibenum = hubbub_mibenum_from_name(enc, strlen(enc));
-
-		if (stream->mibenum != 0) {
-			params.encoding.name = enc;
-
-			error = hubbub_filter_setopt(stream->input,
-					HUBBUB_FILTER_SET_ENCODING, &params);
-			if (error != HUBBUB_OK && error != HUBBUB_INVALID) {
-				hubbub_filter_destroy(stream->input);
-				alloc(stream->buffer, 0, pw);
-				alloc(stream, 0, pw);
-				return NULL;
-			}
-
-			stream->encsrc = HUBBUB_CHARSET_DICTATED;
-		}
-	} else {
-		stream->mibenum = 0;
-		stream->encsrc = HUBBUB_CHARSET_UNKNOWN;
-	}
-
-	stream->destroy = hubbub_utf16stream_destroy;
-	stream->append = hubbub_utf16stream_append;
-	stream->insert = hubbub_utf16stream_insert;
-	stream->peek = hubbub_utf16stream_peek;
-	stream->cur_pos = hubbub_utf16stream_cur_pos;
-	stream->lowercase = hubbub_utf16stream_lowercase;
-	stream->uppercase = hubbub_utf16stream_uppercase;
-	stream->advance = hubbub_utf16stream_advance;
-	stream->push_back = hubbub_utf16stream_push_back;
-	stream->cmp_range_ci = hubbub_utf16stream_compare_range_ci;
-	stream->cmp_range_cs = hubbub_utf16stream_compare_range_cs;
-	stream->cmp_range_ascii = hubbub_utf16stream_compare_range_ascii;
-	stream->replace_range = hubbub_utf16stream_replace_range;
-
-	return stream;
-}
-
-/**
- * Destroy an input stream
- *
- * \param stream  Input stream to destroy
- */
-void hubbub_utf16stream_destroy(hubbub_inputstream *stream)
-{
-	if (stream->input != NULL) {
-		hubbub_filter_destroy(stream->input);
-	}
-
-	if (stream->buffer != NULL) {
-		stream->alloc(stream->buffer, 0, stream->pw);
-	}
-
-	stream->alloc(stream, 0, stream->pw);
-}
-
-/**
- * Append data to an input stream
- *
- * \param stream  Input stream to append data to
- * \param data    Data to append (in document charset), or NULL to flag EOF
- * \param len     Length, in bytes, of data
- * \return HUBBUB_OK on success, appropriate error otherwise
- */
-hubbub_error hubbub_utf16stream_append(hubbub_inputstream *stream,
-		const uint8_t *data, size_t len)
-{
-	hubbub_error error;
-	uint8_t *base;
-	size_t space;
-
-	if (data == NULL) {
-		/* EOF indicated */
-		size_t dummy_len = 0;
-		uint8_t *dummy_data = (uint8_t *) &dummy_len;
-
-		base = stream->buffer + stream->buffer_len;
-		space = stream->buffer_alloc - stream->buffer_len;
-
-		/* Forcibly flush through any remaining buffered data */
-		while ((error = hubbub_filter_process_chunk(stream->input,
-				(const uint8_t **) &dummy_data, &dummy_len,
-				&base, &space)) == HUBBUB_NOMEM) {
-			bool moved = false;
-			uint8_t *temp = stream->alloc(stream->buffer,
-					stream->buffer_alloc + BUFFER_CHUNK,
-					stream->pw);
-
-			if (temp == NULL) {
-				return HUBBUB_NOMEM;
-			}
-
-			moved = (temp != stream->buffer);
-
-			stream->buffer = temp;
-			stream->buffer_len = stream->buffer_alloc - space;
-			stream->buffer_alloc += BUFFER_CHUNK;
-
-			base = stream->buffer + stream->buffer_len;
-			space += BUFFER_CHUNK;
-
-			if (moved)
-				hubbub_inputstream_buffer_moved(stream);
-		}
-
-		/* And fix up buffer length */
-		stream->buffer_len = stream->buffer_alloc - space;
-
-		stream->had_eof = true;
-	} else {
-		/* Normal data chunk */
-
-		if (stream->mibenum == 0) {
-			/* Haven't found charset yet; detect it */
-			error = hubbub_charset_extract(&data, &len,
-					&stream->mibenum, &stream->encsrc);
-			if (error) {
-				return error;
-			}
-
-			/* We should always have a charset by now */
-			if (stream->mibenum == 0)
-				abort();
-		}
-
-		base = stream->buffer + stream->buffer_len;
-		space = stream->buffer_alloc - stream->buffer_len;
-
-		/* Convert chunk to UTF-16 */
-		while ((error = hubbub_filter_process_chunk(stream->input,
-				&data, &len,
-				&base, &space)) == HUBBUB_NOMEM) {
-			bool moved = false;
-			uint8_t *temp = stream->alloc(stream->buffer,
-					stream->buffer_alloc + BUFFER_CHUNK,
-					stream->pw);
-
-			if (temp == NULL) {
-				return HUBBUB_NOMEM;
-			}
-
-			moved = (temp != stream->buffer);
-
-			stream->buffer = temp;
-			stream->buffer_len = stream->buffer_alloc - space;
-			stream->buffer_alloc += BUFFER_CHUNK;
-
-			base = stream->buffer + stream->buffer_len;
-			space += BUFFER_CHUNK;
-
-			if (moved)
-				hubbub_inputstream_buffer_moved(stream);
-		}
-
-		/* And fix up buffer length */
-		stream->buffer_len = stream->buffer_alloc - space;
-	}
-
-	return HUBBUB_OK;
-}
-
-/**
- * Insert data into stream at current location
- *
- * \param stream  Input stream to insert into
- * \param data    Data to insert (UTF-16 encoded)
- * \param len     Length, in bytes, of data
- * \return HUBBUB_OK on success, appropriate error otherwise
- */
-hubbub_error hubbub_utf16stream_insert(hubbub_inputstream *stream,
-		const uint8_t *data, size_t len)
-{
-	size_t space;
-	uint8_t *curpos;
-
-	space = stream->buffer_alloc - stream->buffer_len;
-
-	/* Need to grow buffer, if there's insufficient space */
-	if (space <= len) {
-		bool moved = false;
-		uint8_t *temp = stream->alloc(stream->buffer,
-				stream->buffer_alloc +
-				((len + BUFFER_CHUNK - 1) & ~BUFFER_CHUNK) +
-				BUFFER_CHUNK,
-				stream->pw);
-
-		if (temp == NULL)
-			return HUBBUB_NOMEM;
-
-		moved = (temp != stream->buffer);
-
-		stream->buffer = temp;
-		stream->buffer_alloc +=
-				((len + BUFFER_CHUNK - 1) & ~BUFFER_CHUNK);
-
-		if (moved)
-			hubbub_inputstream_buffer_moved(stream);
-	}
-
-	/* Find the insertion point
-	 * (just before the next character to be read) */
-	curpos = stream->buffer + stream->cursor;
-
-	/* Move data above this point up */
-	memmove(curpos + len, curpos, stream->buffer_len - stream->cursor);
-
-	/* Copy new data into gap created by memmove */
-	memcpy(curpos, data, len);
-
-	/* Fix up buffer length */
-	stream->buffer_len += len;
-
-	return HUBBUB_OK;
-}
-
-/**
- * Look at the next character in the stream
- *
- * \param stream  Stream to look in
- * \return UCS4 (host-endian) character code, or EOF or OOD.
- */
-uint32_t hubbub_utf16stream_peek(hubbub_inputstream *stream)
-{
-	hubbub_error error;
-	size_t len;
-	uint32_t ret;
-
-	if (stream->cursor == stream->buffer_len) {
-		return stream->had_eof ? HUBBUB_INPUTSTREAM_EOF
-					: HUBBUB_INPUTSTREAM_OOD;
-	}
-
-	error = hubbub_utf16_to_ucs4(stream->buffer + stream->cursor,
-			stream->buffer_len - stream->cursor,
-			&ret, &len);
-	if (error != HUBBUB_OK && error != HUBBUB_NEEDDATA)
-		return HUBBUB_INPUTSTREAM_OOD;
-
-	if (error == HUBBUB_NEEDDATA) {
-		if (stream->had_eof)
-			return HUBBUB_INPUTSTREAM_EOF;
-		else
-			return HUBBUB_INPUTSTREAM_OOD;
-	}
-
-	return ret;
-}
-
-/**
- * Retrieve the byte index and length of the current character in the stream
- *
- * \param stream  Stream to look in
- * \param len     Pointer to location to receive byte length of character
- * \return Byte index of current character from start of stream,
- *         or (uint32_t) -1 on error
- */
-uint32_t hubbub_utf16stream_cur_pos(hubbub_inputstream *stream,
-		size_t *len)
-{
-	hubbub_utf16_char_byte_length(stream->buffer + stream->cursor, len);
-
-	return stream->cursor;
-}
-
-/**
- * Convert the current character to lower case
- *
- * \param stream  Stream to look in
- */
-void hubbub_utf16stream_lowercase(hubbub_inputstream *stream)
-{
-	uint16_t *buf = (uint16_t *)
-			((void *) (stream->buffer + stream->cursor));
-
-	if (0x0041 <= buf[0] && buf[0] <= 0x005B)
-		buf[0] += 0x0020;
-}
-
-/**
- * Convert the current character to upper case
- *
- * \param stream  Stream to look in
- */
-void hubbub_utf16stream_uppercase(hubbub_inputstream *stream)
-{
-	uint16_t *buf = (uint16_t *)
-			((void *) (stream->buffer + stream->cursor));
-
-	if (0x0061 <= buf[0] && buf[0] <= 0x007B)
-		buf[0] -= 0x0020;
-}
-
-/**
- * Advance the stream's current position
- *
- * \param stream  The stream whose position to advance
- */
-void hubbub_utf16stream_advance(hubbub_inputstream *stream)
-{
-	hubbub_error error;
-	uint32_t next;
-
-	error = hubbub_utf16_next(stream->buffer, stream->buffer_len,
-			stream->cursor, &next);
-
-	if (error == HUBBUB_OK)
-		stream->cursor = next;
-}
-
-/**
- * Push a character back onto the stream
- *
- * \param stream     Stream to push back to
- * \param character  UCS4 (host-endian) codepoint to push back
- * \return HUBBUB_OK on success, appropriate error otherwise
- *
- * Note that this doesn't actually modify the data in the stream.
- * It works by ensuring that the character located just before the
- * current stream location is the same as ::character. If it is,
- * then the stream pointer is moved back. If it is not, then an
- * error is returned and the stream pointer remains unmodified.
- */
-hubbub_error hubbub_utf16stream_push_back(hubbub_inputstream *stream,
-		uint32_t character)
-{
-	hubbub_error error;
-	uint32_t prev;
-	uint8_t buf[4];
-	size_t len;
-
-	error = hubbub_utf16_prev(stream->buffer, stream->cursor, &prev);
-	if (error != HUBBUB_OK)
-		return error;
-
-	error = hubbub_utf16_from_ucs4(character, buf, &len);
-	if (error != HUBBUB_OK)
-		return error;
-
-	if ((stream->cursor - prev) != len ||
-			memcmp(stream->buffer + prev, buf, len) != 0)
-		return HUBBUB_INVALID;
-
-	stream->cursor = prev;
-
-	return HUBBUB_OK;
-}
-
-/**
- * Case insensitively compare a pair of ranges in the input stream
- *
- * \param stream  Input stream to look in
- * \param r1      Offset of start of first range
- * \param r2      Offset of start of second range
- * \param len     Byte length of ranges
- * \return 0 if ranges match, non-zero otherwise
- */
-int hubbub_utf16stream_compare_range_ci(hubbub_inputstream *stream,
-		uint32_t r1, uint32_t r2, size_t len)
-{
-	uint8_t *range1 = (stream->buffer + r1);
-	uint8_t *range2 = (stream->buffer + r2);
-	int c1, c2;
-	uint32_t r1next, r2next;
-	hubbub_error error;
-
-	if (len == 0)
-		return 0;
-
-	do {
-		c1 = *((uint16_t *) (void *) range1);
-		c2 = *((uint16_t *) (void *) range2);
-
-		if ((0x0041 <= c1 && c1 <= 0x005B))
-			c1 |= 0x0020;
-
-		if ((0x0041 <= c2 && c2 <= 0x005B))
-			c2 |= 0x0020;
-
-		error = hubbub_utf16_next(range1, len, 0, &r1next);
-		error = hubbub_utf16_next(range2, len, 0, &r2next);
-
-		range1 += r1next;
-		range2 += r2next;
-
-		len -= r1next;
-	} while(c1 != 0 && (c1 == c2) && len > 0);
-
-	return (c1 - c2);
-}
-
-/**
- * Case sensitively compare a pair of ranges in the input stream
- *
- * \param stream  Input stream to look in
- * \param r1      Offset of start of first range
- * \param r2      Offset of start of second range
- * \param len     Byte length of ranges
- * \return 0 if ranges match, non-zero otherwise
- */
-int hubbub_utf16stream_compare_range_cs(hubbub_inputstream *stream,
-		uint32_t r1, uint32_t r2, size_t len)
-{
-	return memcmp((const char *) (stream->buffer + r1),
-			(const char *) (stream->buffer + r2), len);
-}
-
-/**
- * Case sensitively compare a range of input stream against an ASCII string
- *
- * \param stream  Input stream to look in
- * \param off     Offset of range start
- * \param len     Byte length of range
- * \param data    Comparison string
- * \param dlen    Byte length of comparison string
- * \return 0 if match, non-zero otherwise
- */
-int hubbub_utf16stream_compare_range_ascii(hubbub_inputstream *stream,
-		uint32_t off, size_t len, const char *data, size_t dlen)
-{
-	uint8_t *range = (stream->buffer + off);
-	int c1, c2;
-
-	/* Lengths don't match, so strings don't */
-	if (len != dlen * 2)
-		return 1; /* arbitrary */
-
-	do {
-		c1 = *((uint16_t *) (void *) range);
-		c2 = *data;
-
-		range += 2;
-		data++;
-
-		len -= 2;
-	} while (c1 != 0 && (c1 == c2) && len > 0);
-
-	return (c1 - c2);
-}
-
-/**
- * Replace a range of bytes in the input stream with a single character
- *
- * \param stream  Input stream containing data
- * \param start   Offset of start of range to replace
- * \param len     Length (in bytes) of range to replace
- * \param ucs4    UCS4 (host endian) encoded replacement character
- * \return HUBBUB_OK on success, appropriate error otherwise
- */
-hubbub_error hubbub_utf16stream_replace_range(hubbub_inputstream *stream,
-		uint32_t start, size_t len, uint32_t ucs4)
-{
-	uint8_t buf[4];
-	size_t replen;
-	int32_t diff;
-	hubbub_error error;
-
-	/* Get utf16 version of replacement character */
-	error = hubbub_utf16_from_ucs4(ucs4, buf, &replen);
-	if (error)
-		return error;
-
-	diff = replen - len;
-
-	if (stream->buffer_len + diff >= stream->buffer_alloc) {
-		/* Need more buffer space */
-		bool moved = false;
-		uint8_t *temp = stream->alloc(stream->buffer,
-				stream->buffer_alloc +
-				((diff + BUFFER_CHUNK - 1) & ~BUFFER_CHUNK) +
-				BUFFER_CHUNK,
-				stream->pw);
-
-		if (temp == NULL)
-			return HUBBUB_NOMEM;
-
-		moved = (temp != stream->buffer);
-
-		stream->buffer = temp;
-		stream->buffer_alloc +=
-				((diff + BUFFER_CHUNK - 1) & ~BUFFER_CHUNK);
-
-		if (moved)
-			hubbub_inputstream_buffer_moved(stream);
-	}
-
-	/* Move subsequent input to correct location */
-	memmove(stream->buffer + start + len + diff,
-			stream->buffer + start + len,
-			stream->buffer_len - (start + len));
-
-	/* And fill the gap with the replacement character */
-	memcpy(stream->buffer + start, buf, replen);
-
-	/* Finally, update length */
-	stream->buffer_len += diff;
-
-	return HUBBUB_OK;
-}
-
-hubbub_streamhandler utf16stream = {
-	hubbub_utf16stream_uses_encoding,
-	hubbub_utf16stream_create
-};