From 8103138a80969ca52386e842598b0ce55e4166ab Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Fri, 7 Mar 2014 23:06:57 -0800 Subject: * match.c (LOG_MATCH, LOG_MISMATCH): Wouldn't you know it; the format strings in these macros contained a workaround for the broken * variable field width syntax, specifying ~*~a where the extra ~ in the middle just feeds a character that the broken state machine expects. These workarounds broke when I fixed the formatting, making -v mode useless. --- ChangeLog | 9 +++++++++ match.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7b1842b..4ff48142 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2014-03-07 Kaz Kylheku + + * match.c (LOG_MATCH, LOG_MISMATCH): Wouldn't you know it; + the format strings in these macros contained a workaround for + the broken * variable field width syntax, specifying + ~*~a where the extra ~ in the middle just feeds a character + that the broken state machine expects. These workarounds broke when I + fixed the formatting, making -v mode useless. + 2014-03-07 Kaz Kylheku Version 84 diff --git a/match.c b/match.c index f3f7a642..9f11019c 100644 --- a/match.c +++ b/match.c @@ -407,14 +407,14 @@ typedef val (*h_match_func)(match_line_ctx *c); plus(c->pos, c->base), c->file, c->data_lineno, nao); \ debuglf(elem, lit(" ~a"), c->dataline, nao); \ if (c_num(c->pos) < 77) \ - debuglf(elem, lit(" ~*~a^"), c->pos, lit(""), nao) + debuglf(elem, lit(" ~*a^"), c->pos, lit(""), nao) #define LOG_MATCH(KIND, EXTENT) \ debuglf(elem, lit(KIND " matched, position ~a-~a (~a:~a)"), \ plus(c->pos, c->base), EXTENT, c->file, c->data_lineno, nao); \ debuglf(elem, lit(" ~a"), c->dataline, nao); \ if (c_num(EXTENT) < 77) \ - debuglf(elem, lit(" ~*~a~<*~a^"), c->pos, lit(""), \ + debuglf(elem, lit(" ~*a~<*a^"), c->pos, lit(""), \ minus(EXTENT, c->pos), lit("^"), nao) #define elem_bind(elem_var, directive_var, specline) \ -- cgit v1.2.3