1eb2843365
Round 2 of the persistent-collections work. Add a real 32-way branching-trie persistent vector (src/jolt/pv.janet) with a tail buffer: O(log32 n) conj/assoc/nth/pop, with unchanged subtrees shared by identity. Vector literals and vec/vector/conj/assoc/subvec/etc. now produce and maintain these in the default (immutable) build, replacing the old tuple-based vectors. Every core seq op, the destructurer, IFn application, the printers, =, and the evaluator's literal/splice paths were taught to handle the pvec type. Define several Clojure seq fns that were silently leaking to Janet builtins (some, keep, interleave, flatten, mapcat, interpose) and broke once vectors became tables; normalize collections through realize-for-iteration everywhere. Build-time JOLT_MUTABLE flag now selects fast Janet-native mutable collections: in that mode vectors are arrays (conj appends in place, vector? true, print []), sharing one representation with lists. Default build is immutable. Tests: conformance 206/206, features 71/71, jank 119 (baseline). Test helpers normalized so Janet-level = compares against tuple literals regardless of repr. The 2 test-load-sci failures (bit-clear/get-method) pre-date this work.
63 lines
2.3 KiB
Text
63 lines
2.3 KiB
Text
# Ported from clojure/test_clojure/macros.clj
|
|
(use ../src/jolt/api)
|
|
(defn ct-eval [ctx s] (normalize-pvecs (eval-string ctx s)))
|
|
|
|
(print "Ported Macros Tests")
|
|
|
|
# --- -> and ->> threading ---
|
|
(print "test -> and ->>...")
|
|
(let [ctx (init)]
|
|
(ct-eval ctx "(defmacro c [arg] (if (= 'b (first arg)) :foo :bar))")
|
|
(ct-eval ctx "(def a 2)")
|
|
(ct-eval ctx "(def b identity)")
|
|
(assert (= :foo (ct-eval ctx "(-> a b c)")) "-> threading")
|
|
(assert (= :foo (ct-eval ctx "(->> a b c)")) "->> threading"))
|
|
(print " ok")
|
|
|
|
# --- some-> ---
|
|
(print "test some->...")
|
|
(let [ctx (init)]
|
|
(assert (= nil (ct-eval ctx "(some-> nil)")) "some-> nil")
|
|
(assert (= 0 (ct-eval ctx "(some-> 0)")) "some-> 0")
|
|
(assert (= -1 (ct-eval ctx "(some-> 1 (- 2))")) "some-> with form")
|
|
(ct-eval ctx "(defn const-nil [_] nil)")
|
|
(assert (= nil (ct-eval ctx "(some-> 1 const-nil (- 2))")) "some-> stop at nil"))
|
|
(print " ok")
|
|
|
|
# --- some->> ---
|
|
(print "test some->>...")
|
|
(let [ctx (init)]
|
|
(assert (= nil (ct-eval ctx "(some->> nil)")) "some->> nil")
|
|
(assert (= 0 (ct-eval ctx "(some->> 0)")) "some->> 0")
|
|
(assert (= 1 (ct-eval ctx "(some->> 1 (- 2))")) "some->> with form")
|
|
(ct-eval ctx "(defn const-nil2 [_] nil)")
|
|
(assert (= nil (ct-eval ctx "(some->> 1 const-nil2 (- 2))")) "some->> stop at nil"))
|
|
(print " ok")
|
|
|
|
# --- cond-> ---
|
|
(print "test cond->...")
|
|
(let [ctx (init)]
|
|
(assert (= 0 (ct-eval ctx "(cond-> 0)")) "cond-> single")
|
|
(assert (= -1 (ct-eval ctx "(cond-> 0 true inc true (- 2))")) "cond-> with tests")
|
|
(assert (= 0 (ct-eval ctx "(cond-> 0 false inc)")) "cond-> false test")
|
|
(assert (= -1 (ct-eval ctx "(cond-> 1 true (- 2) false inc)")) "cond-> mix"))
|
|
(print " ok")
|
|
|
|
# --- cond->> ---
|
|
(print "test cond->>...")
|
|
(let [ctx (init)]
|
|
(assert (= 0 (ct-eval ctx "(cond->> 0)")) "cond->> single")
|
|
(assert (= 1 (ct-eval ctx "(cond->> 0 true inc true (- 2))")) "cond->> with tests")
|
|
(assert (= 0 (ct-eval ctx "(cond->> 0 false inc)")) "cond->> false test")
|
|
(assert (= 1 (ct-eval ctx "(cond->> 1 true (- 2) false inc)")) "cond->> mix"))
|
|
(print " ok")
|
|
|
|
# --- as-> ---
|
|
(print "test as->...")
|
|
(let [ctx (init)]
|
|
(assert (= 0 (ct-eval ctx "(as-> 0 x)")) "as-> single")
|
|
(assert (= 1 (ct-eval ctx "(as-> 0 x (inc x))")) "as-> one form")
|
|
(assert (= 2 (ct-eval ctx "(as-> [0 1] x (map inc x) (reverse x) (first x))")) "as-> chain"))
|
|
(print " ok")
|
|
|
|
(print "\nAll Ported Macros tests passed!")
|