From c2e6f63f8322f454df9caefe06697f1d348bc8c0 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 22 Jul 2014 07:56:49 -0700 Subject: * match.c (subst_vars): Bugfix: I neglected to apply the filter which is in effect to the result of interpolating a TXR Lisp expression, oops! --- ChangeLog | 6 ++++++ match.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index feadfebe..c9727aa7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-07-22 Kaz Kylheku + + * match.c (subst_vars): Bugfix: I neglected to apply the + filter which is in effect to the result of interpolating a TXR Lisp + expression, oops! + 2014-07-22 Kaz Kylheku * parser.y (METANUM): Forgotten %right declaration for this diff --git a/match.c b/match.c index 2c6d2295..cf5ab22c 100644 --- a/match.c +++ b/match.c @@ -1411,7 +1411,7 @@ static val subst_vars(val spec, val bindings, val filter) continue; } else if (sym == expr_s) { val result = eval(rest(elem), make_env(bindings, nil, nil), elem); - spec = cons(format(nil, lit("~a"), result, nao), rest(spec)); + spec = cons(filter_string_tree(filter, tostringp(result)), rest(spec)); continue; } else { val nested = subst_vars(elem, bindings, filter); -- cgit v1.2.3