diff options
| -rw-r--r-- | bpeg.c | 5 | ||||
| -rw-r--r-- | vm.h | 2 |
2 files changed, 3 insertions, 4 deletions
@@ -14,6 +14,7 @@ #include "compiler.h" #include "file_loader.h" #include "grammar.h" +#include "json.h" #include "utils.h" #include "viz.h" #include "vm.h" @@ -89,7 +90,7 @@ static int run_match(grammar_t *g, const char *filename, vm_op_t *pattern, unsig printf("{\"filename\":\"%s\",", filename ? filename : "-"); printf("\"tree\":{\"rule\":\"text\",\"start\":%d,\"end\":%ld,\"children\":[", 0, f->end - f->contents); - json_match(stdout, f->contents, m, (flags & BPEG_VERBOSE) ? 1 : 0); + json_match(f->contents, m, (flags & BPEG_VERBOSE) ? 1 : 0); printf("]}}\n"); } else { if (printed_matches > 1) @@ -239,7 +240,7 @@ int main(int argc, char *argv[]) // Piped in input: ret &= run_match(g, NULL, pattern, flags); } - if (flags & BPEG_JSON) printf("]"); + if (flags & BPEG_JSON) printf("]\n"); return ret; } @@ -18,8 +18,6 @@ __attribute__((nonnull)) void destroy_match(match_t **m); __attribute__((nonnull)) void print_match(file_t *f, match_t *m, print_options_t options); -__attribute__((nonnull)) -void json_match(FILE *f, const char *text, match_t *m, int verbose); #endif // vim: ts=4 sw=0 et cino=L2,l1,(0,W4,m1 |
