Commit graph

1246 commits

Author SHA1 Message Date
Arseny Kapoulkine
eec353c443 Switch to regular AppVeyor image 2016-06-10 21:18:13 -07:00
Arseny Kapoulkine
7699499f25 Add CMakeLists to 'make release' now that it's top-level 2016-06-10 21:12:00 -07:00
Arseny Kapoulkine
53bc83cae7 Merge pull request #90 from jippeholwerda/master
Put CMakeLists.txt in the project root.
2016-06-10 18:26:04 -07:00
Arseny Kapoulkine
937ac8116e Merge pull request #97 from HumMan/master
Add vs2013 projects
2016-05-15 20:19:41 -07:00
Alexsey Zazvonnykh
6439e0c1a1 Add vs2013 projects 2016-04-24 22:38:32 +03:00
Arseny Kapoulkine
2d5980b406 Adjust XML allocation pages to have the exact specified size
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-14 08:43:06 -07:00
Arseny Kapoulkine
2e0ed8284b Remove extra space in an empty tag for format_raw
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-14 00:30:24 -07:00
Arseny Kapoulkine
c6539ccef0 Refactor auto_deleter now that we only need to support one signature
Also rename auto_deleter_fclose to close_file.
2016-04-03 13:30:34 -07:00
Arseny Kapoulkine
54f87d3b59 Merge pull request #92 from QUSpilPrgm/master
Do not assume that fclose can be converted to int(*)(FILE*)
2016-04-03 13:27:12 -07:00
Arseny Kapoulkine
dba7932000 Fix AppVeyor build 2016-03-27 20:51:54 -07:00
QUSpilPrgm
0564d55e19 Do not assume that fclose can be converted to int(*)(FILE*) because some compilers use a special calling convention for stdlib functions like fclose 2016-03-24 17:33:10 +01:00
Jippe Holwerda
4469a32970 Change paths according to new CMakeLists.txt location. 2016-02-25 20:38:07 +01:00
Jippe Holwerda
806c75652a Put CMakeLists.txt in the project root.
Having CMakeLists.txt in the project root makes it so much easier to use pugixml
as an external dependency in another CMake project.
2016-02-25 19:30:03 +01:00
Arseny Kapoulkine
8b60bbdce4 scripts: Update license year 2016-02-13 13:07:53 -08:00
Arseny Kapoulkine
4bbf6255dd scripts: Rename CocoaPods script to match NuGet naming
Also remove top-level LICENSE file since .podspec already has it.
2016-02-13 13:07:19 -08:00
Arseny Kapoulkine
44c251fbc3 Merge pull request #85 from igagis/master
scripts: Add CocoaPods package
2016-02-13 13:05:41 -08:00
Ivan Gagis
b709f15d18 embed license to podspec, as LICENSE file is not in 1.7 tag, cocoapods errors otherwise. Get sources from zeux github 2016-02-03 19:29:40 +02:00
Ivan Gagis
4215a0a159 LICENSE, podspec 2016-02-03 19:09:24 +02:00
Arseny Kapoulkine
607e46f209 Refactor conversion from integer to string
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-02 10:44:35 -08:00
Arseny Kapoulkine
ac4a84df4d docs: Add documentation for long setters 2016-02-02 08:52:47 -08:00
Arseny Kapoulkine
d2e72ee05a tests: Add tests for long setters 2016-02-02 08:49:32 -08:00
Arseny Kapoulkine
f441c63ea4 Implement set/set_value/operator= for long types
This makes the coverage for basic numeric types complete (sans long double).

Fixes #78.
2016-02-02 08:39:45 -08:00
Arseny Kapoulkine
c712dd84ba Specify std=c++11 explicitly in Travis configurations
That way the defaults in the Makefile only matter for local runs.
2016-01-26 21:43:48 -08:00
Arseny Kapoulkine
c3d27daf8e Merge pull request #83 from ogdf/use-real-standards-only
Add cxxstd Makefile argument for testing C++ standards
2016-01-26 20:28:10 -08:00
Stephan Beyer
e017a22fe0 Let Travis CI perform C++98-based tests 2016-01-26 22:14:58 +01:00
Stephan Beyer
6bbbdb7d7e Make cxxstd an argument to Makefile
This determines the used C++ standard.
If you do not want to use a specific C++ standard, use cxxstd=any.
The default is set to c++11.

