8c7b98e5f2
class / .getClass now return a Class value that renders like the JVM — (str c)/.toString -> "class <name>", pr -> "<name>", .getName/.getSimpleName/ .getCanonicalName work — but stays = and hash equal to its name string, so (= (class x) String), class-keyed maps, multimethod dispatch on class, and instance? keep working against the bare class-name tokens. instance? unwraps a Class passed as the type arg. clojure.test/class-match? no longer assumes (class e) is a string (a jolt-ism; on the JVM a Class isn't a string either) — reads the name via .getName. Matches JVM Class.toString, which libraries surface in error messages (clojure.data.json DJSON-54 expects "...of class java.net.URI"). data.json suite 139/139 bar the one UTF-16 surrogate test (Unicode-scalar char model). 5 corpus rows certified vs JVM; make test + shakesmoke green, 0 new divergences.
135 lines
7.6 KiB
Scheme
135 lines
7.6 KiB
Scheme
;; host class tokens — a bare class name (String, Keyword, File...)
|
|
;; evaluates to its JVM canonical-name STRING, the same value (class instance)
|
|
;; returns, so (= String (class "x")) holds and a (defmethod m String ...) keys
|
|
;; against a (class …) dispatch (ring.util.request does this).
|
|
;; The analyzer resolves these names to clojure.core vars, so the back end emits
|
|
;; (var-deref "clojure.core" "String") — def-var!'ing the canonical strings here is
|
|
;; all that's needed at runtime.
|
|
;;
|
|
;; Loaded after natives-meta.ss (jolt-type) + the printer (jolt-str-render-one).
|
|
|
|
;; (class x) — Clojure's class of a value. Scalars map to their JVM class name,
|
|
;; matching core-class. Collections/seqs have no JVM class on this host;
|
|
;; (str (type x)) is the clean host taxonomy and
|
|
;; is never compared against a class token in the corpus. Records yield their
|
|
;; ns-qualified class name (= (str (type x))). Total — never crashes.
|
|
;; A host shim (bigdec, queue, host-table) registers its type's class name via
|
|
;; register-class-arm! instead of set!-wrapping jolt-class (cf. register-hash-arm!).
|
|
;; The entry is stable, so the var cell bound below stays current as arms register.
|
|
(define jolt-class-arms '())
|
|
(define (register-class-arm! pred handler)
|
|
(set! jolt-class-arms (cons (cons pred handler) jolt-class-arms)))
|
|
(define (jolt-class-base x)
|
|
(cond
|
|
((jolt-nil? x) jolt-nil)
|
|
((boolean? x) "java.lang.Boolean")
|
|
;; per-type number classes, like the JVM: integer -> Long, flonum -> Double,
|
|
;; exact non-integer -> Ratio.
|
|
((and (number? x) (flonum? x)) "java.lang.Double")
|
|
((and (number? x) (exact? x) (integer? x)) "java.lang.Long")
|
|
((and (number? x) (exact? x) (rational? x)) "clojure.lang.Ratio")
|
|
((number? x) "java.lang.Number")
|
|
((string? x) "java.lang.String")
|
|
((keyword? x) "clojure.lang.Keyword")
|
|
((symbol-t? x) "clojure.lang.Symbol")
|
|
((jolt-atom? x) "clojure.lang.Atom")
|
|
((char? x) "java.lang.Character")
|
|
((regex-t? x) "java.util.regex.Pattern")
|
|
((procedure? x) "clojure.lang.IFn")
|
|
;; an exception value (ex-info / host-constructed throwable) reports its JVM
|
|
;; class, so (= clojure.lang.ExceptionInfo (class e)) and clojure.test's
|
|
;; (thrown? Class …) match (records.ss ex-info-map?/ex-info-class).
|
|
((ex-info-map? x) (ex-info-class x))
|
|
(else (jolt-str-render-one (jolt-type x)))))
|
|
;; the class NAME of x (string), or nil for nil. (class x) wraps it in a Class
|
|
;; value (make-class-obj, host-static-classes.ss) so it renders like a JVM Class
|
|
;; while staying = its name string.
|
|
(define (jolt-class-name x)
|
|
(let loop ((as jolt-class-arms))
|
|
(cond ((null? as) (jolt-class-base x))
|
|
(((caar as) x) ((cdar as) x))
|
|
(else (loop (cdr as))))))
|
|
(define (jolt-class x)
|
|
(let ((n (jolt-class-name x)))
|
|
(if (jolt-nil? n) jolt-nil (make-class-obj n))))
|
|
|
|
(def-var! "clojure.core" "class" jolt-class)
|
|
|
|
;; bare class-name tokens -> canonical JVM class-name strings.
|
|
(define class-token-alist
|
|
'(("String" . "java.lang.String") ("Number" . "java.lang.Number")
|
|
("Boolean" . "java.lang.Boolean") ("Long" . "java.lang.Long")
|
|
("Integer" . "java.lang.Integer") ("Double" . "java.lang.Double")
|
|
("Object" . "java.lang.Object") ("Character" . "java.lang.Character")
|
|
("InputStream" . "java.io.InputStream") ("OutputStream" . "java.io.OutputStream")
|
|
("File" . "java.io.File") ("Reader" . "java.io.Reader") ("Writer" . "java.io.Writer")
|
|
("ISeq" . "clojure.lang.ISeq") ("Keyword" . "clojure.lang.Keyword")
|
|
("Symbol" . "clojure.lang.Symbol") ("MapEntry" . "clojure.lang.MapEntry")
|
|
("StringReader" . "java.io.StringReader") ("StringWriter" . "java.io.StringWriter")
|
|
("StringBuilder" . "java.lang.StringBuilder")
|
|
("StringTokenizer" . "java.util.StringTokenizer")
|
|
("Charset" . "java.nio.charset.Charset") ("Base64" . "java.util.Base64")
|
|
("Exception" . "java.lang.Exception")
|
|
("IllegalArgumentException" . "java.lang.IllegalArgumentException")
|
|
("IllegalStateException" . "java.lang.IllegalStateException")
|
|
("RuntimeException" . "java.lang.RuntimeException")
|
|
("UnsupportedOperationException" . "java.lang.UnsupportedOperationException")
|
|
("InterruptedException" . "java.lang.InterruptedException")
|
|
("IOException" . "java.io.IOException")
|
|
("UnknownHostException" . "java.net.UnknownHostException")
|
|
("ConnectException" . "java.net.ConnectException")
|
|
("SocketTimeoutException" . "java.net.SocketTimeoutException")
|
|
("MalformedURLException" . "java.net.MalformedURLException")
|
|
("SSLException" . "javax.net.ssl.SSLException")
|
|
("ExceptionInfo" . "clojure.lang.ExceptionInfo")
|
|
("IExceptionInfo" . "clojure.lang.IExceptionInfo")
|
|
("Pattern" . "java.util.regex.Pattern")
|
|
("URI" . "java.net.URI") ("UUID" . "java.util.UUID")
|
|
("ArrayList" . "java.util.ArrayList") ("PersistentQueue" . "clojure.lang.PersistentQueue")
|
|
("NumberFormatException" . "java.lang.NumberFormatException")
|
|
("ArithmeticException" . "java.lang.ArithmeticException")
|
|
("NullPointerException" . "java.lang.NullPointerException")
|
|
("ClassCastException" . "java.lang.ClassCastException")
|
|
("IndexOutOfBoundsException" . "java.lang.IndexOutOfBoundsException")
|
|
("UnsupportedEncodingException" . "java.io.UnsupportedEncodingException")
|
|
("FileNotFoundException" . "java.io.FileNotFoundException")
|
|
("Throwable" . "java.lang.Throwable")))
|
|
(for-each
|
|
(lambda (pair) (def-var! "clojure.core" (car pair) (cdr pair)))
|
|
class-token-alist)
|
|
|
|
;; resolve a ^Type hint symbol-name to its canonical class name at def time:
|
|
;; "String" -> "java.lang.String", matching the JVM compiler. An
|
|
;; already-canonical name maps to itself; an unknown name yields #f (left as-is).
|
|
(define class-hint-table (make-hashtable string-hash string=?))
|
|
(for-each (lambda (p) (hashtable-set! class-hint-table (car p) (cdr p))) class-token-alist)
|
|
(for-each (lambda (p) (hashtable-set! class-hint-table (cdr p) (cdr p))) class-token-alist)
|
|
(define (resolve-class-hint name) (hashtable-ref class-hint-table name #f))
|
|
(def-var! "jolt.host" "resolve-class-hint" resolve-class-hint)
|
|
|
|
;; fully-qualified canonical class names self-evaluate to their own name string,
|
|
;; so (= (class 1) java.lang.Long) and (instance? clojure.lang.Atom x) resolve the
|
|
;; class token (= what jolt-class / instance-check key on).
|
|
;; Value classes only — NOT the collection interfaces (ISeq/IPersistentMap/...),
|
|
;; which downstream code (e.g. SCI) references as protocols/interfaces.
|
|
(for-each
|
|
(lambda (nm) (def-var! "clojure.core" nm nm))
|
|
'("java.lang.Long" "java.lang.Integer" "java.lang.Double" "java.lang.Float"
|
|
"java.lang.Number" "java.lang.String" "java.lang.Boolean" "java.lang.Character"
|
|
"java.lang.Object"
|
|
;; exception classes compared against (class e): (= java.net.SocketTimeoutException (class e))
|
|
"java.lang.Exception" "java.lang.Throwable" "java.lang.RuntimeException"
|
|
"java.lang.IllegalArgumentException" "java.lang.IllegalStateException"
|
|
"java.lang.UnsupportedOperationException" "java.io.IOException"
|
|
"java.net.UnknownHostException" "java.net.ConnectException"
|
|
"java.net.SocketTimeoutException" "java.net.MalformedURLException"
|
|
"javax.net.ssl.SSLException"
|
|
"java.lang.NumberFormatException" "java.lang.ArithmeticException"
|
|
"java.lang.NullPointerException" "java.lang.ClassCastException"
|
|
"java.lang.IndexOutOfBoundsException" "java.io.FileNotFoundException"
|
|
"java.io.UnsupportedEncodingException"
|
|
;; clojure.lang.ExceptionInfo / IExceptionInfo compared against (class e)
|
|
"clojure.lang.ExceptionInfo" "clojure.lang.IExceptionInfo"
|
|
"java.util.regex.Pattern" "java.net.URI" "java.util.UUID"
|
|
"clojure.lang.PersistentQueue"
|
|
"clojure.lang.Keyword" "clojure.lang.Symbol" "clojure.lang.Ratio" "clojure.lang.Atom"))
|