summaryrefslogtreecommitdiff
path: root/src/pugixml.cpp
AgeCommit message (Collapse)Author
2015-04-11Fix exception type for out-of-memory for XPath variablesArseny Kapoulkine
When parsing XPath variables, we need to perform a heap allocation; if it fails, an xpath_exception instead of bad_alloc used to be thrown. Now we throw the exception of a correct type so that xpath_exception means 'parsing error'.
2015-04-10Merge branch 'master' into compactArseny Kapoulkine
2015-03-20Update year to 2015Arseny Kapoulkine
2015-03-18Update version to 1.6Arseny Kapoulkine
2015-03-18Do not emit surrounding whitespace for text nodesArseny Kapoulkine
Previously we omitted extra whitespace for single PCDATA/CDATA children, but in mixed content there was extra indentation before/after text nodes. One of the problems with that is that the text that you saved is not exactly the same as the parsing result using default flags (parse_trim_pcdata helps). Another problem is that parse-format cycles do not have a fixed point for mixed content - the result expands indefinitely. Some XML libraries, like Python minidom, have the same issue, but this is definitely a problem. Pretty-printing mixed content is hard. It seems that the only other sensible choice is to switch mixed content nodes to raw formatting. In a way the code in this change is a weaker version of that - it removes indentation around text nodes but still keeps it around element siblings/children. Thus we can switch to mixed-raw formatting at some point later, which will be a superset of the current behavior. To do this we have to either switch at the first text node (.NET XmlDocument does that), or scan the children of each element for a possible text node and switch before we output the first child. The former behavior seems non-intuitive (and a bit broken); unfortunately, the latter behavior can cost up to 20% of the output time for trees *without* mixed content. Fixes #13.
2015-03-13Merge branch 'master' into compactArseny Kapoulkine
2015-03-12Fix buffer overrun when parsing comments inside DOCTYPEArseny Kapoulkine
2015-03-10Fix optimized string header encoding for compact modeArseny Kapoulkine
Since in compact mode we only ever have a guaranteed alignment on 4, the pages are limited to 256k even if pointers are 64 bit.
2015-03-10Merge branch 'master' into compactArseny Kapoulkine
2015-03-10Escape ?> sequence in PI value during printingArseny Kapoulkine
This prevents malformed PI value from breaking the document structure.
2015-03-05Use more efficient encoding for string headersArseny Kapoulkine
Since all string allocations are pointer-aligned to avoid aligning more frequent node allocations, we can rely on that in string encoding. Encoding page offset and block size in sizeof(void*) units increases the maximum memory page size from 64k to 256k on 32-bit and 512k on 64-bit platforms. Fixes #35.
2015-03-05Refactor contents=0 behaviorArseny Kapoulkine
Also change the error code to status_io_error
2015-03-05Merge branch 'master' of https://github.com/mloy/pugixml into mloy-masterArseny Kapoulkine
2015-03-04Fix string length for translate and normalize-spaceArseny Kapoulkine
The implementations generated a string with an internal null terminator; this went unnoticed since unit test string verification did not perform string equality check properly (it compared XPath string result as a C-string, thus stopping at the first null terminator). Fixes #36.
2015-02-12DOCTYPE parsing is now stacklessArseny Kapoulkine
This prevents malformed input XML with very deeply recursive DOCTYPE sections from crashing the parser. Fixes #29.
2015-01-16Merge branch 'master' into compactArseny Kapoulkine
2015-01-16Convert spaces to tabsArseny Kapoulkine
2015-01-16Add a couple of more overloads for floatsSteve Doiel
2015-01-16Fix attribute round trip for float as wellSteve Doiel
2015-01-06Add xml_text::set for floatSteve Doiel
Make float/double round-trip
2014-12-13Don't use off64_t/_wfopen on MinGW32 in C++11 modev1.5Arseny Kapoulkine
Unfortunately, standard headers on MinGW32 insist on undefining off64_t and _wfopen extensions if __STRICT_ANSI__ is true (e.g. C++11 mode). This leads to compilation errors since b7a1fec started to use _wfopen in strict mode. That change erroneously checked GCC version - however, the version itself is irrelevant; the actual criteria is whether mingw64 runtime is used. off64_t is not useful on MinGW32 since we only need it to open large files on 64-bit platforms; unfortunately, the lack of _wfopen means we won't be able to support wide-char paths on Windows for MinGW32. Fixes #24.
2014-11-27Merge branch 'master' into compactArseny Kapoulkine
2014-11-24Use _wfopen and fseeko64 on MinGW in C++11 modeArseny Kapoulkine
Since MinGW 4.5 does not define these functions if __STRICT_ANSI__ is defined (in case of _wfopen it defines it inconsistently between stdio.h and wchar.h) use the baseline functions for MinGW 4.5 and earlier. Fixes #23.
2014-11-20Add allocator reserve for copyingArseny Kapoulkine
Since copying no longer relies on child insertion we have to also reserve space in the hash table for the allocator so that pointer manipulations are guaranteed to succeed.
2014-11-20Merge branch 'master' into compactArseny Kapoulkine
2014-11-20Fix node_declaration copying with empty nameArseny Kapoulkine
node_copy_string relied on the fact that target node had an empty name and value. Normally this is a safe assumption (and a good one to make since it makes copying faster), however it was not checked and there was one case when it did not hold. Since we're reusing the logic for inserting nodes, newly inserted declaration nodes had the name set automatically to xml, which in our case violates the assumption and is counter-productive since we'll override the name right after setting it. For now the best solution is to do the same insertion manually - that results in some code duplication that we can refactor later (same logic is partially shared by _move variants anyway so on a level duplicating is not that bad).
2014-11-20Refactor node type checks for attribute insertionArseny Kapoulkine
Add allow_insert_attribute (similar to allow_insert_child).
2014-11-20Minor refactoring of tree modificationArseny Kapoulkine
Remove redundant this-> from type() call (argument used to be called type, but it's now type_). Use _root member directly when possible instead of calling internal_object.
2014-11-19XPath: Refactor eval_once to use set typeArseny Kapoulkine
This will allow us to implement nodeset_eval_last evaluation mode if necessary without relying on a fragile boolean argument.
2014-11-19XPath: Minor string operation refactoringArseny Kapoulkine
Extract end of string to rend and add comments to translate_table.
2014-11-19Make sure remove_node fully detaches the nodeArseny Kapoulkine
Right now remove_node is only used in contexts where parent is reset after removing but this might be important in the future.
2014-11-19Prevent depth underflow when printing documentsArseny Kapoulkine
Since depth is unsigned this is actually well-defined but it's better to not have the underflow anyway.
2014-11-19Add more assertions for page memory handling codeArseny Kapoulkine
2014-11-19Change has_declaration to work on node pointersArseny Kapoulkine
This is more for consistency with the surrounding code than for performance.
2014-11-17Update version to 1.5Arseny Kapoulkine
2014-11-17Rename xml_document::load to load_stringArseny Kapoulkine
This should completely eliminate the confusion between load and load_file. Of course, for compatibility reasons we have to preserve the old variant - it will be deprecated in a future version and subsequently removed.
2014-11-08Reduce required page alignment to 32Arseny Kapoulkine
Since we no longer have a name/value pair in nodes we need one less bit to represent allocated flags. This reduces the page overhead by 32 bytes.
2014-11-07Merge branch 'master' into compactArseny Kapoulkine
2014-11-07XPath: Partially inline xpath_node_set_raw::push_backArseny Kapoulkine
Previously push_back implementation was too big to inline; now the common case (no realloc) is small and realloc variant is explicitly marked as no-inline. This is similar to xml_allocator::allocate_memory/allocate_memory_oob and makes some XPath queries 5% faster.
2014-11-07XPath: Only call apply_predicates if necessaryArseny Kapoulkine
In some cases constant overhead on step evaluation is important - i.e. for queries that evaluate a simple step in a predicate expression. Eliminating a redundant function call thus can prove worthwhile. This change makes some queries (e.g. //*[not(*)]) 4% faster.
2014-11-06Fix compact mode compilationArseny Kapoulkine
Clang and gcc seem to treat string literals differently...
2014-11-06Verify that compact page encoding is safeArseny Kapoulkine
Since page size can be customized let's do a special validation check for compact encoding. Right now it's redundant since page size is limited by 64k in alloc_string, but that may change in the future.
2014-11-06Add a separate storage class for PI nodesArseny Kapoulkine
This allows us to add pi value to restore target support for PI nodes without increasing the memory usage for other nodes. Right now the PI node has a separate header that's used for allocated bit; this allows us to reduce header bitcount in the future.
2014-11-05Ensure selected page size works with allocate_stringArseny Kapoulkine
Previously setting a large page size (i.e. 1M) would cause dynamic string allocation to assert spuriously. A page size of 64K guarantees that all offsets fit into 16 bits.
2014-11-05Fix xml_node::offset_debug for corner casesArseny Kapoulkine
Computed offsets for documents with nodes that were added using append_buffer or newly appended nodes without name/value information were invalid.
2014-11-05Use impl::get_document instead of root() where possibleArseny Kapoulkine
This reduces the number of unsafe pointer manipulations.
2014-11-05Remove redundant branchesArseny Kapoulkine
These used to result in better codegen for unknown reasons, but this is no longer the case.
2014-11-04Fix gcc warnings in compact modeArseny Kapoulkine
2014-11-04Merge branch 'master' into compactArseny Kapoulkine
2014-11-03:Merge remote-tracking branch 'upstream/master'Matthias Loy