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

Merge pull request #161 from jolt-lang/spike/chez-bootstrap

Browse source 
Namespace resolution fixes (:use/:only, refer-aware syntax-quote, alias-aware resolve)
This commit is contained in:
Dmitri Sotnikov 2026-06-22 14:27:34 +00:00 • committed by GitHub
commit 1276bfdd7e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
host/chez/host-contract.ss
View file

@ -225,6 +225,12 @@
((hc-special-symbol? nm) form) ; special form: leave bare ((hc-special-symbol? nm) form) ; special form: leave bare
((hc-interop-head? nm) form) ; interop (.method / Class. / .-field): bare ((hc-interop-head? nm) form) ; interop (.method / Class. / .-field): bare
((var-cell-lookup "clojure.core" nm) (jolt-symbol "clojure.core" nm)) ((var-cell-lookup "clojure.core" nm) (jolt-symbol "clojure.core" nm))
;; a name referred into the compile ns (:require :refer / :use :only)
;; qualifies to its SOURCE ns, not the compile ns — so a macro that
;; syntax-quotes a referred var (e.g. clojure.tools.logging/spy using
;; clojure.pprint's pprint) expands to the real var.
((chez-resolve-refer (chez-actx-cns ctx) nm)
=> (lambda (target) (jolt-symbol target nm)))
(else (jolt-symbol (chez-actx-cns ctx) nm))) ; else: qualify to compile ns (else (jolt-symbol (chez-actx-cns ctx) nm))) ; else: qualify to compile ns
;; qualified: if the ns part is an :as alias in the compile ns, resolve it ;; qualified: if the ns part is an :as alias in the compile ns, resolve it
;; to the target namespace — Clojure resolves the alias part of a qualified ;; to the target namespace — Clojure resolves the alias part of a qualified

15
host/chez/ns.ss
View file

@ -67,7 +67,9 @@
(cond (cond
((string=? (keyword-t-name k) "as") ((string=? (keyword-t-name k) "as")
(when (symbol-t? v) (chez-register-alias! cns (symbol-t-name v) target))) (when (symbol-t? v) (chez-register-alias! cns (symbol-t-name v) target)))
((string=? (keyword-t-name k) "refer") ;; :refer (require) and :only (use) both bring unqualified names
;; into cns resolving to target/name.
((or (string=? (keyword-t-name k) "refer") (string=? (keyword-t-name k) "only"))
(cond (cond
;; :refer :all — bring in every public var (require :refer :all) ;; :refer :all — bring in every public var (require :refer :all)
((and (keyword? v) (string=? (keyword-t-name v) "all")) ((and (keyword? v) (string=? (keyword-t-name v) "all"))
@ -196,11 +198,16 @@
;; resolve: an unqualified symbol resolves in the current ns then clojure.core; a ;; resolve: an unqualified symbol resolves in the current ns then clojure.core; a
;; qualified one in its own ns. Returns the var iff genuinely defined, else nil — ;; qualified one in its own ns. Returns the var iff genuinely defined, else nil —
;; never interns an empty cell (var-cell-lookup is non-creating). ;; never interns an empty cell (var-cell-lookup is non-creating).
;; resolve `sym` in the current ns: a qualified ns part is read as an :as alias
;; (then a real ns); an unqualified name resolves in the current ns, its :refers,
;; then clojure.core. (ns-resolve does the same against an explicit ns.)
(define (jolt-resolve sym) (define (jolt-resolve sym)
(let* ((sns (symbol-t-ns sym)) (nm (symbol-t-name sym)) (let* ((cns (chez-current-ns))
(sns (symbol-t-ns sym)) (nm (symbol-t-name sym))
(c (if (string? sns) (c (if (string? sns)
(var-cell-lookup sns nm) (var-cell-lookup (or (chez-resolve-alias cns sns) sns) nm)
(or (var-cell-lookup (chez-current-ns) nm) (or (var-cell-lookup cns nm)
(let ((ref (chez-resolve-refer cns nm))) (and ref (var-cell-lookup ref nm)))
(var-cell-lookup "clojure.core" nm))))) (var-cell-lookup "clojure.core" nm)))))
(if (and c (var-cell-defined? c)) c jolt-nil))) (if (and c (var-cell-defined? c)) c jolt-nil)))