Author: jmb Date: Thu Jul 31 09:43:32 2008 New Revision: 4839 URL: http://source.netsurf-browser.org?rev=4839&view=rev Log: 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) ........ Added: trunk/hubbub/docs/Macros - copied unchanged from r4837, branches/takkaria/hubbub-parserutils/docs/Macros trunk/hubbub/test/data/csdetect/regression.dat - copied unchanged from r4837, branches/takkaria/hubbub-parserutils/test/data/csdetect/regression.dat trunk/hubbub/test/data/tree-construction/regression.dat - copied unchanged from r4837, branches/takkaria/hubbub-parserutils/test/data/tree-construction/regression.dat Removed: trunk/hubbub/src/charset/aliases.c trunk/hubbub/src/charset/aliases.h trunk/hubbub/src/charset/codec.c trunk/hubbub/src/charset/codec.h trunk/hubbub/src/charset/codec_iconv.c trunk/hubbub/src/charset/codec_impl.h trunk/hubbub/src/charset/codec_utf16.c trunk/hubbub/src/charset/codec_utf8.c trunk/hubbub/src/input/ trunk/hubbub/src/utils/utf16.c trunk/hubbub/src/utils/utf16.h trunk/hubbub/src/utils/utf8.c trunk/hubbub/src/utils/utf8.h trunk/hubbub/test/aliases.c trunk/hubbub/test/cscodec.c trunk/hubbub/test/data/cscodec/ trunk/hubbub/test/filter.c trunk/hubbub/test/inputstream.c trunk/hubbub/test/parser-utf16.c trunk/hubbub/test/regression/cscodec-segv.c trunk/hubbub/test/regression/filter-segv.c trunk/hubbub/test/regression/stream-nomem.c Modified: trunk/hubbub/ (props changed) trunk/hubbub/include/hubbub/functypes.h trunk/hubbub/include/hubbub/parser.h trunk/hubbub/include/hubbub/types.h trunk/hubbub/src/Makefile trunk/hubbub/src/charset/Makefile trunk/hubbub/src/charset/detect.c trunk/hubbub/src/charset/detect.h trunk/hubbub/src/hubbub.c trunk/hubbub/src/parser.c trunk/hubbub/src/tokeniser/tokeniser.c trunk/hubbub/src/tokeniser/tokeniser.h trunk/hubbub/src/treebuilder/after_body.c trunk/hubbub/src/treebuilder/after_head.c trunk/hubbub/src/treebuilder/before_head.c trunk/hubbub/src/treebuilder/before_html.c trunk/hubbub/src/treebuilder/generic_rcdata.c trunk/hubbub/src/treebuilder/in_body.c trunk/hubbub/src/treebuilder/in_foreign_content.c trunk/hubbub/src/treebuilder/in_head.c trunk/hubbub/src/treebuilder/in_row.c trunk/hubbub/src/treebuilder/in_table.c trunk/hubbub/src/treebuilder/in_table_body.c trunk/hubbub/src/treebuilder/initial.c trunk/hubbub/src/treebuilder/internal.h trunk/hubbub/src/treebuilder/script_collect.c trunk/hubbub/src/treebuilder/treebuilder.c trunk/hubbub/src/treebuilder/treebuilder.h trunk/hubbub/src/utils/Makefile trunk/hubbub/test/INDEX trunk/hubbub/test/Makefile trunk/hubbub/test/csdetect.c trunk/hubbub/test/data/csdetect/INDEX trunk/hubbub/test/data/tree-construction/INDEX trunk/hubbub/test/parser.c trunk/hubbub/test/tokeniser.c trunk/hubbub/test/tokeniser2.c trunk/hubbub/test/tokeniser3.c trunk/hubbub/test/tree.c trunk/hubbub/test/tree2.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/hubbub/include/hubbub/functypes.h URL: http://source.netsurf-browser.org/trunk/hubbub/include/hubbub/functypes.h... Modified: trunk/hubbub/include/hubbub/parser.h URL: http://source.netsurf-browser.org/trunk/hubbub/include/hubbub/parser.h?re... Modified: trunk/hubbub/include/hubbub/types.h URL: http://source.netsurf-browser.org/trunk/hubbub/include/hubbub/types.h?rev... Modified: trunk/hubbub/src/Makefile URL: http://source.netsurf-browser.org/trunk/hubbub/src/Makefile?rev=4839&... Modified: trunk/hubbub/src/charset/Makefile URL: http://source.netsurf-browser.org/trunk/hubbub/src/charset/Makefile?rev=4... Removed: trunk/hubbub/src/charset/aliases.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/charset/aliases.c?rev=... Removed: trunk/hubbub/src/charset/aliases.h URL: http://source.netsurf-browser.org/trunk/hubbub/src/charset/aliases.h?rev=... Removed: trunk/hubbub/src/charset/codec.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/charset/codec.c?rev=48... Removed: trunk/hubbub/src/charset/codec.h URL: http://source.netsurf-browser.org/trunk/hubbub/src/charset/codec.h?rev=48... Removed: trunk/hubbub/src/charset/codec_iconv.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/charset/codec_iconv.c?... Removed: trunk/hubbub/src/charset/codec_impl.h URL: http://source.netsurf-browser.org/trunk/hubbub/src/charset/codec_impl.h?r... Removed: trunk/hubbub/src/charset/codec_utf16.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/charset/codec_utf16.c?... Removed: trunk/hubbub/src/charset/codec_utf8.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/charset/codec_utf8.c?r... Modified: trunk/hubbub/src/charset/detect.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/charset/detect.c?rev=4... Modified: trunk/hubbub/src/charset/detect.h URL: http://source.netsurf-browser.org/trunk/hubbub/src/charset/detect.h?rev=4... Modified: trunk/hubbub/src/hubbub.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/hubbub.c?rev=4839&... Modified: trunk/hubbub/src/parser.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/parser.c?rev=4839&... Modified: trunk/hubbub/src/tokeniser/tokeniser.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/tokeniser/tokeniser.c?... Modified: trunk/hubbub/src/tokeniser/tokeniser.h URL: http://source.netsurf-browser.org/trunk/hubbub/src/tokeniser/tokeniser.h?... Modified: trunk/hubbub/src/treebuilder/after_body.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/after_body... Modified: trunk/hubbub/src/treebuilder/after_head.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/after_head... Modified: trunk/hubbub/src/treebuilder/before_head.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/before_hea... Modified: trunk/hubbub/src/treebuilder/before_html.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/before_htm... Modified: trunk/hubbub/src/treebuilder/generic_rcdata.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/generic_rc... Modified: trunk/hubbub/src/treebuilder/in_body.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_body.c?... Modified: trunk/hubbub/src/treebuilder/in_foreign_content.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_foreign... Modified: trunk/hubbub/src/treebuilder/in_head.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_head.c?... Modified: trunk/hubbub/src/treebuilder/in_row.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_row.c?r... Modified: trunk/hubbub/src/treebuilder/in_table.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_table.c... Modified: trunk/hubbub/src/treebuilder/in_table_body.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_table_b... Modified: trunk/hubbub/src/treebuilder/initial.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/initial.c?... Modified: trunk/hubbub/src/treebuilder/internal.h URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/internal.h... Modified: trunk/hubbub/src/treebuilder/script_collect.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/script_col... Modified: trunk/hubbub/src/treebuilder/treebuilder.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/treebuilde... Modified: trunk/hubbub/src/treebuilder/treebuilder.h URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/treebuilde... Modified: trunk/hubbub/src/utils/Makefile URL: http://source.netsurf-browser.org/trunk/hubbub/src/utils/Makefile?rev=483... Removed: trunk/hubbub/src/utils/utf16.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/utils/utf16.c?rev=4838... Removed: trunk/hubbub/src/utils/utf16.h URL: http://source.netsurf-browser.org/trunk/hubbub/src/utils/utf16.h?rev=4838... Removed: trunk/hubbub/src/utils/utf8.c URL: http://source.netsurf-browser.org/trunk/hubbub/src/utils/utf8.c?rev=4838&... Removed: trunk/hubbub/src/utils/utf8.h URL: http://source.netsurf-browser.org/trunk/hubbub/src/utils/utf8.h?rev=4838&... Modified: trunk/hubbub/test/INDEX URL: http://source.netsurf-browser.org/trunk/hubbub/test/INDEX?rev=4839&r1... Modified: trunk/hubbub/test/Makefile URL: http://source.netsurf-browser.org/trunk/hubbub/test/Makefile?rev=4839&... Removed: trunk/hubbub/test/aliases.c URL: http://source.netsurf-browser.org/trunk/hubbub/test/aliases.c?rev=4838&am... Removed: trunk/hubbub/test/cscodec.c URL: http://source.netsurf-browser.org/trunk/hubbub/test/cscodec.c?rev=4838&am... Modified: trunk/hubbub/test/csdetect.c URL: http://source.netsurf-browser.org/trunk/hubbub/test/csdetect.c?rev=4839&a... Modified: trunk/hubbub/test/data/csdetect/INDEX URL: http://source.netsurf-browser.org/trunk/hubbub/test/data/csdetect/INDEX?r... Modified: trunk/hubbub/test/data/tree-construction/INDEX URL: http://source.netsurf-browser.org/trunk/hubbub/test/data/tree-constructio... Removed: trunk/hubbub/test/filter.c URL: http://source.netsurf-browser.org/trunk/hubbub/test/filter.c?rev=4838&... Removed: trunk/hubbub/test/inputstream.c URL: http://source.netsurf-browser.org/trunk/hubbub/test/inputstream.c?rev=483... Removed: trunk/hubbub/test/parser-utf16.c URL: http://source.netsurf-browser.org/trunk/hubbub/test/parser-utf16.c?rev=48... Modified: trunk/hubbub/test/parser.c URL: http://source.netsurf-browser.org/trunk/hubbub/test/parser.c?rev=4839&... Removed: trunk/hubbub/test/regression/cscodec-segv.c URL: http://source.netsurf-browser.org/trunk/hubbub/test/regression/cscodec-se... Removed: trunk/hubbub/test/regression/filter-segv.c URL: http://source.netsurf-browser.org/trunk/hubbub/test/regression/filter-seg... Removed: trunk/hubbub/test/regression/stream-nomem.c URL: http://source.netsurf-browser.org/trunk/hubbub/test/regression/stream-nom... Modified: trunk/hubbub/test/tokeniser.c URL: http://source.netsurf-browser.org/trunk/hubbub/test/tokeniser.c?rev=4839&... Modified: trunk/hubbub/test/tokeniser2.c URL: http://source.netsurf-browser.org/trunk/hubbub/test/tokeniser2.c?rev=4839... Modified: trunk/hubbub/test/tokeniser3.c URL: http://source.netsurf-browser.org/trunk/hubbub/test/tokeniser3.c?rev=4839... Modified: trunk/hubbub/test/tree.c URL: http://source.netsurf-browser.org/trunk/hubbub/test/tree.c?rev=4839&r... Modified: trunk/hubbub/test/tree2.c URL: http://source.netsurf-browser.org/trunk/hubbub/test/tree2.c?rev=4839&...