* eval.c (eval_init): New functions countqual, countql, countq

and count_if registered as intrinsics.

* lib.c (countqual, countql, countq, count_if): New functions.

* lib.h (countqual, countql, countq, count_if): Declared.

* txr.1: New functions documented.

1 files changed, 51 insertions, 0 deletions

diff --git a/lib.c b/lib.c
index 0dba8f8f..6a59ecd3 100644
--- a/lib.c
+++ b/lib.c
@@ -783,6 +783,57 @@ val tree_find(val obj, val tree, val testfun)
   return nil;
 }
 
+val countqual(val obj, val list)
+{
+  val count = zero;
+
+  for (; list; list = cdr(list))
+    if (equal(car(list), obj))
+      count = plus(count, one);
+
+  return count;
+}
+
+val countql(val obj, val list)
+{
+  val count = zero;
+
+  for (; list; list = cdr(list))
+    if (eql(car(list), obj))
+      count = plus(count, one);
+
+  return count;
+}
+
+val countq(val obj, val list)
+{
+  val count = zero;
+
+  for (; list; list = cdr(list))
+    if (eq(car(list), obj))
+      count = plus(count, one);
+
+  return count;
+}
+
+val count_if(val pred, val list, val key)
+{
+  val count = zero;
+
+  if (!key)
+    key = identity_f;
+
+  for (; list; list = cdr(list)) {
+    val subj = funcall1(key, car(list));
+    val satisfies = funcall1(pred, subj);
+
+    if (satisfies)
+      count = plus(count, one);
+  }
+
+  return count;
+}
+
 val some_satisfy(val list, val pred, val key)
 {
   if (!key)