Chez inc 3k: converter + string-op RT shims
str/subs/vec/keyword/symbol/compare/int/double/gensym — host-coupled seed natives the overlay assumes, now def-var!'d into clojure.core via host/chez/converters.ss (loaded last, str reuses jolt-pr-str). Semantics match the seed: str-render-one for str (nil->"", bare chars, regex source), the 3-way core-compare port, int truncates. The symbol no-ns sentinel is #f to match emit's quoted-symbol lowering (jolt-symbol #f "x"), so (= 'x (symbol "x")) holds — jolt= compares ns with strict equal?, and jolt-nil vs #f would otherwise diverge. Prelude parity 1220 -> 1326/2497, 0 new divergences. Floor raised to 1326; three newly-reached *ns*/var-rendering cases added to the allowlist (Phase 2). run-prelude and the per-case program file are now PID-unique so concurrent chez runs don't read each other's half-written files.
This commit is contained in:
parent
0c9c7931fe
commit
bb8b2d201c
5 changed files with 175 additions and 12 deletions
120
host/chez/converters.ss
Normal file
120
host/chez/converters.ss
Normal file
|
|
@ -0,0 +1,120 @@
|
|||
;; converters + string ops (jolt-t6cr) — host-coupled seed natives the Chez host
|
||||
;; must provide; def-var!'d into clojure.core, resolved in prelude mode. Loaded
|
||||
;; last (after jolt-pr-str), since `str` reuses the printer. Semantics match the
|
||||
;; Janet seed (core_print.janet str-render-one, core_io.janet core-compare,
|
||||
;; core_refs.janet int/double). jolt is all-flonum, so numeric results are
|
||||
;; flonums (int truncates toward zero, compare returns -1.0/0.0/1.0).
|
||||
|
||||
;; str: nil -> "", string raw, char bare (not \c), regex -> raw source, else the
|
||||
;; printer (which renders collections with readable elements).
|
||||
(define (jolt-str-render-one v)
|
||||
(cond
|
||||
((jolt-nil? v) "")
|
||||
((string? v) v)
|
||||
((char? v) (string v))
|
||||
((regex-t? v) (regex-t-source v))
|
||||
(else (jolt-pr-str v))))
|
||||
(define (jolt-str . xs)
|
||||
(let loop ((xs xs) (acc '()))
|
||||
(if (null? xs)
|
||||
(apply string-append (reverse acc))
|
||||
(loop (cdr xs) (cons (jolt-str-render-one (car xs)) acc)))))
|
||||
|
||||
;; jolt indices are flonums; substring etc. need exact ints.
|
||||
(define (jolt->idx n) (exact (truncate n)))
|
||||
|
||||
(define (jolt-subs s start . end)
|
||||
(substring s (jolt->idx start)
|
||||
(if (null? end) (string-length s) (jolt->idx (car end)))))
|
||||
|
||||
;; vec: a pvec from any seqable (already-pvec returns itself).
|
||||
(define (jolt-vec coll)
|
||||
(cond
|
||||
((jolt-nil? coll) (jolt-vector))
|
||||
((pvec? coll) coll)
|
||||
((string? coll) (apply jolt-vector (string->list coll)))
|
||||
(else (apply jolt-vector (seq->list coll)))))
|
||||
|
||||
(define (jolt-keyword . args)
|
||||
(cond
|
||||
((= (length args) 1)
|
||||
(let ((a (car args)))
|
||||
(cond
|
||||
((jolt-nil? a) jolt-nil)
|
||||
((keyword? a) a)
|
||||
((string? a) (keyword #f a))
|
||||
((jolt-symbol? a)
|
||||
(let ((ns (symbol-t-ns a)))
|
||||
(keyword (if (or (jolt-nil? ns) (not ns) (eq? ns '())) #f ns) (symbol-t-name a))))
|
||||
(else (error #f "keyword: requires string/symbol/keyword" a)))))
|
||||
((= (length args) 2)
|
||||
(keyword (let ((ns (car args))) (if (jolt-nil? ns) #f ns)) (cadr args)))
|
||||
(else (error #f "keyword: wrong arity"))))
|
||||
|
||||
(define (jolt-symbol-new . args)
|
||||
(cond
|
||||
((= (length args) 1)
|
||||
(let ((a (car args)))
|
||||
(cond
|
||||
((jolt-symbol? a) a)
|
||||
;; no-ns sentinel is #f — matches emit's quoted-symbol lowering
|
||||
;; (jolt-symbol #f "x"), so (= 'x (symbol "x")) holds (jolt= compares ns
|
||||
;; with strict equal?; jolt-nil vs #f would otherwise differ).
|
||||
((string? a) (jolt-symbol #f a))
|
||||
((keyword? a) (jolt-symbol (keyword-t-ns a) (keyword-t-name a)))
|
||||
(else (error #f "symbol: requires string/symbol" a)))))
|
||||
((= (length args) 2) (jolt-symbol (car args) (cadr args)))
|
||||
(else (error #f "symbol: wrong arity"))))
|
||||
|
||||
;; gensym: per-process counter, like the seed's gensym_counter.
|
||||
(define jolt-gensym-counter 0)
|
||||
(define (jolt-gensym . prefix)
|
||||
(let ((p (if (null? prefix) "G__" (car prefix))))
|
||||
(set! jolt-gensym-counter (+ jolt-gensym-counter 1))
|
||||
(jolt-symbol #f
|
||||
(string-append (if (string? p) p (jolt-str-render-one p))
|
||||
(number->string jolt-gensym-counter)))))
|
||||
|
||||
(define (jolt-int x) (if (char? x) (exact->inexact (char->integer x)) (truncate x)))
|
||||
(define (jolt-double x) (if (char? x) (exact->inexact (char->integer x)) (exact->inexact x)))
|
||||
|
||||
;; compare: 3-way, ported from core_io.janet core-compare.
|
||||
(define (jolt-cmp3 x y) (cond ((< x y) -1.0) ((> x y) 1.0) (else 0.0)))
|
||||
(define (jolt-strcmp a b) (cond ((string<? a b) -1.0) ((string>? a b) 1.0) (else 0.0)))
|
||||
(define (jolt-kw->string k)
|
||||
(let ((ns (keyword-t-ns k))) (if ns (string-append ns "/" (keyword-t-name k)) (keyword-t-name k))))
|
||||
(define (jolt-sym-ns-string s)
|
||||
(let ((n (symbol-t-ns s))) (if (or (jolt-nil? n) (not n) (eq? n '())) "" n)))
|
||||
(define (jolt-compare a b)
|
||||
(cond
|
||||
((and (jolt-nil? a) (jolt-nil? b)) 0.0)
|
||||
((jolt-nil? a) -1.0)
|
||||
((jolt-nil? b) 1.0)
|
||||
((and (number? a) (number? b)) (jolt-cmp3 a b))
|
||||
((and (string? a) (string? b)) (jolt-strcmp a b))
|
||||
((and (keyword? a) (keyword? b)) (jolt-strcmp (jolt-kw->string a) (jolt-kw->string b)))
|
||||
((and (jolt-symbol? a) (jolt-symbol? b))
|
||||
(let ((r (jolt-strcmp (jolt-sym-ns-string a) (jolt-sym-ns-string b))))
|
||||
(if (= r 0.0) (jolt-strcmp (symbol-t-name a) (symbol-t-name b)) r)))
|
||||
((and (boolean? a) (boolean? b)) (cond ((eq? a b) 0.0) ((eq? a #f) -1.0) (else 1.0)))
|
||||
((and (char? a) (char? b)) (jolt-cmp3 (char->integer a) (char->integer b)))
|
||||
((and (pvec? a) (pvec? b))
|
||||
(let ((la (pvec-count a)) (lb (pvec-count b)))
|
||||
(if (not (= la lb))
|
||||
(jolt-cmp3 la lb)
|
||||
(let loop ((i 0))
|
||||
(if (>= i la)
|
||||
0.0
|
||||
(let ((r (jolt-compare (pvec-nth-d a i jolt-nil) (pvec-nth-d b i jolt-nil))))
|
||||
(if (= r 0.0) (loop (+ i 1)) r)))))))
|
||||
(else (error #f "compare: cannot compare these types" a b))))
|
||||
|
||||
(def-var! "clojure.core" "str" jolt-str)
|
||||
(def-var! "clojure.core" "subs" jolt-subs)
|
||||
(def-var! "clojure.core" "vec" jolt-vec)
|
||||
(def-var! "clojure.core" "keyword" jolt-keyword)
|
||||
(def-var! "clojure.core" "symbol" jolt-symbol-new)
|
||||
(def-var! "clojure.core" "gensym" jolt-gensym)
|
||||
(def-var! "clojure.core" "int" jolt-int)
|
||||
(def-var! "clojure.core" "double" jolt-double)
|
||||
(def-var! "clojure.core" "compare" jolt-compare)
|
||||
|
|
@ -144,3 +144,8 @@
|
|||
(if (jolt-nil? s) (reverse acc)
|
||||
(loop (jolt-seq (seq-more s)) (cons (jolt-pr-str (seq-first s)) acc))))) ")"))
|
||||
(else (format "~a" x))))
|
||||
|
||||
;; converters + string ops (jolt-t6cr): str/subs/vec/keyword/symbol/compare/int/
|
||||
;; double/gensym — host-coupled seed natives def-var!'d into clojure.core. Loaded
|
||||
;; LAST because `str` reuses jolt-pr-str (defined just above).
|
||||
(load "host/chez/converters.ss")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue