Commit Graph

1296 Commits

Author SHA1 Message Date
Arseny Kapoulkine
b7a1feccf7 Use _wfopen and fseeko64 on MinGW in C++11 mode
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-24 20:49:12 -08:00
Arseny Kapoulkine
3e1ae89cf6 tests: Add a test for load_file with wide Unicode name 2014-11-24 18:27:54 -08:00
Arseny Kapoulkine
4b8da65be9 Add allocator reserve for copying
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-20 23:49:59 -08:00
Arseny Kapoulkine
db8df4a566 Merge branch 'master' into compact 2014-11-20 23:47:16 -08:00
Arseny Kapoulkine
125aa55061 Fix node_declaration copying with empty name
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-20 23:39:40 -08:00
Arseny Kapoulkine
a0dc468170 Refactor node type checks for attribute insertion
Add allow_insert_attribute (similar to allow_insert_child).
2014-11-20 20:29:21 -08:00
Arseny Kapoulkine
8f85b1ba7a Minor refactoring of tree modification
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-20 08:54:03 -08:00
Arseny Kapoulkine
cd62478108 XPath: Refactor eval_once to use set type
This will allow us to implement nodeset_eval_last evaluation mode if necessary
without relying on a fragile boolean argument.
2014-11-19 22:52:32 -08:00
Arseny Kapoulkine
b8437664a9 XPath: Minor string operation refactoring
Extract end of string to rend and add comments to translate_table.
2014-11-19 22:44:08 -08:00
Arseny Kapoulkine
6d048deba8 Make sure remove_node fully detaches the node
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-19 20:57:22 -08:00
Arseny Kapoulkine
c579d99649 Prevent depth underflow when printing documents
Since depth is unsigned this is actually well-defined but it's better to not
have the underflow anyway.
2014-11-19 20:56:36 -08:00
Arseny Kapoulkine
853b1977b8 Add more assertions for page memory handling code 2014-11-19 20:56:06 -08:00
Arseny Kapoulkine
5c5038c264 Change has_declaration to work on node pointers
This is more for consistency with the surrounding code than for performance.
2014-11-19 19:50:40 -08:00
Arseny Kapoulkine
417048d8cb tests: Fix tests on various compilers
Some compilers don't handle NaNs properly.
Some compilers don't implement fmod in a IEEE-compatible way.
Some compilers have exception handling codegen bugs (DMC...).
2014-11-19 16:34:57 -08:00
Arseny Kapoulkine
1a06d7d3de docs: Regenerated documentation
Also fix documentation jam rules for Windows.
2014-11-18 09:30:19 -08:00
Arseny Kapoulkine
3c048bbb5e tests: Fix version test 2014-11-17 22:45:38 -08:00
Arseny Kapoulkine
0749d53613 docs: Add changelog for 1.5
Release date is (tentatively) 11/27.
2014-11-17 22:34:17 -08:00
Arseny Kapoulkine
b041e94f29 Update version to 1.5 2014-11-17 21:47:37 -08:00
Arseny Kapoulkine
e9956ae3a6 Rename xml_document::load to load_string
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-17 19:52:23 -08:00
Arseny Kapoulkine
79ed320f89 tests: Don't use /dev/tty
The behavior on OSX is different - we don't get a I/O error so the test is
useless.
2014-11-17 08:35:34 -08:00
Arseny Kapoulkine
28feddf013 docs: Replace Subversion links with Git 2014-11-16 20:27:01 -08:00
Arseny Kapoulkine
cca23e6363 Reduce required page alignment to 32
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-08 20:05:12 +01:00
Arseny Kapoulkine
c74dc33604 Merge branch 'master' into compact 2014-11-07 21:02:44 +01:00
Arseny Kapoulkine
4c57d6f6fc XPath: Partially inline xpath_node_set_raw::push_back
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-07 20:29:02 +01:00
Arseny Kapoulkine
d854b0219d XPath: Only call apply_predicates if necessary
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-07 19:08:49 +01:00
Arseny Kapoulkine
db78f34054 Revert "Change Travis config to build on Linux/OSX"
This reverts commit 98713bcba9.

