8180c85393
* Reader records source line/column on list forms The reader stamps 1-based :line/:column metadata on every list form (plus :file when load-jolt-file is reading a file), and jolt.host/form-position reads it back so the analyzer's :pos scaffold finally gets real data. A left-to-right cursor counts newlines over the delta between successive forms, so it stays O(n). Vector/map/set literals are untouched (their metadata is a runtime value the analyzer would have to wrap in with-meta); empty () can't carry meta. ^meta now merges onto the position keys instead of clobbering them. Re-mint is byte-identical (the backend doesn't emit :pos), so this is a pure scaffold for the error-location work that follows. * Report source location on uncaught errors Each top-level form records its source position (thread-local) before it compiles+evals, and cli.ss jolt-report-uncaught appends 'at file:line:col' when an error propagates out. Covers joltc -e, joltc run <file>, and load-string — every interpreted path. Top-level granularity, one set per form; deeper frames come from the Phase 2 frame walk. Runtime .ss only, no re-mint. * Clojure stack traces via source registry + native frame walk A direct-link build emits (jolt-register-source! short-name ns name file line) once per fn def — at definition time, so zero per-call cost. On an uncaught error the reporter walks Chez's native continuation frames (jolt-throw captures the live continuation via call/cc; host conditions carry their own &continuation), maps each frame's procedure name through the registry, and prints a Clojure backtrace 'ns/name (file:line)'. Wired into both the cli and a built binary's launcher. Frames are keyed by the short munged fn name Chez actually reports (emit-fn's letrec self-binding), not jv$ns$name; a cross-namespace collision degrades to the bare frame name rather than a wrong attribution. The analyzer carries the original form's position through defn macroexpansion onto the def node. Calling a non-fn now throws a catchable ClassCastException (via jolt-throw) naming the operator, instead of a raw Chez error. Caveats (documented in source-registry.ss): names map only in direct-link/AOT closed-world builds — the open-world -e/repl/run path falls back to the top-level location; and pervasive TCO erases tail-call frames, so a mapped trace shows only the non-tail spine. JOLT_DEBUG_FRAMES dumps raw frame names. Re-mint (analyzer + backend); prelude byte-identical (direct-link off during mint). Corpus rows certified, build-smoke asserts the trace. * Propagate source position through macroexpansion hc-expand-1 now carries the macro call form's :line/:column onto the top of a list expansion that has none of its own (merged under any meta the macro set), so errors and stack traces in macro-generated code point at the call site — Clojure parity. The analyze recursion re-expands inner macros, so each level's top form picks it up, matching the reference compiler. (meta (macroexpand-1 '(when x y))) now reports the call-site line. A direct-link fn defined through a user macro (build-app's defguarded) registers with a real line, so build-smoke's trace assertion covers macro-defined fns. Runtime .ss (host-contract.ss) — no re-mint; selfhost holds. Phase 3's optional items are deferred: :line-in-ex-data has no clean consumer (it would pollute ex-data, break = and printing, and positions already surface via the trace + top-level location), and Chez source-object emission is a large backend change the jv$-name registry already sidesteps. * Review fixes: registration key, thread-locals, debug flag timing - Register a fn under the name Chez actually reports for its frame, not the def name: a named fn literal whose name differs from the def (def foo (fn bar …)) is framed as 'bar', and an anonymous fn def (def foo (fn …)) as jv$ns$foo. Both previously registered under the def name and so never appeared in traces. - rdr-source-file / rdr-pos-cursor are thread parameters, so concurrent compiles (futures, core.async) don't clobber each other's file/line attribution. - Read JOLT_DEBUG_FRAMES at call time: a built binary evaluates top-level forms at heap-build time, where a load-time getenv is always unset. Re-mint (backend + reader); prelude byte-identical, selfhost holds. --------- Co-authored-by: Yogthos <yogthos@gmail.com>
50 lines
1.6 KiB
Bash
Executable file
50 lines
1.6 KiB
Bash
Executable file
#!/bin/sh
|
|
# CLI smoke: exercise the real bin/joltc process end to end — core eval, runtime
|
|
# eval/load-string, runtime defmacro, futures, and the numeric tower. The in-process
|
|
# corpus/unit gates cover semantics in depth; this confirms the CLI entry itself.
|
|
root="$(CDPATH= cd -- "$(dirname -- "$0")/../.." && pwd)"
|
|
cd "$root"
|
|
|
|
fails=0
|
|
check() {
|
|
got="$(bin/joltc -e "$1" 2>/dev/null | tail -1)"
|
|
if [ "$got" = "$2" ]; then
|
|
pass=$((pass + 1))
|
|
else
|
|
echo " FAIL: $1"
|
|
echo " want \`$2\` got \`$got\`"
|
|
fails=$((fails + 1))
|
|
fi
|
|
}
|
|
pass=0
|
|
|
|
# An uncaught error reports the source location of the top-level form (stderr).
|
|
check_loc() {
|
|
err="$(bin/joltc -e "$1" 2>&1 >/dev/null)"
|
|
if printf '%s' "$err" | grep -q "$2"; then
|
|
pass=$((pass + 1))
|
|
else
|
|
echo " FAIL (loc): $1"
|
|
echo " want stderr to contain \`$2\`, got \`$err\`"
|
|
fails=$((fails + 1))
|
|
fi
|
|
}
|
|
|
|
check '(+ 1 2)' '3'
|
|
check '(defn fib [n] (if (< n 2) n (+ (fib (- n 1)) (fib (- n 2))))) (fib 15)' '610'
|
|
check '(->> (range 10) (filter even?) (map (fn [x] (* x x))) (reduce +))' '120'
|
|
check '(let [{:keys [a b] :or {b 99}} {:a 1}] [a b])' '[1 99]'
|
|
check '(map inc [1 2 3])' '(2 3 4)'
|
|
check '(require [clojure.string :as s]) (s/upper-case "hello")' 'HELLO'
|
|
check '(eval (quote (+ 1 2)))' '3'
|
|
check '(load-string "(def y 5) (* y y)")' '25'
|
|
check '(defmacro add1 [x] (list (quote +) x 1)) (add1 10)' '11'
|
|
check '(deref (future (+ 1 2)))' '3'
|
|
check '(/ 1 2)' '1/2'
|
|
check '(= 3 3.0)' 'false'
|
|
check '(== 3 3.0)' 'true'
|
|
check_loc '(throw (ex-info "boom" {}))' ' at 1:'
|
|
check_loc '(do (+ 1 1) (/ 1 0))' ' at 1:'
|
|
|
|
echo "cli smoke: $pass passed, $fails failed"
|
|
[ "$fails" -eq 0 ]
|