diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2014-03-07 23:06:57 -0800 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2014-03-07 23:06:57 -0800 |
| commit | 8103138a80969ca52386e842598b0ce55e4166ab (patch) | |
| tree | 369fad307524a1929f1a8036741e0080f0ed1195 | |
| parent | 8b3a20db2fdff032d75af5594e02287b47a6edf9 (diff) | |
| download | txr-8103138a80969ca52386e842598b0ce55e4166ab.tar.gz txr-8103138a80969ca52386e842598b0ce55e4166ab.tar.bz2 txr-8103138a80969ca52386e842598b0ce55e4166ab.zip | |
* 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.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | match.c | 4 |
2 files changed, 11 insertions, 2 deletions
@@ -1,5 +1,14 @@ 2014-03-07 Kaz Kylheku <kaz@kylheku.com> + * 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 <kaz@kylheku.com> + Version 84 * txr.c (version): Bumped. @@ -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) \ |