katkak/json
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: katkak:e2ba1175db46a8a5961b76197d62d6379c811665
Branches Tags
katkak:master
..
compare: katkak:f0f33c4ac7ef6ff5affd73541affe6fd79480c88
Branches Tags
katkak:master

No commits in common. "e2ba1175db46a8a5961b76197d62d6379c811665" and "f0f33c4ac7ef6ff5affd73541affe6fd79480c88" have entirely different histories.
e2ba1175db ... f0f33c4ac7

12 changed files with 8 additions and 333 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -6,8 +6,6 @@ project(
C
)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
add_library(
${PROJECT_NAME}
json.c

2
example/main.c
View file

@ -4,7 +4,7 @@
int main()
{
auto json = json_init(stdout, MINIFIED, false);
auto json = json_init(stdout, INDENT_2);
json_begin_object(&json);
{

1
flake.nix
View file

@ -27,7 +27,6 @@
clang-tools
ctags
valgrind
cdecl
];
in
{

9
json.c
View file

@ -4,14 +4,13 @@
#define UNREACHABLE() assert(false)
Json json_init(FILE* stream, Whitespace whitespace, bool comma_separate)
Json json_init(FILE* stream, Whitespace whitespace)
{
return (Json){
.stream = stream,
.whitespace = whitespace,
.indent_level = 0,
.next_punctuation = BEGINNING,
.comma_separate = comma_separate,
};
}
@ -170,11 +169,7 @@ void begin_value(Json* json)
/// End a JSON value.
void end_value(Json* json)
{
if (json->indent_level > 0 || json->comma_separate) {
json->next_punctuation = COMMA;
} else {
json->next_punctuation = BEGINNING;
}
json->next_punctuation = COMMA;
}
/// Increment the indent level by one.

11
json.h
View file

@ -25,10 +25,9 @@ typedef struct Json {
Whitespace whitespace;
int indent_level;
Punctuation next_punctuation;
bool comma_separate;
} Json;
Json json_init(FILE* stream, Whitespace whitespace, bool comma_separate);
Json json_init(FILE* stream, Whitespace whitespace);
void json_free(Json* json);
void json_begin_array(Json* json);
@ -42,13 +41,5 @@ void json_add_double(Json* json, double value);
void json_add_bool(Json* json, bool value);
void json_add_null(Json* json);
#define json_add_number(json, value) \
_Generic( \
(value), \
int: json_add_long((json), (long)value), \
long: json_add_long((json), value), \
float: json_add_double((json), (double)value), \
double: json_add_double((json), value))
#endif // JSON_H

2
tests/CMakeLists.txt
View file

@ -13,8 +13,6 @@ list(
json_tests_array
json_tests_object
json_tests_complex
json_tests_comma_separated
json_tests_non_comma_separated
)
foreach(JSON_TEST IN LISTS JSON_TESTS)
add_executable(

2
tests/json_tests_array.c
View file

@ -15,7 +15,7 @@ void setUp()
tmp = tmpfile();
TEST_ASSERT_NOT_NULL(tmp);
json = json_init(tmp, MINIFIED, false);
json = json_init(tmp, MINIFIED);
}
void tearDown()

147
tests/json_tests_comma_separated.c
View file

@ -1,147 +0,0 @@
#include <stdio.h>
#include <string.h>
#include <unity.h>
#include <json.h>
static FILE* tmp = nullptr;
static char buffer[256];
static Json json;
void setUp()
{
tmp = tmpfile();
TEST_ASSERT_NOT_NULL(tmp);
json = json_init(tmp, MINIFIED, true);
}
void tearDown()
{
json_free(&json);
if (tmp) {
fclose(tmp);
tmp = nullptr;
}
}
void test_json_comma_separated_string()
{
json_add_string(&json, "one");
json_add_string(&json, "two");
fflush(tmp);
rewind(tmp);
auto n = fread(buffer, 1, sizeof(buffer) - 1, tmp);
buffer[n] = '\0';
TEST_ASSERT_EQUAL_STRING("\"one\",\"two\"", buffer);
}
void test_json_comma_separated_long()
{
json_add_long(&json, 42);
json_add_long(&json, 67);
fflush(tmp);
rewind(tmp);
auto n = fread(buffer, 1, sizeof(buffer) - 1, tmp);
buffer[n] = '\0';
TEST_ASSERT_EQUAL_STRING("42,67", buffer);
}
void test_json_comma_separated_double()
{
json_add_double(&json, 3.14);
json_add_double(&json, 6.28);
fflush(tmp);
rewind(tmp);
auto n = fread(buffer, 1, sizeof(buffer) - 1, tmp);
buffer[n] = '\0';
TEST_ASSERT_EQUAL_STRING("3.14,6.28", buffer);
}
void test_json_comma_separated_bool()
{
json_add_bool(&json, true);
json_add_bool(&json, false);
fflush(tmp);
rewind(tmp);
auto n = fread(buffer, 1, sizeof(buffer) - 1, tmp);
buffer[n] = '\0';
TEST_ASSERT_EQUAL_STRING("true,false", buffer);
}
void test_json_comma_separated_null()
{
json_add_null(&json);
json_add_null(&json);
fflush(tmp);
rewind(tmp);
auto n = fread(buffer, 1, sizeof(buffer) - 1, tmp);
buffer[n] = '\0';
TEST_ASSERT_EQUAL_STRING("null,null", buffer);
}
void test_json_comma_separated_object()
{
for (int i = 0; i < 2; ++i) {
json_begin_object(&json);
{
json_add_object_field(&json, "test");
json_add_number(&json, i);
}
json_end_object(&json);
}
fflush(tmp);
rewind(tmp);
auto n = fread(buffer, 1, sizeof(buffer) - 1, tmp);
buffer[n] = '\0';
TEST_ASSERT_EQUAL_STRING("{\"test\":0},{\"test\":1}", buffer);
}
void test_json_comma_separated_array()
{
for (int i = 0; i < 2; ++i) {
json_begin_array(&json);
{
json_add_number(&json, i);
}
json_end_array(&json);
}
fflush(tmp);
rewind(tmp);
auto n = fread(buffer, 1, sizeof(buffer) - 1, tmp);
buffer[n] = '\0';
TEST_ASSERT_EQUAL_STRING("[0],[1]", buffer);
}
int main()
{
UNITY_BEGIN();
{
RUN_TEST(test_json_comma_separated_string);
RUN_TEST(test_json_comma_separated_long);
RUN_TEST(test_json_comma_separated_double);
RUN_TEST(test_json_comma_separated_bool);
RUN_TEST(test_json_comma_separated_null);
RUN_TEST(test_json_comma_separated_object);
RUN_TEST(test_json_comma_separated_array);
}
return UNITY_END();
}

2
tests/json_tests_complex.c
View file

@ -15,7 +15,7 @@ void setUp()
tmp = tmpfile();
TEST_ASSERT_NOT_NULL(tmp);
json = json_init(tmp, INDENT_TAB, false);
json = json_init(tmp, INDENT_TAB);
}
void tearDown()

147
tests/json_tests_non_comma_separated.c
View file

@ -1,147 +0,0 @@
#include <stdio.h>
#include <string.h>
#include <unity.h>
#include <json.h>
static FILE* tmp = nullptr;
static char buffer[256];
static Json json;
void setUp()
{
tmp = tmpfile();
TEST_ASSERT_NOT_NULL(tmp);
json = json_init(tmp, MINIFIED, false);
}
void tearDown()
{
json_free(&json);
if (tmp) {
fclose(tmp);
tmp = nullptr;
}
}
void test_json_non_comma_separated_string()
{
json_add_string(&json, "one");
json_add_string(&json, "two");
fflush(tmp);
rewind(tmp);
auto n = fread(buffer, 1, sizeof(buffer) - 1, tmp);
buffer[n] = '\0';
TEST_ASSERT_EQUAL_STRING("\"one\"\"two\"", buffer);
}
void test_json_non_comma_separated_long()
{
json_add_long(&json, 42);
json_add_long(&json, 67);
fflush(tmp);
rewind(tmp);
auto n = fread(buffer, 1, sizeof(buffer) - 1, tmp);
buffer[n] = '\0';
TEST_ASSERT_EQUAL_STRING("4267", buffer);
}
void test_json_non_comma_separated_double()
{
json_add_double(&json, 3.14);
json_add_double(&json, 6.28);
fflush(tmp);
rewind(tmp);
auto n = fread(buffer, 1, sizeof(buffer) - 1, tmp);
buffer[n] = '\0';
TEST_ASSERT_EQUAL_STRING("3.146.28", buffer);
}
void test_json_non_comma_separated_bool()
{
json_add_bool(&json, true);
json_add_bool(&json, false);
fflush(tmp);
rewind(tmp);
auto n = fread(buffer, 1, sizeof(buffer) - 1, tmp);
buffer[n] = '\0';
TEST_ASSERT_EQUAL_STRING("truefalse", buffer);
}
void test_json_non_comma_separated_null()
{
json_add_null(&json);
json_add_null(&json);
fflush(tmp);
rewind(tmp);
auto n = fread(buffer, 1, sizeof(buffer) - 1, tmp);
buffer[n] = '\0';
TEST_ASSERT_EQUAL_STRING("nullnull", buffer);
}
void test_json_non_comma_separated_object()
{
for (int i = 0; i < 2; ++i) {
json_begin_object(&json);
{
json_add_object_field(&json, "test");
json_add_number(&json, i);
}
json_end_object(&json);
}
fflush(tmp);
rewind(tmp);
auto n = fread(buffer, 1, sizeof(buffer) - 1, tmp);
buffer[n] = '\0';
TEST_ASSERT_EQUAL_STRING("{\"test\":0}{\"test\":1}", buffer);
}
void test_json_non_comma_separated_array()
{
for (int i = 0; i < 2; ++i) {
json_begin_array(&json);
{
json_add_number(&json, i);
}
json_end_array(&json);
}
fflush(tmp);
rewind(tmp);
auto n = fread(buffer, 1, sizeof(buffer) - 1, tmp);
buffer[n] = '\0';
TEST_ASSERT_EQUAL_STRING("[0][1]", buffer);
}
int main()
{
UNITY_BEGIN();
{
RUN_TEST(test_json_non_comma_separated_string);
RUN_TEST(test_json_non_comma_separated_long);
RUN_TEST(test_json_non_comma_separated_double);
RUN_TEST(test_json_non_comma_separated_bool);
RUN_TEST(test_json_non_comma_separated_null);
RUN_TEST(test_json_non_comma_separated_object);
RUN_TEST(test_json_non_comma_separated_array);
}
return UNITY_END();
}

2
tests/json_tests_object.c
View file

@ -15,7 +15,7 @@ void setUp()
tmp = tmpfile();
TEST_ASSERT_NOT_NULL(tmp);
json = json_init(tmp, MINIFIED, false);
json = json_init(tmp, MINIFIED);
}
void tearDown()

14
tests/json_tests_simple.c
View file

@ -15,7 +15,7 @@ void setUp()
tmp = tmpfile();
TEST_ASSERT_NOT_NULL(tmp);
json = json_init(tmp, MINIFIED, false);
json = json_init(tmp, MINIFIED);
}
void tearDown()
@ -64,18 +64,6 @@ void test_json_add_double()
TEST_ASSERT_EQUAL_STRING("3.14", buffer);
}
void test_json_add_number()
{
json_add_number(&json, 3.14f);
fflush(tmp);
rewind(tmp);
auto n = fread(buffer, 1, sizeof(buffer) - 1, tmp);
buffer[n] = '\0';
TEST_ASSERT_EQUAL_STRING("3.14", buffer);
}
void test_json_add_bool()
{
json_add_bool(&json, true);