e2e7fa1447
## Runtime (src/jolt/core.janet, +637/-99) ### Atom system (complete) - core-atom: :validator and :meta options, watches table, atom-validate/atom-notify-watches helpers - New functions: swap-vals!, reset-vals!, compare-and-set!, set-validator!, get-validator, add-watch, remove-watch - Validator: blocks invalid reset!/swap!; watches: notification with old/new values; metadata support - All 7 functions registered in core-bindings ### New predicates - integer?, boolean?, list? — all registered in core-bindings ### New math - abs, rand, rand-int — registered in core-bindings ### Control flow macros (7 new) - cond, case (with one-of-many list support), condp, dotimes, while, if-not, when-first - Registered as macros: cond, case, for, dotimes, while, condp, if-not, when-first ### Threading macros (7) - -> (thread-first), ->> (thread-last), some->, some->>, cond->, cond->>, as-> - Renamed to core-thread-first/core-thread-last to avoid collision with comparison operators ### for comprehension - Full Clojure for macro: :when, :let modifiers, nested bindings - Uses map/mapcat expansion, correct last-group optimization ### Sequence operations (15 new) - last, butlast, second, ffirst, fnext, nfirst, nnext, nthnext, nthrest - drop-last, take-nth, map-indexed, keep, keep-indexed, reductions ### Nil-safety fixes - core-reverse, core-sort, core-sort-by, core-distinct now handle nil input ## Tests (7 new files, 361 assertions across all tests) ### Ported from Clojure test suite (4 files) - clojure-logic-test.janet: 82 assertions (if/and/or/not/some?/nil-punning) - clojure-control-test.janet: 56 assertions (do/when/if-let/cond/dotimes/while/loop/case) - clojure-macros-test.janet: 21 assertions (->/->>/some->/some->>/cond->/cond->>/as->) - clojure-for-test.janet: 4 assertions (:when/:let/nested for) ### Systematic coverage - clojure-atom-test.janet: 31 assertions (creation/reset!/swap!/swap-vals!/reset-vals!/CAS/validator/watches/meta) - systematic-coverage.janet: 120+ assertions (predicates/math/comparison/logic/collections/seq-ops/destructuring) - logic-test.janet: earlier ported logic tests ### Existing tests updated - lazy-test.janet, phase7-test.janet: updated for nil-safe core functions ## Result 47 test files, all passing. 19 new functions/macros implemented. Clojure atom semantics complete: validators, watches, metadata, CAS, swap-vals!/reset-vals!.
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] (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!")
|