giles
cae87c1e2c
Some checks failed
Test, Build, and Deploy / test-build-deploy (push) Failing after 23s
Three coupled fixes plus a new relations module land together because
each is required for the next: appendo can't terminate without all
three.
1. unify.sx — added (:cons h t) tagged cons-cell shape because SX has no
improper pairs. The unifier treats (:cons h t) and the native list
(h . t) as equivalent. mk-walk* re-flattens cons cells back to flat
lists for clean reification.
2. stream.sx — switched mature stream cells from plain SX lists to a
(:s head tail) tagged shape so a mature head can have a thunk tail.
With the old representation, mk-mplus had to (cons head thunk) which
SX rejects (cons requires a list cdr).
3. conde.sx — wraps each clause in Zzz (inverse-eta delay) for laziness.
Zzz uses (gensym "zzz-s-") for the substitution parameter so it does
not capture user goals that follow the (l s ls) convention. Without
gensym, every relation that uses `s` as a list parameter silently
binds it to the substitution dict.
relations.sx is the new module: nullo, pairo, caro, cdro, conso,
firsto, resto, listo, appendo, membero. 25 new tests.
Canary green:
(run* q (appendo (list 1 2) (list 3 4) q))
→ ((1 2 3 4))
(run* q (fresh (l s) (appendo l s (list 1 2 3)) (== q (list l s))))
→ ((() (1 2 3)) ((1) (2 3)) ((1 2) (3)) ((1 2 3) ()))
(run 3 q (listo q))
→ (() (_.0) (_.0 _.1))
152/152 cumulative.
102 lines
2.0 KiB
Plaintext
102 lines
2.0 KiB
Plaintext
;; lib/minikanren/tests/fresh.sx — Phase 2 piece B tests for `fresh`.
|
|
|
|
;; --- empty fresh: pure goal grouping ---
|
|
|
|
(mk-test
|
|
"fresh-empty-vars-equiv-conj"
|
|
(stream-take 5 ((fresh () (== 1 1)) empty-s))
|
|
(list empty-s))
|
|
|
|
(mk-test
|
|
"fresh-empty-vars-no-goals-is-succeed"
|
|
(stream-take 5 ((fresh ()) empty-s))
|
|
(list empty-s))
|
|
|
|
;; --- single var ---
|
|
|
|
(mk-test
|
|
"fresh-one-var-bound"
|
|
(let
|
|
((s (first (stream-take 5 ((fresh (x) (== x 7)) empty-s)))))
|
|
(first (vals s)))
|
|
7)
|
|
|
|
;; --- multiple vars + multiple goals ---
|
|
|
|
(mk-test
|
|
"fresh-two-vars-three-goals"
|
|
(let
|
|
((q (mk-var "q"))
|
|
(g
|
|
(fresh
|
|
(x y)
|
|
(== x 10)
|
|
(== y 20)
|
|
(== q (list x y)))))
|
|
(mk-walk* q (first (stream-take 5 (g empty-s)))))
|
|
(list 10 20))
|
|
|
|
(mk-test
|
|
"fresh-three-vars"
|
|
(let
|
|
((q (mk-var "q"))
|
|
(g
|
|
(fresh
|
|
(a b c)
|
|
(== a 1)
|
|
(== b 2)
|
|
(== c 3)
|
|
(== q (list a b c)))))
|
|
(mk-walk* q (first (stream-take 5 (g empty-s)))))
|
|
(list 1 2 3))
|
|
|
|
;; --- fresh interacts with disj ---
|
|
|
|
(mk-test
|
|
"fresh-with-disj"
|
|
(let
|
|
((q (mk-var "q")))
|
|
(let
|
|
((g (fresh (x) (mk-disj (== x 1) (== x 2)) (== q x))))
|
|
(let
|
|
((res (stream-take 5 (g empty-s))))
|
|
(map (fn (s) (mk-walk q s)) res))))
|
|
(list 1 2))
|
|
|
|
;; --- nested fresh ---
|
|
|
|
(mk-test
|
|
"fresh-nested"
|
|
(let
|
|
((q (mk-var "q"))
|
|
(g
|
|
(fresh
|
|
(x)
|
|
(fresh
|
|
(y)
|
|
(== x 1)
|
|
(== y 2)
|
|
(== q (list x y))))))
|
|
(mk-walk* q (first (stream-take 5 (g empty-s)))))
|
|
(list 1 2))
|
|
|
|
;; --- call-fresh (functional alternative) ---
|
|
|
|
(mk-test
|
|
"call-fresh-binds-and-walks"
|
|
(let
|
|
((s (first (stream-take 5 ((call-fresh (fn (x) (== x 99))) empty-s)))))
|
|
(first (vals s)))
|
|
99)
|
|
|
|
(mk-test
|
|
"call-fresh-distinct-from-outer-vars"
|
|
(let
|
|
((q (mk-var "q")))
|
|
(let
|
|
((g (call-fresh (fn (x) (mk-conj (== x 5) (== q (list x x)))))))
|
|
(mk-walk* q (first (stream-take 5 (g empty-s))))))
|
|
(list 5 5))
|
|
|
|
(mk-tests-run!)
|