Json object split #632

hawicz · 2020-06-07T18:55:35Z

https://github.com/json-c/json-c/wiki/Proposal:-struct-json_object-split

An internal-only change (no public API differences) to split struct json_object into a base type (still called struct json_object) and several sub-types:

struct json_object_object
struct json_object_array
struct json_object_boolean
struct json_object_double
struct json_object_int
struct json_object_string

Changes are largely confined to json_object.c and json_object_private.h
As mentioned in the ChangeLog, this improves memory usage and processing speed.

…ed at https://github.com/json-c/json-c/wiki/Proposal:-struct-json_object-split The current changes split out _only_ json_type_object, and thus have a number of hacks to allow the code to continue to build and work. Originally mentioned in issue #535. When complete, this will probably invalidate #552. This is likely to cause notable conflicts in any other significant un-merged changes, such as PR#620.

…ep_copy test.

Clean up the code in json_object_new_* a bit by dropping unnecesary json_object_base variables.

The default is now that string data is stored inline at the end of json_object, though to allow for json_object_set_string() to set a _longer_ string, we still need to allow for the possibility of a separate char * pointer. All json types have been split out now, next step it cleanup.

…ctionally complete. Remove all of the temporary defines, structures, old compat fuctions, extra fields, etc... that were needed during the conversion to a split set of json_object_* structures.

…h so as not to affect publically exposed symbols.

…Log.

coveralls · 2020-06-07T19:04:05Z

Coverage increased (+0.4%) to 87.332% when pulling 0710c83 on json_object-split into bc06f82 on master.

dota17 · 2020-06-13T02:58:02Z

Sorry for the delay in the review.

json_object_private.h

json_object.c

json_object_private.h

json_object.c

…n a comment.

@dota17

…ific delete functions directly from json_object_put. (Thanks @dota17 for the suggestion in PR #632!)

hawicz added 15 commits May 25, 2020 03:18

Kick json_type_array out of struct json_object; re-enable the test_de…

02b687b

…ep_copy test.

Add some backwards compat for Visual Studio 2013.

5d89fc8

Kick json_type_boolean out of struct json_object.

d1f83bf

Declare variables earlier, to appease Visual Studio 2010.

0351bb5

Kick json_type_int and json_type_double out of struct json_object.

9ecb122

Clean up the code in json_object_new_* a bit by dropping unnecesary json_object_base variables.

On MSVC, add a ssize_t typedef using SSIZE_T from BaseTsd.h

b0466b6

Change CMakeLists.txt to look for SSIZE_T on MSVC too.

eab1375

Fix typo in previous commit to check for SSIZE_T on MSVC.

0a16b23

More fixes for old MSVC builds.

c4cc673

The split of json_object into type-specific sub-structures is now fun…

66d91fd

…ctionally complete. Remove all of the temporary defines, structures, old compat fuctions, extra fields, etc... that were needed during the conversion to a split set of json_object_* structures.

Move the ssize_t typedef from json_inttypes.h to json_object_private.…

ecdfeb1

…h so as not to affect publically exposed symbols.

Summarize the changes from the json_object-split branch in the Change…

02fe2e0

…Log.

Eliminate unnecessary cast that was added to test_double_serializer.

85c244f

hawicz requested a review from dota17 June 7, 2020 18:55