Travis multi-OS feature is invite-only for now...
2014-11-06 16:40:35 +01:00
Arseny Kapoulkine
98713bcba9 Change Travis config to build on Linux/OSX
Hopefully OSX defaults to clang so we get as much coverage as before...
2014-11-06 16:37:32 +01:00
Arseny Kapoulkine
5cad3652d9 Fix compact mode compilation
Clang and gcc seem to treat string literals differently...
2014-11-06 10:02:27 +01:00
Arseny Kapoulkine
50bfdb1856 tests: Fix all tests for compact mode
Memory allocation behavior is different in compact mode so tests that rely
on current behavior have to be adjusted.
2014-11-06 09:59:07 +01:00
Arseny Kapoulkine
393cc28481 Add compact build configuration to Travis 2014-11-06 09:34:13 +01:00
Arseny Kapoulkine
56349939e4 Verify that compact page encoding is safe
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-06 09:33:05 +01:00
Arseny Kapoulkine
224b9b7ba7 Add a separate storage class for PI nodes
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-06 09:20:34 +01:00
Arseny Kapoulkine
e3c215b542 Ensure selected page size works with allocate_string
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-05 09:52:12 +01:00
Arseny Kapoulkine
aa1a61c59f Fix xml_node::offset_debug for corner cases
Computed offsets for documents with nodes that were added using append_buffer
or newly appended nodes without name/value information were invalid.
2014-11-05 09:32:52 +01:00
Arseny Kapoulkine
ab12b30c83 Use impl::get_document instead of root() where possible
This reduces the number of unsafe pointer manipulations.
2014-11-05 09:19:12 +01:00
Arseny Kapoulkine
2cb5d40956 Remove redundant branches
These used to result in better codegen for unknown reasons, but this is no
longer the case.
2014-11-05 08:52:32 +01:00
Arseny Kapoulkine
f39a73f6e1 Fix gcc warnings in compact mode 2014-11-04 10:05:31 +01:00
Arseny Kapoulkine
b2a0ae13b6 Merge branch 'master' into compact 2014-11-04 09:58:04 +01:00
Matthias Loy
1912894f53 :Merge remote-tracking branch 'upstream/master' 2014-11-03 20:23:35 +01:00
Arseny Kapoulkine
3950ee0433 XPath: Refactor predicate application
Split number/boolean filtering logic into two functions. This creates an
extra copy of a remove_if-like algorithm, but moves the type check out of
the loop and results in better organized filtering code.

Consolidate test-based dispatch into apply_predicate (which is now a member
function).
2014-11-03 18:41:18 +01:00
Arseny Kapoulkine
97a515f873 tests: Add more XPath mod tests 2014-11-03 07:50:00 +01:00
Arseny Kapoulkine
e9948b4b05 Fix undefined behavior while calling memcpy
Calling memcpy(x, 0, 0) is technically undefined (although it should usually
be a no-op).
2014-11-02 09:30:56 +01:00
Arseny Kapoulkine
f68a320a02 tests: Improve test coverage 2014-11-01 11:45:13 +01:00
Arseny Kapoulkine
25926c6206 XPath: Fix undefined behavior while calling memcpy
Calling memcpy(x, 0, 0) is technically undefined (although it should usually
be a no-op).

Fixes #20.
2014-11-01 10:48:14 +01:00
Arseny Kapoulkine
97893ad738 Fix first-time make config=coverage test
Not sure why xargs -r is not the default...
2014-11-01 08:59:49 +01:00
mloy
837ced350c load_buffer_impl always checks if buffer is valid pointer and size > 0
added some tests to force invalid buffer and size = 0
2014-10-30 14:30:05 +01:00
Arseny Kapoulkine
650c67a663 Fix compilation after merge. 2014-10-28 20:14:17 -07:00
Arseny Kapoulkine
a49f932b61 Merge branch 'master' into compact 2014-10-28 20:11:06 -07:00
Arseny Kapoulkine
21cff3bca2 Fix several cppcheck warnings. 2014-10-28 17:10:41 -07:00
Arseny Kapoulkine
6229138d80 Optimize node printing by using raw pointers
This lets us do fewer null pointer checks (making printing 2% faster with -O3)
and removes a lot of function calls (making printing 20% faster with -O0).
2014-10-27 22:29:14 -07:00