42da5cef9a
Fix & rest destructuring (evaluator.janet): when the original value is a lazy-seq, derive & rest by walking ls-rest vi steps instead of slicing the eagerly-realized array from d-realize. Rewrite core-mapcat as a lazy state machine (core.janet): step through input colls one element at a time, call f on each tuple, then yield from f's result collection. No apply-forcing — all input colls are walked lazily via lazy-from + seq-done?. Add mapcat to core-renames (compiler.janet) and remove from Clojure overlay (10-seq.clj) — compile mode now emits direct calls to the lazy core-mapcat, fixing the pre-existing protocol-on-record compile error. Tests: re-enabled mapcat infinite harness case, added 2 & rest laziness cases. 21/21 lazy-infinite, 229x3 conformance, 32/32 specs.
24 lines
1 KiB
Clojure
24 lines
1 KiB
Clojure
;; clojure.core — seq tier. Pure-Clojure leaf sequence fns on top of the kernel
|
|
;; tier (00-kernel) and the Janet seed. Loaded after the kernel tier; in compile
|
|
;; mode these self-host through the now-built analyzer (interpreted otherwise).
|
|
;;
|
|
;; Migration rule for adding fns here: the fn must (1) NOT be in
|
|
;; compiler/core-renames (that map emits core-X Janet symbols directly), (2) have
|
|
;; no internal Janet callers of its core-X binding, and (3) NOT be used by the
|
|
;; self-hosted compiler (jolt-core/jolt/*.clj). Compiler-facing structural fns go
|
|
;; in the kernel tier (00-kernel) instead — see its header.
|
|
|
|
(defn ffirst [coll] (first (first coll)))
|
|
(defn nfirst [coll] (next (first coll)))
|
|
(defn fnext [coll] (first (next coll)))
|
|
(defn nnext [coll] (next (next coll)))
|
|
|
|
;; Canonical Clojure defs: pure first/next/loop/recur, no Janet realize-for-iteration.
|
|
(defn last [s]
|
|
(if (next s) (recur (next s)) (first s)))
|
|
|
|
(defn butlast [s]
|
|
(loop [ret [] s s]
|
|
(if (next s)
|
|
(recur (conj ret (first s)) (next s))
|
|
(seq ret))))
|