simon/jolt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Chez inc7: namespace :as aliases on the Chez-hosted analyzer

Browse source 
(require '[clojure.string :as s]) then s/foo crashed "Unknown class s": the
Chez analyzer resolved a qualified symbol's ns literally, and there was no
alias table (ns.ss jolt-ns-aliases was a stub, require a no-op). Add an alias
table + chez-register-spec! (parses [ns :as a]) in ns.ss; hc-resolve-cell now
resolves a qualified ns through it; compile-eval pre-registers a form's
require/use :as aliases before analysis (analysis precedes the runtime require,
so the runtime require staying a no-op is fine). The batched gate runner clears
the alias table between cases.

Zero-Janet corpus parity 2159 -> 2240, 0 divergences. spine-test 35/35.
This commit is contained in:
Yogthos 2026-06-20 01:25:01 -04:00
parent 8b86174b91
commit 011e5d6337
5 changed files with 57 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

31
host/chez/compile-eval.ss
View file

@ -20,13 +20,36 @@
;; once, here, so every analyze->emit on this spine sees the full core (jolt-qjr0).
((var-deref "jolt.backend-scheme" "set-prelude-mode!") #t)
;; (quote X) -> X, else x — unwraps a quoted require spec.
(define (ce-unquote x)
(if (and (cseq? x) (cseq-list? x))
(let ((items (seq->list x)))
(if (and (pair? items) (symbol-t? (car items))
(string=? (symbol-t-name (car items)) "quote") (pair? (cdr items)))
(cadr items) x))
x))
;; Pre-register any (require ...)/(use ...) :as aliases under `ns` BEFORE analysis,
;; so a qualified s/foo resolves while compiling (analysis precedes the runtime
;; require). Walks the whole form (a require may be nested in a do/let). jolt-qjr0.
(define (ce-scan-requires! form ns)
(when (and (cseq? form) (cseq-list? form))
(let ((items (seq->list form)))
(when (pair? items)
(let ((h (car items)))
(if (and (symbol-t? h)
(let ((n (symbol-t-name h))) (or (string=? n "require") (string=? n "use"))))
(for-each (lambda (a) (chez-register-spec! ns (ce-unquote a))) (cdr items))
(for-each (lambda (x) (ce-scan-requires! x ns)) items)))))))
;; Source string -> Scheme source string (read -> analyze -> emit, all on Chez).
;; `ns` is the compile namespace unqualified symbols resolve against.
(define (jolt-analyze-emit src ns)
(let* ((form (jolt-ce-read src))
(ctx (make-analyze-ctx ns))
(ir (jolt-ce-analyze ctx form)))
(jolt-ce-emit ir)))
(let* ((form (jolt-ce-read src)))
(ce-scan-requires! form ns)
(let* ((ctx (make-analyze-ctx ns))
(ir (jolt-ce-analyze ctx form)))
(jolt-ce-emit ir))))
;; Source string -> value (compile on Chez, then eval the emitted Scheme in the
;; top-level environment where rt.ss's runtime procedures live).