combi: fix permi and rpermi; impl combi, rcombi; test.

* combi.c (permi_get, permi_peek): Fix algorithm.
(permi_mark): New static function.
(permi_ops): Reference permi_mark for mark operation.
(permi): Initialize it->ul.next to nao as required by
new get/peek algorithm.
(rpermi_get, rpermi_peek): Fix algorithm.
(rpermi_mark): New static function.
(rpermi_ops): Reference permi_mark for mark operation.
(rpermi): Initialize it->ul.next to nao as required
by new get/peek algorithm.
(combi_get, combi_peek, combi_mark, combi_clone): New static
functions.
(combi_ops): New static structure.
(combi): New function.
(rcombi_get, rcombi_peek, rcombi_mark, rcombi_clone): New
static functions.
(rcombi_ops): New static structure.
(rcombi): New function.

* combi.h (combi, rcombi): Declared.

* tests/015/comb.tl: New tests.

1 files changed, 41 insertions, 0 deletions

diff --git a/tests/015/comb.tl b/tests/015/comb.tl
index 70aa9dd3..8b9208e9 100644
--- a/tests/015/comb.tl
+++ b/tests/015/comb.tl
@@ -451,3 +451,44 @@
   (rperm 1..4 0) (nil)
   (comb 1..4 0) (nil)
   (rcomb 1..4 0) (nil))
+
+(mtest
+  (combi #() -1) :error
+  (combi #(1) -1) :error
+  (combi () -1) :error
+  (combi '(1) -1) :error
+  (combi "" -1) :error
+  (combi "a" -1) :error)
+
+(mtest
+  (rcombi #() -1) :error
+  (rcombi #(1) -1) :error
+  (rcombi () -1) :error
+  (rcombi '(1) -1) :error
+  (rcombi "" -1) :error
+  (rcombi "a" -1) :error)
+
+(mtest
+  (permi #() -1) :error
+  (permi #(1) -1) :error
+  (permi () -1) :error
+  (permi '(1) -1) :error
+  (permi "" -1) :error
+  (permi "a" -1) :error)
+
+(mtest
+  (rpermi #() -1) :error
+  (rpermi #(1) -1) :error
+  (rpermi () -1) :error
+  (rpermi '(1) -1) :error
+  (rpermi "" -1) :error
+  (rpermi "a" -1) :error)
+
+(let ((s "abcdef")
+      (v #(0 1 2 3 4))
+      (l '(0 1 2 3 4)))
+  (each ((fn [list comb rcomb perm rperm])
+         (fi [list combi rcombi permi rpermi]))
+    (each ((i 0..6))
+      (each ((o [list s v l]))
+        (vtest (list-seq [fi o i]) [fn o i])))))