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.

1 files changed, 9 insertions, 5 deletions

diff --git a/lib.c b/lib.c
index 77c01623..a1b74624 100644
--- a/lib.c
+++ b/lib.c
@@ -1136,11 +1136,6 @@ val string_lt(val astr, val bstr)
   return cmp == -1 ? t : nil;
 }
 
-val chr(wchar_t ch)
-{
-  return (val) (((cnum) ch << TAG_SHIFT) | TAG_CHR);
-}
-
 val chrp(val chr)
 {
   return (is_chr(chr)) ? t : nil;
@@ -1358,6 +1353,15 @@ val func_n4(val (*fun)(val, val, val, val))
   return obj;
 }
 
+val functionp(val obj)
+{
+  if (!obj) {
+    return nil;
+  } else {
+    type_t ty = type(obj);
+    return (ty == FUN) ? t : nil;
+  }
+}
 
 val apply(val fun, val arglist)
 {