summaryrefslogtreecommitdiffstats
path: root/match.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2011-09-26 23:21:58 -0700
committerKaz Kylheku <kaz@kylheku.com>2011-09-26 23:21:58 -0700
commit29b5d37a8577d83ae0c88b2e894287b990e6849e (patch)
tree71de03c6df0949cf41bde27e2ce5f42afaa40eb1 /match.c
parentd5fdbd469b38c5444d7d9995a87546a12a6638bf (diff)
downloadtxr-29b5d37a8577d83ae0c88b2e894287b990e6849e.tar.gz
txr-29b5d37a8577d83ae0c88b2e894287b990e6849e.tar.bz2
txr-29b5d37a8577d83ae0c88b2e894287b990e6849e.zip
Support &#xNNNN; hex escapes in html. Bugfix in field formatting.
chr function inlined. * filter.c (trie_value_at, trie_lookup_feed_char): Handle function case. (build_filter): New parameter, compress_p. (html_hex_continue, html_hex_handler): New functions. (filter_init): Add a function-based node to the from_html trie. * lib.c (chr): Function removed. (functionp) New function. * lib.h (chr): Declaration replaced with inline function. (functionp): Declared. * match.c (format_field): Bugfix: failed to apply filter that came in as an argument.
Diffstat (limited to 'match.c')
-rw-r--r--match.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/match.c b/match.c
index fb533c50..a7284f19 100644
--- a/match.c
+++ b/match.c
@@ -557,10 +557,11 @@ static val format_field(val string_or_list, val modifier, val filter)
uw_throwf(query_error_s, lit("format_field: filter ~s not known"),
filter_sym, nao);
}
+ }
+ if (filter)
string_or_list = filter_string(filter, cat_str(list(string_or_list, nao),
nil));
- }
}
{