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

Read an unknown #tag as a tagged-literal value

Browse source 
An unknown reader tag produced the reader's internal form
{:jolt/type :jolt/tagged :tag :#foo :form bar}, which tagged-literal? didn't
recognize and which leaked as a raw map when printed:

  (tagged-literal? (read-string "#foo bar"))  => false   ; want true
  (pr-str (quote [#foo bar]))                 => "[{:jolt/type :jolt/tagged ...}]"

Both the data path (rdr-construct-tag) and the compile path (emit-quoted) now
build a real tagged-literal for a tag with no registered reader, like Clojure's
*default-data-reader-fn*, so tagged-literal? / :tag / :form / printing all work.
clojure.edn reads raw forms through a separate __read-form-raw path and applies
:readers/:default itself, so it is unaffected.

Re-mint (backend + reader are seed sources); prelude byte-identical, image only.
make test green (selfhost holds, 0 new/stale), +2 unit rows.
This commit is contained in:
Yogthos 2026-07-01 16:17:52 -04:00
parent f856c16f06
commit b4d9eaa527
4 changed files with 114 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

7
host/chez/reader.ss
View file

@ -748,7 +748,12 @@
(if fn (jolt-invoke fn inner)
(let ((dfn (rdr-default-data-reader-fn)))
(if dfn (jolt-invoke dfn (rdr-tag->symbol tag) inner)
(rdr-make-tagged tag inner))))))))
;; no reader for the tag: a proper tagged-literal value, like
;; Clojure's *default-data-reader-fn* (tagged-literal), so
;; tagged-literal? / :tag / :form / printing all work — not the
;; internal reader form. clojure.edn reads raw forms via
;; __read-form-raw, so its :readers/:default path is unaffected.
(jolt-tagged-literal (rdr-tag->symbol tag) inner))))))))
;; rdr-form->data*: convert the VALUE structure (set/tagged/nested forms). The
;; wrapper below adds the metadata, so the unchanged branches return x bare.

196
host/chez/seed/image.ss
View file

File diff suppressed because one or more lines are too long

8
jolt-core/jolt/backend_scheme.clj
View file

@ -377,6 +377,14 @@
;; value, not the raw tagged form). Same emit as the :inst / :uuid IR leaves.
(form-inst? form) (str "(jolt-inst-from-string " (chez-str-lit (form-inst-source form)) ")")
(form-uuid? form) (str "(jolt-uuid-from-string " (chez-str-lit (form-uuid-source form)) ")")
;; a quoted custom #tag with no registered reader -> a tagged-literal value
;; (Clojure's reader builds a TaggedLiteral), not the raw reader map. The tag is
;; stored as a :#name keyword; strip the leading # to the bare symbol.
(and (map? form) (= :jolt/tagged (get form :jolt/type)))
(let [nm (name (get form :tag))
tsym (if (= \# (first nm)) (subs nm 1) nm)]
(str "(jolt-tagged-literal (jolt-symbol #f " (chez-str-lit tsym) ") "
(emit-quoted (get form :form)) ")"))
;; plain jolt VALUES (metadata maps and anything nested in them)
(map? form) (emit-quoted-map-value form)
(vector? form) (str "(jolt-vector " (str/join " " (map emit-quoted form)) ")")

2
test/chez/unit.edn
View file

@ -312,6 +312,8 @@
{:suite "reader" :expr "(nil? (read-string \"nil\"))" :expected "true"}
{:suite "reader" :expr "(true? (read-string \"true\"))" :expected "true"}
{:suite "reader" :expr "(false? (read-string \"false\"))" :expected "true"}
{:suite "reader" :expr "(let [r (read-string \"#foo bar\")] (and (tagged-literal? r) (= (quote foo) (:tag r)) (= (quote bar) (:form r)) (= \"#foo bar\" (pr-str r))))" :expected "true"}
{:suite "reader" :expr "(let [t (first (quote [#foo bar]))] (and (tagged-literal? t) (= (quote foo) (:tag t)) (= \"#foo bar\" (pr-str t))))" :expected "true"}
{:suite "reader" :expr "(= \\a (read-string \"\\\\a\"))" :expected "true"}
{:suite "reader" :expr "(= \\newline (read-string \"\\\\newline\"))" :expected "true"}
{:suite "reader" :expr "(= \\space (read-string \"\\\\space\"))" :expected "true"}