mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-05 05:19:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

When serializing with JSON_C_TO_STRING_PRETTY set, keep the opening and closing curly or square braces on same line for empty objects or arrays. Issue #778.

Browse Source
This commit is contained in:
Eric Haszlakiewicz
2022-07-30 19:27:14 +00:00
parent 2e9b7456a5
commit 9749b0cb66
9 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@@ -1,4 +1,21 @@
0.17 (future release)
========================================
Deprecated and removed features:
--------------------------------
* ...
New features
------------
* ...
Significant changes and bug fixes
---------------------------------
* When serializing with JSON_C_TO_STRING_PRETTY set, keep the opening and
closing curly or square braces on same line for empty objects or arrays.
0.16 (up to commit 66dcdf5, 2022-04-13) 0.16 (up to commit 66dcdf5, 2022-04-13)
======================================== ========================================

22
json_object.c
View File

@@ -460,16 +460,14 @@ static int json_object_object_to_json_string(struct json_object *jso, struct pri
struct json_object_iter iter; struct json_object_iter iter;
printbuf_strappend(pb, "{" /*}*/); printbuf_strappend(pb, "{" /*}*/);
if (flags & JSON_C_TO_STRING_PRETTY)
printbuf_strappend(pb, "\n");
json_object_object_foreachC(jso, iter) json_object_object_foreachC(jso, iter)
{ {
if (had_children) if (had_children)
{ {
printbuf_strappend(pb, ","); printbuf_strappend(pb, ",");
if (flags & JSON_C_TO_STRING_PRETTY)
printbuf_strappend(pb, "\n");
} }
if (flags & JSON_C_TO_STRING_PRETTY)
printbuf_strappend(pb, "\n");
had_children = 1; had_children = 1;
if (flags & JSON_C_TO_STRING_SPACED && !(flags & JSON_C_TO_STRING_PRETTY)) if (flags & JSON_C_TO_STRING_SPACED && !(flags & JSON_C_TO_STRING_PRETTY))
printbuf_strappend(pb, " "); printbuf_strappend(pb, " ");
@@ -485,10 +483,9 @@ static int json_object_object_to_json_string(struct json_object *jso, struct pri
else if (iter.val->_to_json_string(iter.val, pb, level + 1, flags) < 0) else if (iter.val->_to_json_string(iter.val, pb, level + 1, flags) < 0)
return -1; return -1;
} }
if (flags & JSON_C_TO_STRING_PRETTY) if ((flags & JSON_C_TO_STRING_PRETTY) && had_children)
{ {
if (had_children) printbuf_strappend(pb, "\n");
printbuf_strappend(pb, "\n");
indent(pb, level, flags); indent(pb, level, flags);
} }
if (flags & JSON_C_TO_STRING_SPACED && !(flags & JSON_C_TO_STRING_PRETTY)) if (flags & JSON_C_TO_STRING_SPACED && !(flags & JSON_C_TO_STRING_PRETTY))
@@ -1381,17 +1378,15 @@ static int json_object_array_to_json_string(struct json_object *jso, struct prin
size_t ii; size_t ii;
printbuf_strappend(pb, "["); printbuf_strappend(pb, "[");
if (flags & JSON_C_TO_STRING_PRETTY)
printbuf_strappend(pb, "\n");
for (ii = 0; ii < json_object_array_length(jso); ii++) for (ii = 0; ii < json_object_array_length(jso); ii++)
{ {
struct json_object *val; struct json_object *val;
if (had_children) if (had_children)
{ {
printbuf_strappend(pb, ","); printbuf_strappend(pb, ",");
if (flags & JSON_C_TO_STRING_PRETTY)
printbuf_strappend(pb, "\n");
} }
if (flags & JSON_C_TO_STRING_PRETTY)
printbuf_strappend(pb, "\n");
had_children = 1; had_children = 1;
if (flags & JSON_C_TO_STRING_SPACED && !(flags & JSON_C_TO_STRING_PRETTY)) if (flags & JSON_C_TO_STRING_SPACED && !(flags & JSON_C_TO_STRING_PRETTY))
printbuf_strappend(pb, " "); printbuf_strappend(pb, " ");
@@ -1402,10 +1397,9 @@ static int json_object_array_to_json_string(struct json_object *jso, struct prin
else if (val->_to_json_string(val, pb, level + 1, flags) < 0) else if (val->_to_json_string(val, pb, level + 1, flags) < 0)
return -1; return -1;
} }
if (flags & JSON_C_TO_STRING_PRETTY) if ((flags & JSON_C_TO_STRING_PRETTY) && had_children)
{ {
if (had_children) printbuf_strappend(pb, "\n");
printbuf_strappend(pb, "\n");
indent(pb, level, flags); indent(pb, level, flags);
} }

5
tests/test1.c
View File

@@ -311,6 +311,11 @@ int main(int argc, char **argv)
{ {
printf("\t%s: %s\n", key, json_object_to_json_string(val)); printf("\t%s: %s\n", key, json_object_to_json_string(val));
} }
json_object *empty_array = json_object_new_array();
json_object *empty_obj = json_object_new_object();
json_object_object_add(my_object, "empty_array", empty_array);
json_object_object_add(my_object, "empty_obj", empty_obj);
printf("my_object.to_string()=%s\n", json_object_to_json_string(my_object)); printf("my_object.to_string()=%s\n", json_object_to_json_string(my_object));
json_object_put(my_array); json_object_put(my_array);

2
tests/test1.expected
View File

@@ -75,4 +75,4 @@ my_object=
foo: "bar" foo: "bar"
bool0: false bool0: false
bool1: true bool1: true
my_object.to_string()={ "abc": 12, "foo": "bar", "bool0": false, "bool1": true } my_object.to_string()={ "abc": 12, "foo": "bar", "bool0": false, "bool1": true, "empty_array": [ ], "empty_obj": { } }

2
tests/test1Formatted_plain.expected
View File

@@ -75,4 +75,4 @@ my_object=
foo: "bar" foo: "bar"
bool0: false bool0: false
bool1: true bool1: true
my_object.to_string()={"abc":12,"foo":"bar","bool0":false,"bool1":true} my_object.to_string()={"abc":12,"foo":"bar","bool0":false,"bool1":true,"empty_array":[],"empty_obj":{}}

4
tests/test1Formatted_pretty.expected
View File

@@ -97,5 +97,7 @@ my_object.to_string()={
"abc":12, "abc":12,
"foo":"bar", "foo":"bar",
"bool0":false, "bool0":false,
"bool1":true "bool1":true,
"empty_array":[],
"empty_obj":{}
} }

2
tests/test1Formatted_spaced.expected
View File

@@ -75,4 +75,4 @@ my_object=
foo: "bar" foo: "bar"
bool0: false bool0: false
bool1: true bool1: true
my_object.to_string()={ "abc": 12, "foo": "bar", "bool0": false, "bool1": true } my_object.to_string()={ "abc": 12, "foo": "bar", "bool0": false, "bool1": true, "empty_array": [ ], "empty_obj": { } }

4
tests/test1Formatted_spaced_pretty.expected
View File

@@ -97,5 +97,7 @@ my_object.to_string()={
"abc": 12, "abc": 12,
"foo": "bar", "foo": "bar",
"bool0": false, "bool0": false,
"bool1": true "bool1": true,
"empty_array": [],
"empty_obj": {}
} }

4
tests/test1Formatted_spaced_pretty_pretty_tab.expected
View File

@@ -97,5 +97,7 @@ my_object.to_string()={
"abc": 12, "abc": 12,
"foo": "bar", "foo": "bar",
"bool0": false, "bool0": false,
"bool1": true "bool1": true,
"empty_array": [],
"empty_obj": {}
} }