fix: print Infinity/-Infinity/NaN like Clojure (str and pr-str)

Numbers printed via Janet's (string v) rendered infinities/NaN as inf/-inf/nan.
Add fmt-number so str/pr-str (and collection rendering) emit Infinity/-Infinity/
NaN. str.cljc 3->32 pass. Remaining str fails are the integer-valued-double
divergence ((str 0.0) is "0" not "0.0" since 0.0 == 0 in Janet).

spec: numbers/printing-of-inf-&-nan (5). jpm test green.
This commit is contained in:
Yogthos 2026-06-05 10:23:57 -04:00
parent bcdace7543
commit a4d9d5f70b
3 changed files with 20 additions and 3 deletions

View file

@ -1424,6 +1424,16 @@
# syntax. Used by both pr-str (readable) and str (collection elements). # syntax. Used by both pr-str (readable) and str (collection elements).
(var pr-render nil) (var pr-render nil)
# Format a number the way Clojure prints it: infinity and NaN have named forms
# (Janet renders them "inf"/"-inf"/"nan").
(defn- fmt-number [v]
(cond
(not (number? v)) (string v)
(= v math/inf) "Infinity"
(= v (- math/inf)) "-Infinity"
(not= v v) "NaN"
(string v)))
(defn- pr-render-seq [buf items open close] (defn- pr-render-seq [buf items open close]
(buffer/push-string buf open) (buffer/push-string buf open)
(var first true) (var first true)
@ -1458,7 +1468,7 @@
12 "formfeed" 8 "backspace" 0 "nul" 12 "formfeed" 8 "backspace" 0 "nul"
(char->string v)))) (char->string v))))
(regex? v) (do (buffer/push-string buf "#\"") (buffer/push-string buf (v :source)) (buffer/push-string buf "\"")) (regex? v) (do (buffer/push-string buf "#\"") (buffer/push-string buf (v :source)) (buffer/push-string buf "\""))
(number? v) (buffer/push-string buf (string v)) (number? v) (buffer/push-string buf (fmt-number v))
(and (struct? v) (= :symbol (v :jolt/type))) (and (struct? v) (= :symbol (v :jolt/type)))
(buffer/push-string buf (if (v :ns) (string (v :ns) "/" (v :name)) (v :name))) (buffer/push-string buf (if (v :ns) (string (v :ns) "/" (v :name)) (v :name)))
(core-sorted-map? v) (pr-render-pairs buf (sorted-map-entries v)) (core-sorted-map? v) (pr-render-pairs buf (sorted-map-entries v))
@ -1489,7 +1499,7 @@
(keyword? v) (string ":" (string v)) (keyword? v) (string ":" (string v))
(and (struct? v) (= :symbol (v :jolt/type))) (and (struct? v) (= :symbol (v :jolt/type)))
(if (v :ns) (string (v :ns) "/" (v :name)) (v :name)) (if (v :ns) (string (v :ns) "/" (v :name)) (v :name))
(number? v) (string v) (number? v) (fmt-number v)
(= true v) "true" (= true v) "true"
(= false v) "false" (= false v) "false"
(let [buf @""] (pr-render buf v) (string buf)))) (let [buf @""] (pr-render buf v) (string buf))))

View file

@ -18,7 +18,7 @@
# Baseline: assertions Jolt currently passes across the suite. Raise as Jolt # Baseline: assertions Jolt currently passes across the suite. Raise as Jolt
# improves so a regression (previously-passing assertion breaking) is caught. # improves so a regression (previously-passing assertion breaking) is caught.
(def baseline-pass 3660) (def baseline-pass 3680)
# A file is "clean" when it ran with zero failures AND zero errors. # A file is "clean" when it ran with zero failures AND zero errors.
(def baseline-clean-files 45) (def baseline-clean-files 45)
# Per-file wall-clock budget (seconds). Normal files finish in well under 1s; # Per-file wall-clock budget (seconds). Normal files finish in well under 1s;

View file

@ -90,6 +90,13 @@
["exponent" "1000.0" "1e3"] ["exponent" "1000.0" "1e3"]
["exponent neg" "0.015" "1.5e-2"]) ["exponent neg" "0.015" "1.5e-2"])
(defspec "numbers / printing of inf & nan"
["str Infinity" "\"Infinity\"" "(str ##Inf)"]
["str -Infinity" "\"-Infinity\"" "(str ##-Inf)"]
["str NaN" "\"NaN\"" "(str ##NaN)"]
["pr-str Infinity" "\"Infinity\"" "(pr-str ##Inf)"]
["inf inside coll" "\"[Infinity]\"" "(str [##Inf])"])
(defspec "numbers / bit-ops & math" (defspec "numbers / bit-ops & math"
["bit-and" "4" "(bit-and 12 6)"] ["bit-and" "4" "(bit-and 12 6)"]
["bit-or" "14" "(bit-or 12 6)"] ["bit-or" "14" "(bit-or 12 6)"]