mirror/stedolan-jq
1
0
Fork 0
mirror of https://github.com/stedolan/jq.git synced 2024-05-11 05:55:39 +00:00
Code Issues Releases Activity

Pretty-printing of JSON values.

Browse Source
This commit is contained in:
Stephen Dolan
2012-09-11 15:51:12 +01:00
parent 51a44edc63
commit d9d6f43407
4 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
c/bytecode.c
View File

@@ -58,7 +58,7 @@ void dump_operation(struct bytecode* bc, uint16_t* codeptr) {
printf(" %04d", pc + imm); printf(" %04d", pc + imm);
} else if (op->flags & OP_HAS_CONSTANT) { } else if (op->flags & OP_HAS_CONSTANT) {
printf(" "); printf(" ");
jv_dump(jv_array_get(jv_copy(bc->constants), imm)); jv_dump(jv_array_get(jv_copy(bc->constants), imm), 0);
} else if (op->flags & OP_HAS_VARIABLE) { } else if (op->flags & OP_HAS_VARIABLE) {
uint16_t v = bc->code[pc++]; uint16_t v = bc->code[pc++];
printf(" v%d", v); printf(" v%d", v);

4
c/jv.h
View File

@@ -102,7 +102,9 @@ jv jv_object_iter_value(jv, int);
int jv_get_refcnt(jv); int jv_get_refcnt(jv);
void jv_dump(jv); enum { JV_PRINT_PRETTY = 1, JV_PRINT_ASCII = 2 };
void jv_dump(jv, int);
jv jv_parse(const char* string); jv jv_parse(const char* string);
jv jv_parse_sized(const char* string, int length); jv jv_parse_sized(const char* string, int length);

50
c/jv_print.c
View File

@@ -64,7 +64,9 @@ static void jv_dump_string(jv str, int ascii_only) {
assert(c != -1); assert(c != -1);
} }
static void jv_dump_term(struct dtoa_context* C, jv x) { enum { INDENT = 2 };
static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent) {
char buf[JVP_DTOA_FMT_MAX_LEN]; char buf[JVP_DTOA_FMT_MAX_LEN];
switch (jv_get_kind(x)) { switch (jv_get_kind(x)) {
case JV_KIND_INVALID: case JV_KIND_INVALID:
@@ -99,33 +101,51 @@ static void jv_dump_term(struct dtoa_context* C, jv x) {
putchar('"'); putchar('"');
break; break;
case JV_KIND_ARRAY: { case JV_KIND_ARRAY: {
printf("["); if (jv_array_length(jv_copy(x)) == 0) {
for (int i=0; i<jv_array_length(jv_copy(x)); i++) { printf("[]");
if (i!=0) printf(", "); break;
jv_dump(jv_array_get(jv_copy(x), i));
} }
printf("[");
if (flags & JV_PRINT_PRETTY) printf("\n%*s", indent+INDENT, "");
for (int i=0; i<jv_array_length(jv_copy(x)); i++) {
if (i!=0) {
if (flags & JV_PRINT_PRETTY) printf(",\n%*s", indent+INDENT, "");
else printf(", ");
}
jv_dump_term(C, jv_array_get(jv_copy(x), i), flags, indent + INDENT);
}
if (flags & JV_PRINT_PRETTY) printf("\n%*s", indent, "");
printf("]"); printf("]");
break; break;
} }
case JV_KIND_OBJECT: { case JV_KIND_OBJECT: {
printf("{"); if (jv_object_length(jv_copy(x)) == 0) {
int first = 1; printf("{}");
for (int i = jv_object_iter(x); jv_object_iter_valid(x,i); i = jv_object_iter_next(x,i)) { break;
if (!first) printf(", ");
first = 0;
jv_dump(jv_object_iter_key(x, i));
printf(": ");
jv_dump(jv_object_iter_value(x, i));
} }
printf("{");
if (flags & JV_PRINT_PRETTY) printf("\n%*s", indent+INDENT, "");
int first = 1;
jv_object_foreach(i, x) {
if (!first) {
if (flags & JV_PRINT_PRETTY) printf(",\n%*s", indent+INDENT, "");
else printf(", ");
}
first = 0;
jv_dump_term(C, jv_object_iter_key(x, i), flags, indent + INDENT);
printf(": ");
jv_dump_term(C, jv_object_iter_value(x, i), flags, indent + INDENT);
}
if (flags & JV_PRINT_PRETTY) printf("\n%*s", indent, "");
printf("}"); printf("}");
} }
} }
jv_free(x); jv_free(x);
} }
void jv_dump(jv x) { void jv_dump(jv x, int flags) {
struct dtoa_context C; struct dtoa_context C;
jvp_dtoa_context_init(&C); jvp_dtoa_context_init(&C);
jv_dump_term(&C, x); jv_dump_term(&C, x, flags, 0);
jvp_dtoa_context_free(&C); jvp_dtoa_context_free(&C);
} }

8
c/main.c
View File

@@ -71,9 +71,9 @@ void run_tests() {
break; break;
} else if (!jv_equal(jv_copy(expected), jv_copy(actual))) { } else if (!jv_equal(jv_copy(expected), jv_copy(actual))) {
printf("Expected "); printf("Expected ");
jv_dump(jv_copy(expected)); jv_dump(jv_copy(expected), 0);
printf(", but got "); printf(", but got ");
jv_dump(jv_copy(actual)); jv_dump(jv_copy(actual), 0);
printf("\n"); printf("\n");
pass = 0; pass = 0;
} }
@@ -84,7 +84,7 @@ void run_tests() {
jv extra = jq_next(); jv extra = jq_next();
if (jv_is_valid(extra)) { if (jv_is_valid(extra)) {
printf("Superfluous result: "); printf("Superfluous result: ");
jv_dump(extra); jv_dump(extra, 0);
printf("\n"); printf("\n");
pass = 0; pass = 0;
} else { } else {
@@ -121,7 +121,7 @@ int main(int argc, char* argv[]) {
jq_init(bc, value); jq_init(bc, value);
jv result; jv result;
while (jv_is_valid(result = jq_next())) { while (jv_is_valid(result = jq_next())) {
jv_dump(result); jv_dump(result, JV_PRINT_PRETTY);
printf("\n"); printf("\n");
} }
jv_free(result); jv_free(result);