diff options
author | Nicolas Williams <nico@cryptonector.com> | 2014-11-28 18:56:06 -0600 |
---|---|---|
committer | Nicolas Williams <nico@cryptonector.com> | 2014-11-28 19:26:41 -0600 |
commit | b349e7d9a80435e177d383c8ff9d552d15a96723 (patch) | |
tree | 8b2bd30ec7e2c2e799de757303c8c6120a497f01 | |
parent | 30e00820a7cd6a198bc24a0499ee5c3ceb38ae75 (diff) |
Print stack value refcounts when tracing (#636)
-rw-r--r-- | jq_test.c | 2 | ||||
-rw-r--r-- | jv.h | 9 | ||||
-rw-r--r-- | jv_print.c | 15 |
3 files changed, 24 insertions, 2 deletions
@@ -73,7 +73,7 @@ static void run_jq_tests(FILE *testdata) { printf("\n"); pass = 0; } - jv as_string = jv_dump_string(jv_copy(expected), rand() & ~JV_PRINT_COLOUR); + jv as_string = jv_dump_string(jv_copy(expected), rand() & ~(JV_PRINT_COLOUR|JV_PRINT_REFCOUNT)); jv reparsed = jv_parse_sized(jv_string_value(as_string), jv_string_length_bytes(jv_copy(as_string))); assert(jv_equal(jv_copy(expected), jv_copy(reparsed))); jv_free(as_string); @@ -150,7 +150,14 @@ jv jv_object_iter_value(jv, int); int jv_get_refcnt(jv); -enum { JV_PRINT_PRETTY = 1, JV_PRINT_ASCII = 2, JV_PRINT_COLOUR = 4, JV_PRINT_SORTED = 8, JV_PRINT_INVALID = 16 }; +enum { + JV_PRINT_PRETTY = 1, + JV_PRINT_ASCII = 2, + JV_PRINT_COLOUR = 4, + JV_PRINT_SORTED = 8, + JV_PRINT_INVALID = 16, + JV_PRINT_REFCOUNT = 32, +}; void jv_dumpf(jv, FILE *f, int flags); void jv_dump(jv, int flags); void jv_show(jv, int flags); @@ -112,9 +112,18 @@ static void jvp_dump_string(jv str, int ascii_only, FILE* F, jv* S) { enum { INDENT = 2 }; +static void put_refcnt(struct dtoa_context* C, int refcnt, FILE *F, jv* S){ + char buf[JVP_DTOA_FMT_MAX_LEN]; + put_char(' ', F, S); + put_char('(', F, S); + put_str(jvp_dtoa_fmt(C, buf, refcnt), F, S); + put_char(')', F, S); +} + static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FILE* F, jv* S) { char buf[JVP_DTOA_FMT_MAX_LEN]; const char* colour = 0; + double refcnt = (flags & JV_PRINT_REFCOUNT) ? jv_get_refcnt(x) - 1 : -1; if (flags & JV_PRINT_COLOUR) { for (unsigned i=0; i<sizeof(colour_kinds)/sizeof(colour_kinds[0]); i++) { if (jv_get_kind(x) == colour_kinds[i]) { @@ -164,6 +173,8 @@ static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FI } case JV_KIND_STRING: jvp_dump_string(x, flags & JV_PRINT_ASCII, F, S); + if (flags & JV_PRINT_REFCOUNT) + put_refcnt(C, refcnt, F, S); break; case JV_KIND_ARRAY: { if (jv_array_length(jv_copy(x)) == 0) { @@ -193,6 +204,8 @@ static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FI } if (colour) put_str(colour, F, S); put_char(']', F, S); + if (flags & JV_PRINT_REFCOUNT) + put_refcnt(C, refcnt, F, S); break; } case JV_KIND_OBJECT: { @@ -263,6 +276,8 @@ static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FI } if (colour) put_str(colour, F, S); put_char('}', F, S); + if (flags & JV_PRINT_REFCOUNT) + put_refcnt(C, refcnt, F, S); } } jv_free(x); |