A typo'd symbol used to auto-intern an unbound var and die later as
'Cannot call nil as a function' with no hint which symbol. Now:
$ jolt -e '(undefined-fn 1)'
Error: Unable to resolve symbol: undefined-fn in this context
The analyzer's :unresolved fallthrough now punts to the interpreter
(whose resolver raises the message above when the form runs) instead of
emitting a var-ref that interned the var. A punt rather than a hard
throw because runtime-interning forms (defmulti's setup) legitimately
reference the var they're about to create from a nested do.
Pulling that thread surfaced three real bugs the leniency was masking:
- h-resolve-global resolved unqualified symbols against ctx-current-ns,
which during analysis is jolt.analyzer — so user-ns vars NEVER
resolved through it; the lenient arm happened to emit the right ns.
Now resolves against the compile ns like the qualified branch.
- Top-level (do ...) wasn't split: Clojure compiles and EVALS each
child in sequence so earlier children's runtime effects (defmulti's
intern) are visible while later children compile. eval-toplevel now
splits.
- The stdlib itself had forward references the auto-intern hid:
10-seq's transducers used vreset!/vswap! from 20-coll (moved to
10-seq); in 20-coll qualified-ident?/realized?/list*/underive
referenced defs declared later in the file (reordered); sorted? and
partition-all are genuinely later-tier and got (declare ...).
Test rows updated where they encoded the old leniency: ir-passes'
dead-branch row (unresolved in a dead branch is an error, as in
Clojure), compile-mode's ctx-isolation row (other ctx now errors
instead of reading nil), cli rows assert the new message. Gate green,
conformance 335/335 x3, suite 4718 steady, bench within noise.
69 lines
No EOL
2.8 KiB
Clojure
69 lines
No EOL
2.8 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.
|
|
|
|
;; Volatiles (moved up from 20-coll: this tier's transducers use them, and the
|
|
;; analyzer now ERRORS on unresolved forward references — jolt-2o7.3). The
|
|
;; constructor (volatile!) stays native; these are pure over ref-put!/get.
|
|
(defn vreset! [vol newval]
|
|
(jolt.host/ref-put! vol :val newval) newval)
|
|
(defn vswap! [vol f & args]
|
|
(vreset! vol (apply f (get vol :val) args)))
|
|
|
|
(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))))
|
|
|
|
;; partition-by: (partition-by f) is a stateful transducer (buffer a run, emit on
|
|
;; key change, flush on completion — via volatiles, matching Clojure); (partition-by
|
|
;; f coll) is the lazy collection arity.
|
|
(defn partition-by
|
|
([f]
|
|
(fn [rf]
|
|
(let [buf (volatile! [])
|
|
pv (volatile! nil)
|
|
started (volatile! false)]
|
|
(fn
|
|
([] (rf))
|
|
([result]
|
|
(let [b @buf
|
|
result (if (zero? (count b))
|
|
result
|
|
(do (vreset! buf []) (unreduced (rf result b))))]
|
|
(rf result)))
|
|
([result input]
|
|
(let [val (f input)]
|
|
(if (or (not @started) (= val @pv))
|
|
(do (vreset! started true) (vreset! pv val) (vswap! buf conj input) result)
|
|
(let [b @buf]
|
|
(vreset! buf []) (vreset! pv val)
|
|
(let [ret (rf result b)]
|
|
(when-not (reduced? ret) (vswap! buf conj input))
|
|
ret)))))))))
|
|
([f coll]
|
|
(let [step (fn step [s]
|
|
(lazy-seq
|
|
(let [s (seq s)]
|
|
(when s
|
|
(let [fst (first s)
|
|
fv (f fst)
|
|
run (cons fst (take-while (fn [x] (= fv (f x))) (rest s)))]
|
|
(cons run (step (lazy-seq (drop (count run) s)))))))))]
|
|
(step coll)))) |