Christopher Dunn
8d15e51228
add test_comment_00
...
one-element array with comment, for issue #103
2015-01-23 14:28:21 -06:00
Christopher Dunn
9fbd12b27c
Merge pull request #137 from cdunn2001/avoid-extra-newline
...
Avoid extra newline
2015-01-23 14:24:52 -06:00
Christopher Dunn
f8ca6cbb25
1.4.0 <- 1.3.0
...
Minor version bump, but we will wait for a few more commits this time
before tagging the release.
2015-01-23 14:23:31 -06:00
Christopher Dunn
d383056fbb
avoid extra newlines in StyledStreamWriter
...
Add indented_ as a bitfield. (Verified that sizeof(StyledStreamWriter)
remains 96 for binary compatibility. But the new symbol requires a minor
version-bump.)
2015-01-23 14:23:31 -06:00
Christopher Dunn
ddb4ff7dec
Merge pull request #136 from cdunn2001/test-both-styled-writers
...
Test both styled writers
Not only does this now test StyledStreamWriter the same way as StyledWriter, but it also makes the former work more like the latter, indenting separate lines of a comment before a value. Might break some user tests (as `operator<<()` uses `StyledStreamWriter`) but basically a harmless improvement.
All tests pass.
2015-01-23 13:55:45 -06:00
Christopher Dunn
3efc587fba
make StyledStreamWriter work more like StyledWriter
...
tests pass
2015-01-23 13:36:10 -06:00
Christopher Dunn
70704b9a70
test both StyledWriter and StyledStreamWriter
2015-01-23 13:36:10 -06:00
Christopher Dunn
ac6bbbc739
show cmd in runjsontests.py
2015-01-23 13:36:10 -06:00
Christopher Dunn
26c52861b9
pass --json-writer StyledWriter
2015-01-23 13:36:10 -06:00
Christopher Dunn
3682f60927
--json-writer arg
2015-01-23 13:36:10 -06:00
Christopher Dunn
58c31ac550
mv try-block
2015-01-23 12:35:12 -06:00
Christopher Dunn
08cfd02d8c
fix minor bugs in test-runner
2015-01-23 12:35:12 -06:00
Christopher Dunn
79211e1aeb
Options class for test
2015-01-23 12:35:12 -06:00
Christopher Dunn
632c9b5032
cleaner
2015-01-23 12:35:12 -06:00
Christopher Dunn
05810a7607
cleaner
2015-01-23 12:35:12 -06:00
Christopher Dunn
942e2c999a
unindent test-code
2015-01-23 12:35:12 -06:00
Christopher Dunn
2160c9a042
switch from StyledWriter to StyledStream writer in tests
2015-01-23 09:02:44 -06:00
Christopher Dunn
ee8b58f82f
Merge pull request #135 from cdunn2001/removeMember
...
Deprecate old `removeMember()`. Add new.
[Deprecated methods will be removed at the next major version bump](http://apr.apache.org/versioning.html#binary ).
2015-01-22 19:26:46 -06:00
Christopher Dunn
9132aa94b1
1.3.0
...
http://apr.apache.org/versioning.html#binary
2015-01-22 19:25:44 -06:00
Christopher Dunn
76746b09fc
deprecate old removeMember()
2015-01-22 19:25:44 -06:00
Christopher Dunn
70b795bd45
Merge pull request #133 from cdunn2001/travis-11
...
upgrade -std=c++ version
2015-01-22 19:21:24 -06:00
Christopher Dunn
26842530f2
upgrade -std=c++ version
...
Travis CI does not yet support gcc-4.8, needed for c++11, so we
will try c++0x for now.
2015-01-22 19:12:23 -06:00
Christopher Dunn
e3f24286c1
Merge pull request #130 from connormanning/master
...
Build without warnings with -pedantic enabled.
2015-01-22 11:48:58 -06:00
Connor Manning
00b8ce81db
Build without warnings with -pedantic enabled.
2015-01-22 10:48:45 -06:00
Christopher Dunn
40810fe326
Merge pull request #127 from cdunn2001/removeIndex
...
`Value::removeIndex()`
See issue #28 .
2015-01-21 16:08:25 -06:00
Christopher Dunn
59167d8627
more changes per cr
2015-01-21 16:05:08 -06:00
Christopher Dunn
05c1b8344d
drop this-> (team preference)
2015-01-21 15:43:48 -06:00
Christopher Dunn
e893625e88
test removeIndex/Member()
2015-01-20 17:04:03 -06:00
Christopher Dunn
e87e41cdb0
from Itzik S; see issue #28
...
with minor corrections
2015-01-20 17:03:58 -06:00
Christopher Dunn
9de2c2d84d
partial
2015-01-20 17:02:48 -06:00
Christopher Dunn
7956ccd61e
allow stream ops for JSON_FAIL_MESSAGE
...
http://www.iar.com/Global/Resources/Developers_Toolbox/C_Cplusplus_Programming/Tips%20and%20tricks%20using%20the%20preprocessor%20%28part%20two%29.pdf
2015-01-20 16:25:26 -06:00
datadiode
9454e687a3
Specialize std::swap() for Json::Value in a C++ standard compliant way
...
originally from pull #119
2015-01-20 15:25:41 -06:00
Christopher Dunn
46a925ba4a
fix compiler warning for a test
2015-01-20 15:19:22 -06:00
Christopher Dunn
c407f1407f
test-data for #103
...
passes
2015-01-20 15:16:46 -06:00
Christopher Dunn
ec251df6b7
Merge pull request #125 from cdunn2001/issue-116
...
1.2.1
Fix issue #116 , DOS line-endings. Never output \r.
2015-01-20 15:14:50 -06:00
Christopher Dunn
51c0afab22
1.2.1 <- 1.2.0
...
This can affect existing round-trip tests, but we never made any
guarantees about whitespace constancy.
2015-01-20 15:12:49 -06:00
Mark Zeren
e39fb0083c
Normalize comment EOLs while reading instead of while writing
...
Tests are currently failing when git cloning on Windows with autocrlf = true. In
that setup multiline comments contain \r\n EOLs. The test code assumes that
comments contain \n EOLs and opens the .actual files (etc.) with "wt" which
converts \n to \r\n. Thus we end up with \r\r\n EOLs in the output, which
triggers a test failure.
Instead we should cannonicalize comments while reading so that they contain only
\n EOLs. This approach simplifies other parts of the reader and writer logic,
and requires no changes to the test. It is a breaking change, but probably the
Right Thing going forward.
This change also fixes dereferencing past the end of the comment string in
StyledWriter::writeCommentBeforeValue.
Tests should be added with appropriate .gitattributes for the input files to
ensure that we run tests for DOS, Mac, and Unix EOL files on all platforms. For
now this change is enough to unblock Windows builds.
issue #116
2015-01-20 13:45:44 -06:00
Christopher Dunn
ec727e2f6b
-Wall for Clang/GCC
2015-01-20 13:45:28 -06:00
Christopher Dunn
4ce4bb8404
Merge pull request #124 from cdunn2001/assign-with-comments
...
1.2.0
`operator=()` (which already performed a deep-copy) now includes comments. This change is probably harmless in all practical cases. But just in case, we bump the minor version.
Address #47 .
2015-01-20 12:49:51 -06:00
Christopher Dunn
2cd0f4ec21
1.2.0 <- 1.1.1
...
`operator=()` (which already performed a deep-copy) now includes
comments. The change is probably harmless in all practical cases.
2015-01-20 12:44:51 -06:00
Christopher Dunn
836f0fb863
fix comments before several types
...
tests pass
2015-01-20 12:23:44 -06:00
Christopher Dunn
37644abd77
test comment before several types
...
* array
* double
* string
* true
* false
* null
2015-01-20 12:23:18 -06:00
Christopher Dunn
66eb72f121
use SwapPayload() to retain comments
...
All tests pass, but we might be missing coverage.
issue #47
2015-01-20 12:07:01 -06:00
Christopher Dunn
94b0297dc5
Revert "consider these as binary, so git will not alter line-endings"
...
This reverts commit 8f3aa220db
.
We will find a better fix for #116 . In the meantime, we want to see
diffs for changes to test-data.
2015-01-20 12:06:12 -06:00
Christopher Dunn
55db3c3cb2
Merge pull request #118 from datadiode/47_fix_value_swap
...
swap comments too
* Changed `operator=` to exclude start/limit, which should never have been added.
* Changed `swap` to include comments. Hmm. That affects efficiency (but *not* for `operator=`) and probably nothing else in practice.
- issue #47
2015-01-18 11:31:47 -06:00
datadiode
c07ef37904
https://github.com/open-source-parsers/jsoncpp/issues/47
2015-01-18 10:05:25 +01:00
Christopher Dunn
62ab94ddd3
Merge pull request #117 from datadiode/integration
...
Simplify Reader::decodeNumber() / Remove unused functions
2015-01-17 08:10:59 -06:00
datadiode
09d352ac13
Remove unused functions
2015-01-17 13:26:23 +01:00
datadiode
50753bb808
Simplify Reader::decodeNumber()
2015-01-17 13:21:42 +01:00
Christopher Dunn
8f3aa220db
consider these as binary, so git will not alter line-endings
...
issue #116
2015-01-16 16:29:07 -06:00