ich777/cdogs-sdl
1
0
Fork 0
mirror of https://github.com/cxong/cdogs-sdl.git synced 2025-07-23 07:23:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Save small JSON arrays in one line

Browse Source
This commit is contained in:
Cong
2020-04-15 21:16:45 +10:00
parent 3a89ba6280
commit b10ab66771
3 changed files with 2325 additions and 4533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6795
missions/doom.cdogscpn/missions.json
View File

File diff suppressed because it is too large Load Diff

49
src/json/json.c
View File

@@ -20,6 +20,7 @@
#include "json.h"
#include <stdbool.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -1058,6 +1059,7 @@ json_format_string (const char *text)
text_length = strlen (text);
output = rcs_create (text_length);
bool in_small_array = false;
while (pos < text_length)
{
switch (text[pos])
@@ -1069,7 +1071,41 @@ json_format_string (const char *text)
pos++;
break;
case '[':
{
int num_elements = 0;
// Read ahead to see if this is a big array
for (size_t pos_i = pos; pos_i < text_length && num_elements <= 2; pos_i++)
{
if (text[pos_i] == ']')
{
num_elements++;
break;
}
if (text[pos_i] == ',')
{
num_elements++;
}
if (text[pos_i] == '{')
{
num_elements = 999;
break;
}
}
in_small_array = num_elements <= 2;
}
rcs_catc(output, text[pos]);
pos++;
break;
case ']':
in_small_array = false;
rcs_catc(output, text[pos]);
pos++;
break;
case '{':
in_small_array = false;
indentation++;
rcs_catcs (output, "{\n", 2);
for (i = 0; i < indentation; i++)
@@ -1096,10 +1132,17 @@ json_format_string (const char *text)
break;
case ',':
rcs_catcs (output, ",\n", 2);
for (i = 0; i < indentation; i++)
if (in_small_array)
{
rcs_catc (output, '\t');
rcs_catcs(output, ", ", 2);
}
else
{
rcs_catcs(output, ",\n", 2);
for (i = 0; i < indentation; i++)
{
rcs_catc(output, '\t');
}
}
pos++;
break;

14
src/tests/json_test.c
View File

@@ -62,6 +62,20 @@ FEATURE(json_format_string, "String format")
json_free_value(&root);
json_free_value(&parsed);
SCENARIO_END
SCENARIO("Small arrays")
GIVEN("a JSON string with a small array")
const char *text = "[1, 2]";
WHEN("I format the string")
char *ftext = json_format_string(text);
THEN("the result should have the array on one line")
SHOULD_STR_EQUAL(ftext, "[1, 2]");
CFREE(ftext);
SCENARIO_END
FEATURE_END
CBEHAVE_RUN("JSON features are:", TEST_FEATURE(json_format_string))