From 28b0a361363acbd9a2d291d82e145fb3757ed9f8 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 5 Jan 2026 15:18:50 +0100 Subject: Add \t and improve printing of text, and print the input text when PRINT_ACTIONS used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- libparser.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) (limited to 'libparser.c') diff --git a/libparser.c b/libparser.c index 5ecb7ee..2a925b7 100644 --- a/libparser.c +++ b/libparser.c @@ -362,6 +362,54 @@ print_state(struct context *ctx) } +static int +print_text(const char *text, size_t textlen) +{ + size_t off = 0, n = 0; + int len, ret = 0; + + while (off + n < textlen) { + if (!text[off + n]) + break; + if (text[off + n] < ' ' || text[off + n] >= 0x7F || + text[off + n] == '"' || text[off + n] == '\\') { + fprintf(stderr, "%.*s%n", (int)n, &text[off], &len); + ret += len; + off += n; + n = 0; + switch (text[off]) { + case '\\': fprintf(stderr, "\\\\%n", &len); break; + case '\"': fprintf(stderr, "\\\"%n", &len); break; + case '\a': fprintf(stderr, "\\a%n", &len); break; + case '\b': fprintf(stderr, "\\b%n", &len); break; + case '\f': fprintf(stderr, "\\f%n", &len); break; + case '\n': fprintf(stderr, "\\n%n", &len); break; + case '\r': fprintf(stderr, "\\r%n", &len); break; + case '\t': fprintf(stderr, "\\t%n", &len); break; + case '\v': fprintf(stderr, "\\v%n", &len); break; + default: + fprintf(stderr, "\\x%02X%n", +(unsigned char)text[off], &len); + break; + } + off++; + } else if (n == 4096U) { + fprintf(stderr, "%.*s%n", (int)n, &text[off], &len); + ret += len; + off += n; + n = 0; + } else { + n++; + } + } + if (n) { + fprintf(stderr, "%.*s%n", (int)n, &text[off], &len); + ret += len; + } + + return ret; +} + + static int print_sentence(const union libparser_sentence *sentence, int indent) { @@ -431,7 +479,9 @@ print_sentence(const union libparser_sentence *sentence, int indent) break; case LIBPARSER_SENTENCE_TYPE_STRING: - fprintf(stderr, "\"%.*s\"%n", (int)sentence->string.length, sentence->string.string, &len); + fprintf(stderr, "\"%n", &len); + indent += len + print_text(sentence->string.string, sentence->string.length); + fprintf(stderr, "\"%n", &len); indent += len; break; @@ -1200,6 +1250,9 @@ libparser_parse_file(const struct libparser_rule *const rules[], const char *dat #if PRINT_ACTIONS print_grammar(rules); + fprintf(stderr, "Input text: \""); + print_text(ctx.data, ctx.length); + fprintf(stderr, "\"\n"); #endif /* TODO guard against left-side recursion */ -- cgit v1.2.3-70-g09d2