77026fa9ec
list? was nil on Chez because one cseq record backs both lists and lazy/
realized seqs. Add a list? marker field (cseq v2) set only on the HEAD cell
of a list -- (list ...), quoted list literals, cons, reverse, conj onto a
list. rest/next/seq/map therefore yield unmarked seq cells, so they are
seqs and not list?, matching the seed (where rest-of-a-list is a non-list
seq). Empty () is treated as a list.
vector?: drop the map-entry exclusion. Clojure's MapEntry implements
IPersistentVector and the seed agrees -- (vector? (first {:a 1})) is true.
Only dot-forms' coll dispatch read jolt-vector?, where a 2-vector entry is
correct.
clojure.walk + clojure.template join the prelude stdlib tier. The driver
now evals each stdlib ns's requires -- and the ns form's (:require ...)
clause -- so an aliased ref (template's walk/postwalk-replace) resolves at
emit time instead of lowering to an Unknown class host-static. ns forms are
evaled for that side effect but not emitted, so the runtime *ns* doesn't
leak to the last stdlib ns.
Parity 2163 -> 2176, 0 new divergences. New test/chez/_walk.janet 39/39.
65 lines
3.1 KiB
Scheme
65 lines
3.1 KiB
Scheme
;; type predicates + simple accessors (jolt-9ziu) — host-coupled seed natives.
|
|
;;
|
|
;; These are seed primitives (not clojure.core overlay fns), so they're never
|
|
;; def-var!'d by the assembled prelude; the Chez host must provide them. Semantics
|
|
;; match the Janet seed (src/jolt/core_types.janet): map?/vector?/set? are STRICT
|
|
;; over the persistent-collection records, seq? is true only for real sequences,
|
|
;; coll? is the union. Records (shape-recs) are Phase 2, so the record arms of the
|
|
;; seed predicates are simply absent here for now.
|
|
|
|
(define (jolt-map? x) (pmap? x))
|
|
;; a map entry is a pvec under the hood AND is vector? — Clojure's MapEntry
|
|
;; implements IPersistentVector, so (vector? (first {:a 1})) is true (the seed
|
|
;; agrees; jolt-75sv corrected the earlier exclusion).
|
|
(define (jolt-vector? x) (pvec? x))
|
|
(define (jolt-set? x) (pset? x))
|
|
(define (jolt-seq? x) (or (cseq? x) (empty-list-t? x)))
|
|
;; (list? x): a list-marked cseq node or the empty list (). A lazy/vector-backed
|
|
;; seq, (rest list), (seq coll), (map …) are seqs but not lists (jolt-75sv).
|
|
(define (jolt-list-pred? x) (or (and (cseq? x) (cseq-list? x)) (empty-list-t? x)))
|
|
(define (jolt-coll-pred? x)
|
|
(or (pvec? x) (pmap? x) (pset? x) (cseq? x) (empty-list-t? x)))
|
|
(define (jolt-number? x) (number? x))
|
|
(define (jolt-string? x) (string? x))
|
|
(define (jolt-char-pred? x) (char? x))
|
|
;; finite integral number — Chez integer? already rejects the infinities and NaN.
|
|
(define (jolt-integer? x) (and (number? x) (integer? x)))
|
|
(define (jolt-fn? x) (procedure? x))
|
|
(define (jolt-boolean-pred? x) (boolean? x))
|
|
|
|
;; (boolean x) coerces truthiness (nil/false -> false, else true).
|
|
(define (jolt-boolean x) (if (jolt-truthy? x) #t #f))
|
|
|
|
;; (name x): keyword/symbol -> name string; string -> itself.
|
|
(define (jolt-name x)
|
|
(cond
|
|
((keyword? x) (keyword-t-name x))
|
|
((symbol-t? x) (symbol-t-name x))
|
|
((string? x) x)
|
|
(else (error #f "name: expected string/symbol/keyword" x))))
|
|
|
|
;; (namespace x): keyword/symbol ns string, or nil when unqualified.
|
|
(define (jolt-namespace x)
|
|
(let ((ns (cond ((keyword? x) (keyword-t-ns x))
|
|
((symbol-t? x) (symbol-t-ns x))
|
|
(else (error #f "namespace: expected symbol/keyword" x)))))
|
|
(if (or (jolt-nil? ns) (not ns) (eq? ns '())) jolt-nil ns)))
|
|
|
|
(def-var! "clojure.core" "nil?" jolt-nil?)
|
|
(def-var! "clojure.core" "number?" jolt-number?)
|
|
(def-var! "clojure.core" "string?" jolt-string?)
|
|
(def-var! "clojure.core" "char?" jolt-char-pred?)
|
|
(def-var! "clojure.core" "integer?" jolt-integer?)
|
|
(def-var! "clojure.core" "symbol?" jolt-symbol?)
|
|
(def-var! "clojure.core" "keyword?" keyword?)
|
|
(def-var! "clojure.core" "map?" jolt-map?)
|
|
(def-var! "clojure.core" "vector?" jolt-vector?)
|
|
(def-var! "clojure.core" "set?" jolt-set?)
|
|
(def-var! "clojure.core" "seq?" jolt-seq?)
|
|
(def-var! "clojure.core" "list?" jolt-list-pred?)
|
|
(def-var! "clojure.core" "coll?" jolt-coll-pred?)
|
|
(def-var! "clojure.core" "fn?" jolt-fn?)
|
|
(def-var! "clojure.core" "boolean?" jolt-boolean-pred?)
|
|
(def-var! "clojure.core" "boolean" jolt-boolean)
|
|
(def-var! "clojure.core" "name" jolt-name)
|
|
(def-var! "clojure.core" "namespace" jolt-namespace)
|