The "define" PUGIXML_NO_CXX11 is removed from the Makefile
since it is not used in the code anyways.
2016-01-26 22:14:58 +01:00
Stephan Beyer
fb647f69a2 Let Travis CI use Ubuntu trusty
This allows to perform C++11-based tests on the Linux.
2016-01-26 21:53:16 +01:00
Stephan Beyer
fc9073289f test_parse.cpp: add newline to last line
This is necessary in order to comply with the C++03 standard.
2016-01-24 19:47:06 +01:00
Arseny Kapoulkine
e133764f33 Merge pull request #81 from ogdf/whitespace-issues
Fix whitespace issues
2016-01-24 08:56:06 -08:00
Stephan Beyer
f7aa65db8a Fix whitespace issues
Git warns when it finds "whitespace errors". This commit gets
rid of these whitespace errors for code and adoc files.
2016-01-24 14:05:44 +01:00
Arseny Kapoulkine
7f91301946 Change header format in non-compact mode to store page offset
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-20 21:51:02 -08:00
Arseny Kapoulkine
7aef75f43d docs: Adjust as_int documentation to match implementation
Also remove the description of behavior for trailing non-numeric characters.
It's likely this will become a parse error in the future so better leave it
as unspecified for now.

Fixes #80.
2016-01-19 21:17:08 -08:00
Arseny Kapoulkine
c388dbeba4 Merge pull request #79 from zeux/embed-pcdata
Add parse_embed_pcdata flag

This flag determines if plain character data is be stored in the parent element's value. This significantly changes the structure of the document; this flag is only recommended for parsing documents with a lot of PCDATA nodes in a very memory-constrained environment.

Most high-level APIs continue to work; code that inspects DOM using first_child()/value() will have to be adapted.
2016-01-14 07:52:40 -08:00
Arseny Kapoulkine
4f3be76167 Preserve order semantics for child_value/text when using parse_embed_pcdata
The performance cost is probably negligible and this means we treat embedded
value as the first child consistently.
2016-01-12 20:41:37 -08:00
Arseny Kapoulkine
85238132d3 docs: Add parse_embed_pcdata documentation 2016-01-12 20:38:45 -08:00
Arseny Kapoulkine
71d3a797f4 Adjust parse_embed_pcdata documentation
Since round-tripping should not be a problem any more don't mention it.
2016-01-12 20:18:12 -08:00
Arseny Kapoulkine
fc6c8633dd tests: Add test for parse_embed_pcdata 2016-01-12 20:16:29 -08:00
Arseny Kapoulkine
bcddf36559 Only save first PCDATA contents in the element
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-12 20:01:44 -08:00
Arseny Kapoulkine
df2a0ad28b Implement output support for embedded PCDATA values
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-09 17:46:42 -08:00
Arseny Kapoulkine
85d8b225f2 Support XPath string value for parse_embed_pcdata 2016-01-08 08:41:38 -08:00
Arseny Kapoulkine
8b01f8923c Support xml_node::child_value/text for parse_embed_pcdata 2016-01-08 08:40:56 -08:00
Arseny Kapoulkine
2874f6f21d Add initial support for parse_embed_pcdata
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.
2016-01-08 08:37:26 -08:00
Arseny Kapoulkine
ad3b492c1a docs: Regenerate HTML documentation 2015-12-31 17:22:41 +03:00
Arseny Kapoulkine
5f58e9bd0c Update all license/copyright texts to 2016 2015-12-31 17:22:21 +03:00
Arseny Kapoulkine
af7177e77d docs: Use ISO-8601 for changelog dates 2015-12-31 17:11:54 +03:00
Arseny Kapoulkine
03b1b6a5c3 scripts: Fix default value for STATIC_CRT option
Also refactor to use the same case and run after common options.
2015-12-30 23:58:03 +03:00
Arseny Kapoulkine
6a22a28730 Merge pull request #70 from nirbar/master
scripts: Allow linking static CRT libraries on Windows

Use the solution from CMake FAQ to specify correct command-line arguments.
2015-12-30 23:54:58 +03:00
Arseny Kapoulkine
1bcf12402e Work around Clang Wstring-conversion warnings
(!"string") triggers the warning however (false && "string") does not.

Fixes #75.
2015-12-29 21:43:24 +03:00
nir.bar
3dadebf10e Merge branch 'master' of github.com:nirbar/pugixml 2015-12-03 13:19:52 +02:00
nir.bar
0d111976e1 Add CMake option on MSVC- STATIC_CRT 2015-12-03 12:33:44 +02:00