Petri Lehtinen [Tue, 19 Jan 2010 19:19:37 +0000 (21:19 +0200)]
CHANGES: Update for v1.2
Petri Lehtinen [Sun, 17 Jan 2010 11:57:20 +0000 (13:57 +0200)]
Merge branch '1.1'
Conflicts:
Makefile.am
Petri Lehtinen [Tue, 12 Jan 2010 19:58:52 +0000 (21:58 +0200)]
doc: Convert CHANGES to reStructuredText and add it to HTML docs
CHANGES is preprocessed to convert json_*() function names to Sphinx
:cfunc: cross references. This is to keep CHANGES more readable in
both plain text and HTML.
Petri Lehtinen [Tue, 12 Jan 2010 19:29:16 +0000 (21:29 +0200)]
Update documentation
* Python is no longer required to run the tests
* Mention pkg-config support
* Fix some errors
Petri Lehtinen [Sun, 10 Jan 2010 19:01:59 +0000 (21:01 +0200)]
Fix memory leaks in json_equal() tests
Petri Lehtinen [Sun, 10 Jan 2010 19:01:07 +0000 (21:01 +0200)]
Fix memory leaks in json_*_deep_copy()
Petri Lehtinen [Sun, 10 Jan 2010 14:18:45 +0000 (16:18 +0200)]
Enable Valgrind support in the API suite
It was accidentally left out when the test system was refactored.
Petri Lehtinen [Sun, 10 Jan 2010 12:39:04 +0000 (14:39 +0200)]
Use _nocheck functions internally for speed
There are some places where we copy a string from an existing JSON
value. In these cases the string has already been checked for valid
UTF-8.
Petri Lehtinen [Thu, 7 Jan 2010 17:28:00 +0000 (19:28 +0200)]
Add pkg-config support
Thanks to Sean Middleditch for contributing.
Petri Lehtinen [Thu, 31 Dec 2009 13:56:28 +0000 (15:56 +0200)]
Add functions for shallow and deep copying JSON values
Petri Lehtinen [Thu, 31 Dec 2009 15:39:36 +0000 (17:39 +0200)]
Add equality test for JSON values
Petri Lehtinen [Mon, 21 Dec 2009 12:00:57 +0000 (14:00 +0200)]
Add check-exports test
Petri Lehtinen [Mon, 21 Dec 2009 12:00:40 +0000 (14:00 +0200)]
Add _nocheck functions
Added functions are:
* json_string_nocheck()
* json_string_set_nocheck()
* json_object_set_nocheck()
* json_object_set_new_nocheck()
These functions don't check that their string argument is valid UTF-8,
but assume that the user has already performed the check.
Petri Lehtinen [Mon, 21 Dec 2009 12:13:05 +0000 (14:13 +0200)]
Merge branch '1.1'
Petri Lehtinen [Mon, 21 Dec 2009 12:01:59 +0000 (14:01 +0200)]
Remove const qualifier from the json_t parameter in json_*_set() functions.
It's incorrect as these functions modify the value.
Petri Lehtinen [Thu, 17 Dec 2009 22:03:38 +0000 (00:03 +0200)]
Fix tests for real
The tests were broken by the "%.17g" fix that was merged from the 1.1
branch.
Petri Lehtinen [Sun, 20 Dec 2009 19:18:27 +0000 (21:18 +0200)]
Merge branch '1.1'
Conflicts:
configure.ac
doc/conf.py
Petri Lehtinen [Wed, 16 Dec 2009 20:05:55 +0000 (22:05 +0200)]
Enhance tests
* Now that JSON_SORT_KEYS is implemented, take it into use with the
valid and valid-strip suites. This is to ensure that the tests
remain valid even if the string hash function is changed in the
future.
* Remove test_dump API test. Instead, implement the same tests more
elegantly in the encoding-flags suite.
Petri Lehtinen [Fri, 18 Dec 2009 19:43:12 +0000 (21:43 +0200)]
jansson 1.1.3
Petri Lehtinen [Thu, 17 Dec 2009 21:42:13 +0000 (23:42 +0200)]
Encode reals correctly
This patch changes the sprintf format from "%0.17f" to "%.17g", as the
f format specifier doesn't print the exponent at all. This caused
losing precision in all but the most simple cases.
Because the g specifier doesn't print the decimal fraction or exponent
if they're not needed, a ".0" has to be appended by hand in these
cases. Otherwise the value's type changes from real to integer when
decoding again.
Thanks to Philip Grandinetti for reporting this issue.
Petri Lehtinen [Mon, 7 Dec 2009 11:16:45 +0000 (13:16 +0200)]
Implement JSON_SORT_KEYS encoding flag
With this flag, the objects are sorted by key when encoding.
Petri Lehtinen [Mon, 14 Dec 2009 21:01:36 +0000 (23:01 +0200)]
Refactor the test system
Petri Lehtinen [Sat, 5 Dec 2009 20:55:30 +0000 (22:55 +0200)]
Implement JSON_ENSURE_ASCII encoding flag
With this flag, all Unicode characters outside the ASCII range are
escaped.
Petri Lehtinen [Wed, 2 Dec 2009 21:48:50 +0000 (23:48 +0200)]
Use int32_t instead of plain int with Unicode code points
On some architectures, int just isn't big enough to hold all Unicode
code points.
Petri Lehtinen [Sun, 29 Nov 2009 11:04:00 +0000 (13:04 +0200)]
Only export symbols starting with "json_" in libjansson.la
This way we don't pollute the symbol namespace with internal symbols.
Petri Lehtinen [Sun, 29 Nov 2009 11:00:47 +0000 (13:00 +0200)]
Make parse_json static
Petri Lehtinen [Sat, 28 Nov 2009 11:39:06 +0000 (13:39 +0200)]
doc/github_commits.c Add copyright notice
Petri Lehtinen [Sun, 8 Nov 2009 20:01:02 +0000 (22:01 +0200)]
Merge branch '1.1'
Conflicts:
configure.ac
doc/conf.py
Petri Lehtinen [Sun, 8 Nov 2009 12:13:32 +0000 (14:13 +0200)]
jansson 1.1.2
Petri Lehtinen [Sat, 7 Nov 2009 12:45:45 +0000 (14:45 +0200)]
Don't include stdint.h in jansson.h
It's not needed
Petri Lehtinen [Wed, 4 Nov 2009 20:10:46 +0000 (22:10 +0200)]
Merge branch '1.1'
Conflicts:
test/.gitignore
test/testprogs/Makefile.am
Petri Lehtinen [Wed, 4 Nov 2009 19:24:22 +0000 (21:24 +0200)]
dump: Revise whitespace usage
- Never append newline to output
- By default, add spaces between array and object items for more
readable output
- Introduce the flag JSON_COMPACT to not add the aforementioned spaces
Petri Lehtinen [Tue, 3 Nov 2009 21:07:43 +0000 (23:07 +0200)]
Build documentation in make html target
To keep the distchecks for the documentation, the documentation has to
be built in the check target instead of distcheck-hook.
While at it, rename doc/.build to doc/_build. This naming is the
default with sphinx 0.6.2.
Petri Lehtinen [Thu, 29 Oct 2009 13:42:05 +0000 (15:42 +0200)]
load: Parse a badly put - sign correctly
Thanks to Manolis Delakis for reporting.
Petri Lehtinen [Tue, 27 Oct 2009 15:46:57 +0000 (17:46 +0200)]
json_load_file: Initialize the error struct properly
Failing to do this has the effect that the error message is not
returned when the input file cannot be opened (e.g. if it doesn't
exist).
Thanks to Martin Vopatek for reporting.
Petri Lehtinen [Mon, 26 Oct 2009 19:33:03 +0000 (21:33 +0200)]
Merge branch '1.1'
Conflicts:
CHANGES
configure.ac
doc/conf.py
Petri Lehtinen [Mon, 26 Oct 2009 19:27:10 +0000 (21:27 +0200)]
jansson 1.1.1
Petri Lehtinen [Sat, 24 Oct 2009 21:18:03 +0000 (00:18 +0300)]
Build documentation in distcheck-hook
This is to check that all the documentation files are distributed
before releasing.
Petri Lehtinen [Sat, 24 Oct 2009 21:17:16 +0000 (00:17 +0300)]
Really distribute all the docs
The tutorial example github_commits.c was still left out.
Petri Lehtinen [Sat, 24 Oct 2009 10:41:39 +0000 (13:41 +0300)]
Distribute all the docs
Petri Lehtinen [Wed, 21 Oct 2009 05:52:34 +0000 (08:52 +0300)]
Fix version 1.1 release date in CHANGES
Petri Lehtinen [Wed, 21 Oct 2009 05:52:34 +0000 (08:52 +0300)]
Fix version 1.1 release date in CHANGES
Petri Lehtinen [Wed, 21 Oct 2009 05:51:43 +0000 (08:51 +0300)]
Set the version number to 1.1+
Petri Lehtinen [Tue, 20 Oct 2009 18:29:16 +0000 (21:29 +0300)]
jansson 1.1
Petri Lehtinen [Tue, 20 Oct 2009 18:23:06 +0000 (21:23 +0300)]
Distribute stripped unit test data
Apparently, it was forgotten to add these files to
test/testdata/Makefile.am in commit
04d550b02e8eadc0c9fb1966fe42fe9fc25f89e0.
Petri Lehtinen [Mon, 19 Oct 2009 18:55:21 +0000 (21:55 +0300)]
Enhance documentation
- Add more information to the documentation front page
- Document how to build the documentation
- Clarify the tutorial a bit and remove some quirks
- Bring README.rst up-to-date
- Small enhancements here and there
raoulh [Mon, 19 Oct 2009 09:14:38 +0000 (02:14 -0700)]
Add C++ guards to jansson.h
Signed-off-by: Petri Lehtinen <petri@digip.org>
Petri Lehtinen [Sat, 17 Oct 2009 11:18:40 +0000 (14:18 +0300)]
doc: Add tutorial
Petri Lehtinen [Fri, 16 Oct 2009 18:20:38 +0000 (21:20 +0300)]
Fix indentation
No functional changes.
Petri Lehtinen [Thu, 15 Oct 2009 18:06:59 +0000 (21:06 +0300)]
json_dumpf: Document the output shortage on error
Petri Lehtinen [Thu, 15 Oct 2009 18:02:27 +0000 (21:02 +0300)]
Enhance handling of circular references
It's now an error to try to add an object or array to itself. The
encoder checks for circular references and fails with an error status
if one is detected.
Petri Lehtinen [Thu, 15 Oct 2009 17:54:32 +0000 (20:54 +0300)]
json_dumps: Close the strbuffer if dumping fails
Petri Lehtinen [Thu, 15 Oct 2009 14:39:49 +0000 (17:39 +0300)]
doc: Fix a small typo in apiref
Petri Lehtinen [Wed, 14 Oct 2009 19:09:14 +0000 (22:09 +0300)]
doc/Makefile.am: Remove *.pyc in clean
Petri Lehtinen [Tue, 13 Oct 2009 19:51:04 +0000 (22:51 +0300)]
Make integer, real and string mutable
Added functions:
json_string_set
json_integer_set
json_real_set
While at it, clarify the documentation and parameter naming of
json_{string,integer,real}_value() a bit.
Petri Lehtinen [Tue, 13 Oct 2009 12:40:26 +0000 (15:40 +0300)]
Don't use non-portable asprintf()
Thanks to Adam Strzelecki for reporting.
Petri Lehtinen [Sun, 11 Oct 2009 18:51:54 +0000 (21:51 +0300)]
Merge branch '1.0'
Conflicts:
configure.ac
doc/conf.py
Petri Lehtinen [Sun, 11 Oct 2009 18:30:12 +0000 (21:30 +0300)]
jansson 1.0.4
Petri Lehtinen [Sat, 10 Oct 2009 19:54:05 +0000 (22:54 +0300)]
Fix API tests for object
Because of a typo in test/testprogs/Makefile.am, the tests for object
were never compiled or run.
Petri Lehtinen [Sat, 10 Oct 2009 18:16:13 +0000 (21:16 +0300)]
Remove config.h.in
It doesn't have to be in version control.
Petri Lehtinen [Sun, 11 Oct 2009 17:42:43 +0000 (20:42 +0300)]
Extend object API
Added functions:
json_object_size
json_object_clear
json_object_update
Petri Lehtinen [Sat, 10 Oct 2009 19:54:05 +0000 (22:54 +0300)]
Fix API tests for object
Because of a typo in test/testprogs/Makefile.am, the tests for object
were never compiled or run.
Petri Lehtinen [Sat, 10 Oct 2009 19:53:36 +0000 (22:53 +0300)]
Check json_object_set_new arguments
A segfault was caused by NULL key.
Petri Lehtinen [Sat, 10 Oct 2009 18:16:13 +0000 (21:16 +0300)]
Remove config.h.in
It doesn't have to be in version control.
Petri Lehtinen [Tue, 6 Oct 2009 10:22:26 +0000 (13:22 +0300)]
Fix a few more compilation issues
These were left out from the previous commit.
Petri Lehtinen [Thu, 1 Oct 2009 18:52:12 +0000 (21:52 +0300)]
Make it compile on platforms where char is unsigned
Linux on powerpc seems to be one such platform.
Petri Lehtinen [Thu, 1 Oct 2009 17:59:59 +0000 (20:59 +0300)]
Relax Autoconf version prereq
From 2.63 to 2.59, which is more widely supported.
Petri Lehtinen [Tue, 29 Sep 2009 18:19:55 +0000 (21:19 +0300)]
Extend array API
Added functions:
json_array_insert
json_array_insert_new
json_array_remove
json_array_clear
json_array_extend
Petri Lehtinen [Sun, 13 Sep 2009 18:56:19 +0000 (21:56 +0300)]
doc: Add getting started guide
Petri Lehtinen [Mon, 14 Sep 2009 12:06:06 +0000 (15:06 +0300)]
Merge branch '1.0'
Conflicts:
configure.ac
doc/conf.py
Petri Lehtinen [Mon, 14 Sep 2009 11:32:41 +0000 (14:32 +0300)]
jansson 1.0.3
Petri Lehtinen [Sun, 13 Sep 2009 10:15:34 +0000 (13:15 +0300)]
load: Check for integer and real overlfows and underflows
Backported from master, commit
5406c2b3d347505149d382213b6f318f8c35de6a:
* deleted test/testdata/invalid-stripped because the stripped tests
don't exist in 1.0
Petri Lehtinen [Fri, 11 Sep 2009 19:22:34 +0000 (22:22 +0300)]
test/json-compare.py: Use json module from Python >=2.6 or simplejson
Backported from master, commit
9d16ec755c9754fe1f79fe55ab719a7f8578ce37
Petri Lehtinen [Sun, 13 Sep 2009 10:15:34 +0000 (13:15 +0300)]
load: Check for integer and real overlfows and underflows
Petri Lehtinen [Sat, 12 Sep 2009 09:49:17 +0000 (12:49 +0300)]
Use unsigned long instead of uint32_t
Some day we will have ANSI C compatibility... This change doesn't make
the API backwards incompatible because uint32_t was only used in flags
to json_dump*() and the flags are meant to be used only by ORing
constants and macro output, and actually currently only JSON_INDENT
can be used.
Petri Lehtinen [Fri, 11 Sep 2009 19:22:34 +0000 (22:22 +0300)]
test/json-compare.py: Use json module from Python >=2.6 or simplejson
Petri Lehtinen [Tue, 8 Sep 2009 13:32:47 +0000 (16:32 +0300)]
Add stripped unit tests for decoder
That is, test cases where there's no newline or other whitespace at
the beginning or end of input. This was implemented by adding a
--strip option to split-testfile to strip the input file after writing
it.
The actual test JSON texts are the same as testdata/invalid and
testdata/valid. The expected output of the invalid cases had to be
adjusted a bit: because there's no newline at the end, some of the
line numbers needed to be changed.
Petri Lehtinen [Tue, 8 Sep 2009 14:02:39 +0000 (17:02 +0300)]
Merge branch '1.0' into HEAD
Conflicts:
configure.ac
doc/conf.py
Petri Lehtinen [Tue, 8 Sep 2009 13:57:45 +0000 (16:57 +0300)]
Distribute CHANGES
Petri Lehtinen [Tue, 8 Sep 2009 13:48:26 +0000 (16:48 +0300)]
jansson 1.0.2
Petri Lehtinen [Tue, 8 Sep 2009 13:22:16 +0000 (16:22 +0300)]
load: Handle EOF correctly
In stream_get(), EOF never got it to stream->buffer and because of
this, stream_unget() failed on some situations. This patch makes
stream_get() handle EOF just like any other byte.
As a "side effect", lex_scan_string() now needs to unget the EOF, or
otherwise it ends up in error message on premature end of input.
Petri Lehtinen [Mon, 7 Sep 2009 18:40:14 +0000 (21:40 +0300)]
Don't perform reference counting on true, false and null
This makes their constructors thread safe. A special reference count
-1 is used to test whether to perform reference counting on a value or
not.
Petri Lehtinen [Mon, 7 Sep 2009 18:25:22 +0000 (21:25 +0300)]
test/.gitignore: Add testprogs/test_simple
Petri Lehtinen [Mon, 7 Sep 2009 18:07:49 +0000 (21:07 +0300)]
doc apiref: Enhancements
Constructors are described more clearly and return values on error
situations more compehensively. Also add an example of the object
iteration protocol.
Petri Lehtinen [Sun, 6 Sep 2009 19:24:55 +0000 (22:24 +0300)]
Better argument validation
All pointer arguments are now tested for NULL. json_string() now also
tests that strdup() succeeds. This is to ensure that no NULL values
end up in data structures.
Also desribe the different sources of errors in documentation.
Petri Lehtinen [Sun, 6 Sep 2009 19:24:22 +0000 (22:24 +0300)]
Don't include unistd.h
It's not needed.
Petri Lehtinen [Sun, 6 Sep 2009 19:16:32 +0000 (22:16 +0300)]
doc apiref: json_incref() returns its argument
Petri Lehtinen [Sun, 6 Sep 2009 11:06:02 +0000 (14:06 +0300)]
Expand test coverage
Now all public API functions are tested (at least on some level) in
the test-api suite.
Petri Lehtinen [Sun, 6 Sep 2009 09:53:38 +0000 (12:53 +0300)]
Merge branch '1.0'
Conflicts:
configure.ac
doc/conf.py
Petri Lehtinen [Sun, 6 Sep 2009 09:45:47 +0000 (12:45 +0300)]
Add CHANGES
Petri Lehtinen [Fri, 4 Sep 2009 17:58:55 +0000 (20:58 +0300)]
jansson 1.0.1
Petri Lehtinen [Fri, 4 Sep 2009 12:21:00 +0000 (15:21 +0300)]
jansson.h: Fix typo
json_is_true was spelled jsin_is_true. Quite fatal.
Petri Lehtinen [Thu, 3 Sep 2009 19:00:33 +0000 (22:00 +0300)]
dump: Optimize indenting
Don't alloca() a whitespace buffer and fill it with spaces in each
call to dump_indent. Instead, use a static whitespace buffer.
As a bonus, this saves the use of poorly portable alloca().
Petri Lehtinen [Thu, 3 Sep 2009 18:30:36 +0000 (21:30 +0300)]
load: Factor out an unneeded strdup
By "stealing" the string parsed out in lexer, one strdup can be saved.
Petri Lehtinen [Thu, 3 Sep 2009 18:20:51 +0000 (21:20 +0300)]
Don't define -std=c99 in AM_CFLAGS
It is not needed.
Petri Lehtinen [Thu, 3 Sep 2009 14:58:05 +0000 (17:58 +0300)]
doc: Fix typo
Petri Lehtinen [Thu, 3 Sep 2009 14:56:00 +0000 (17:56 +0300)]
Add reference stealing functions for inserting values to objects and arrays
The non-stealing functions are now just simple wrappers around these.
Petri Lehtinen [Wed, 2 Sep 2009 20:10:46 +0000 (23:10 +0300)]
Change the version to 1.0+
Petri Lehtinen [Tue, 25 Aug 2009 18:50:47 +0000 (21:50 +0300)]
jansson 1.0
Petri Lehtinen [Tue, 25 Aug 2009 18:24:07 +0000 (21:24 +0300)]
Distribute appropriate files