summaryrefslogtreecommitdiff
path: root/src/pugixml.cpp
AgeCommit message (Collapse)Author
2017-01-30XPath: Improve error message for expressions like .[1]Arseny Kapoulkine
W3C specification does not allow predicates after abbreviated steps. Currently this results in parsing terminating at the step, which leads to confusing error messages like "Invalid query" or "Unmatched braces".
2017-01-30XPath: Track allocation errors more explicitlyArseny Kapoulkine
Any time an allocation fails xpath_allocator can set an externally provided bool. The plan is to keep this bool up until evaluation ends, so that we can use it to discard the potentially malformed result.
2017-01-29XPath: Provide non-throwing and throwing allocations in xpath_allocatorArseny Kapoulkine
For both allocate and reallocate, provide both _nothrow and _throw functions; this change renames allocate() to allocate_throw() (same for reallocate) to make it easier to change the code to remove throwing variants.
2017-01-29XPath: Minor error handling refactoringArseny Kapoulkine
Handle node type error before creating expression node
2017-01-29XPath: Route out-of-memory errors through the exceptionless pathArseny Kapoulkine
We currently need to convert error based on the text to a different type of C++ exceptions when C++ exceptions are enabled.
2017-01-29XPath: Forward all node constructors through alloc_nodeArseny Kapoulkine
This allows us to handle OOM during node allocation without triggering undefined behavior that occurs when placement new gets a NULL pointer.
2017-01-29XPath: Do not use exceptions to propagate parsing errorsArseny Kapoulkine
Instead, return 0 and rely on parsing logic to propagate that all the way down, and convert result to exception to maintain existing interface.
2017-01-29XPath: Assume that every function can fail and return 0Arseny Kapoulkine
Propagate the failure to the caller manually. This is a first step to parser structure that does not depend on exceptions or longjmp for error handling (and thus matches the XML parser). To preserve semantics we'll have to convert error code to exception later.
2017-01-29XPath: Minor parsing refactoringArseny Kapoulkine
Simplify function argument parsing by folding arg 0 parsing into the main loop, reuse expression parsing logic for unary expression
2017-01-29XPath: Remove parse_function_helperArseny Kapoulkine
It was only used in three places and didn't really make the code more readable.
2017-01-29XPath: alloc_string no longer returns NULLArseny Kapoulkine
NULL return value will be reserved for the OOM error indicator.
2017-01-26Update copyright year to 2017Arseny Kapoulkine
2016-12-01Work around cray++ compiler issueArseny Kapoulkine
It's still not clear as to what exactly makes it emit this error when compiling string_to_integer: CC-3059 crayc++: INTERNAL __C_FILE_SCOPE_DATA__, File = <pugixml>/src/pugixml.cpp, Line = 4524, Column = 4 Expected no overflow in routine. But a viable workaround for now is to exploit the knowledge that it uses two-complement arithmetics and invert the sign manually. Fixes #125.
2016-11-18Silence 'cast increases required alignment of target type' warningsArseny Kapoulkine
These warnings are emitted on some GCC versions when targeting ARM; the alignment is guaranteed to be correct due to how page offsets are set up but the compiler doesn't know.
2016-11-17Rename set_value_convert to set_value_boolArseny Kapoulkine
It's too dangerous to overload here - easy to accidentally mix floating point path with boolean one.
2016-11-17Fix 'comparison of unsigned expression < 0 is always false' warningsArseny Kapoulkine
Unfortunately, some compilers don't suppress these kinds of warnings in template instantiations; solve this by moving the responsibility for computing negative bool to the caller. Also since we're doing that we don't really need to convert to unsigned in the implementation - might as well have the caller do it, which removes some type dispatch logic and slightly reduces binary size.
2016-11-13Change status_end_element_mismatch to point to closing tag nameArseny Kapoulkine
Previously the error offset pointed to the first mismatching character, which can be confusing especially if the start tag name is a prefix of the end tag name. Instead, move the offset to the first character of the name - that way it should be more obvious that the problem is that the entire name mismatches. Fixes #112.
2016-11-09Add format_no_empty_element_tags flagArseny Kapoulkine
Setting this flag outputs start and end tag for every element, including empty elements. Fixes #118.
2016-11-09Update version to 1.8 everywhereArseny Kapoulkine
2016-11-08XPath: Fix source indentationArseny Kapoulkine
Split some lines into two and add braces in some places to make the code more readable.
2016-11-07Move compact hash table pointer setup to xml_documentArseny Kapoulkine
This keeps all code that creates document/allocator/page structures together.
2016-11-07Remove xml_allocator copying during parsingArseny Kapoulkine
The separate copy of allocator state in parser was meant to increase parsing performance by reducing aliasing/indirection, but benchmarks against the current source don't indicate that this is worthwhile. Removing this simplifies the code slightly and makes it possible to move compact hash table to the allocator.
2016-11-07Rename xml_document::create/destroy for consistencyArseny Kapoulkine
2016-11-06Refactor move semantics support detectionArseny Kapoulkine
Do it in one place and set PUGIXML_HAS_MOVE if it's available.
2016-11-06Add VS2013 check for C++11 availability (#121)iFarbod
VS 2013 supports C++11, but __cplusplus macro isn't updated, and it is 199711 so the old check always fails, even though the compiler supports c++11.
2016-07-15Use references for output variablesArseny Kapoulkine
While I grew to dislike references for this case, there are other functions in the source that use references so switch to that for consistency.
2016-07-14Implement encoding detection by name.Arseny Kapoulkine
This adds about 40 cycles for parsing <?xml version='1.0'?> declaration and about 70 cycles for parsing <?xml version='1.0' encoding='utf-8'?>, as measured on a Core i7, which should be negligible for all documents. Fixes #16.
2016-04-14Adjust XML allocation pages to have the exact specified sizeArseny Kapoulkine
Previously the page size was defining the data size, and due to additional headers (+ recently removed allocation padding) the actual allocation was a bit bigger. The problem is that some allocators round 2^N+k allocations to 2^N+M, which can result in noticeable waste of space. Specifically, on 64-bit OSX allocating the previous page size (32k+40) resulted in 32k+512 allocation, thereby wasting 472 bytes, or 1.4%. Now we have the allocation size specified exactly and just recompute the available data size, which can in small space savings depending on the allocator.
2016-04-14Remove extra space in an empty tag for format_rawArseny Kapoulkine
When using format_raw the space in the empty tag (<node />) is the only character that does not have to be there; so format_raw almost results in a minimal XML but not quite. It's pretty unlikely that this is crucial for any users - the formatting change should be benign, and it's better to improve format_raw than to add yet another flag. Fixes #87.
2016-04-03Refactor auto_deleter now that we only need to support one signatureArseny Kapoulkine
Also rename auto_deleter_fclose to close_file.
2016-03-24Do not assume that fclose can be converted to int(*)(FILE*) because some ↵QUSpilPrgm
compilers use a special calling convention for stdlib functions like fclose
2016-02-02Refactor conversion from integer to stringArseny Kapoulkine
Unify the implementations by automatically deducing the unsigned type from its signed counterpart. That allows us to use a templated function instead of duplicating code.
2016-02-02Implement set/set_value/operator= for long typesArseny Kapoulkine
This makes the coverage for basic numeric types complete (sans long double). Fixes #78.
2016-01-24Fix whitespace issuesStephan Beyer
Git warns when it finds "whitespace errors". This commit gets rid of these whitespace errors for code and adoc files.
2016-01-20Change header format in non-compact mode to store page offsetArseny Kapoulkine
This utilizes the fact that pages are of limited size so we can store offset from the object to the page in a few bits - we currently use 24 although that's excessive given that pages are limited to ~512k. This has several benefits: - Pages do not have to be 64b aligned any more - this simplifies allocation flow and frees up 40-50 bytes from xml_document::_memory. - Header now has 8 bits available for metadata for both compact and default mode which makes it possible to store type as-is (allowing easy type extension and removing one add/sub operation from type checks). - One extra bit is easily available for future metadata extension (in addition to the bit for type encoding that could be reclaimed if necessary). - Allocators that return 4b-aligned memory on 64-bit platforms work fine if misaligned reads are supported. The downside is that there is one or two extra instructions on the allocation path. This does not seem to hurt parsing performance.
2016-01-12Preserve order semantics for child_value/text when using parse_embed_pcdataArseny Kapoulkine
The performance cost is probably negligible and this means we treat embedded value as the first child consistently.
2016-01-12Only save first PCDATA contents in the elementArseny Kapoulkine
This change fixes an important ordering issue - if element node has a PCDATA child *after* other elements, it's impossible to tell which order the children were in. Since the goal of PCDATA embedding is to save memory when it's the only child, only apply the optimization to the first child. This seems to fix all roundtripping issues so the only caveat is that the DOM structure is different.
2016-01-09Implement output support for embedded PCDATA valuesArseny Kapoulkine
This is a bit awkward since preserving correct indentation structure requires a bit of extra work, and the closing tag has to be written by _start function to correctly process the rest of the tree.
2016-01-08Support XPath string value for parse_embed_pcdataArseny Kapoulkine
2016-01-08Support xml_node::child_value/text for parse_embed_pcdataArseny Kapoulkine
2016-01-08Add initial support for parse_embed_pcdataArseny Kapoulkine
When this flag is true, PCDATA value is saved to the parent element instead of allocating a new node. This prevents some documents from round-tripping since it loses information, but can provide a significant memory reduction and parsing speedup for some documents.
2015-12-31Update all license/copyright texts to 2016Arseny Kapoulkine
2015-12-29Work around Clang Wstring-conversion warningsArseny Kapoulkine
(!"string") triggers the warning however (false && "string") does not. Fixes #75.
2015-11-13Work around MinGW versions with non-C99 compliant headersArseny Kapoulkine
Apparently some MinGW distributions have a compiler that's recent enough to support C++11 but limits.h header that incorrectly omits LLONG limits in strict ANSI mode, since it guards the definitions with: #if !defined(__STRICT_ANSI__) && defined(__GNUC__) We can just define these symbols ourselves in this specific case. Fixes #66.
2015-10-25Fix Borland C++ 5.4 compilationArseny Kapoulkine
It does not have stdint.h and has some C++ parsing issues.
2015-10-18Fix wchar modeArseny Kapoulkine
2015-10-18Fix MWCW issue with compact modeArseny Kapoulkine
2015-10-18Fix Borland C++ issues with compact modeArseny Kapoulkine
2015-10-18Work around DMC compilation errorArseny Kapoulkine
For some reason reference to a fixed-size array works in two other places but not in this one...
2015-10-18Fix 'cast increases required alignment of type' warningsArseny Kapoulkine
These show up when building with Wcast-align for ARM.