4de586089c
Starts taking the reader off Janet (src/jolt/reader.janet, 831 lines) into
portable jolt-core Clojure. jolt.reader holds the lexing/parsing LOGIC; form
construction + string->number parsing delegate to the jolt.host contract — a
Clojure source file can't write a {:jolt/type :symbol} literal (parses as a
tagged form) and the concrete representation is the host's to own. Same split the
analyzer/emitter already use. Once cross-compiled this runs on Chez so compile-
from-source needs no Janet reader.
inc 5a = the atom layer: whitespace/comments, symbols (+ nil/true/false),
keywords, strings (escapes), numbers (sign/hex/radix/ratio/fractional/exponent,
trailing N/M), characters. Collections, quote/deref/meta and dispatch (#) follow
in 5b/5c (throw not-yet-ported). Positions are char indices (Janet uses bytes);
identical for ASCII and the gate compares form VALUES, not positions.
host_iface.janet gains four reader primitives on the contract: form-make-symbol,
form-make-char, form-char-from-name, form-scan-number (the irreducible host bits
the portable reader rests on). Additive — new jolt.host interns, nothing else
changed.
Surfaced jolt-if19 (Janet seed reader: +N literals error instead of reading as N;
read-number strips only the - sign). The port reproduces it; both-throw counts as
faithful parity in the gate.
Gate: reader-parity 64/64 (symbols/keywords/strings/ints/hex/radix/ratio/floats/
exponent/N-M/chars). Full jpm gate green after clean rebuild, conformance 355x3.
jolt-50xx.
66 lines
3.3 KiB
Text
66 lines
3.3 KiB
Text
# Chez Phase 3 inc 5a (jolt-50xx) — value-parity gate for the PORTABLE Clojure
|
|
# reader (jolt.reader) vs the Janet seed reader (src/jolt/reader.janet, oracle).
|
|
#
|
|
# jolt.reader holds the lexing/parsing LOGIC in portable Clojure and delegates
|
|
# form construction + number parsing to the jolt.host contract. Here it runs
|
|
# interpreted ON THE JANET HOST (loaded via bootstrap-load-source); each input is
|
|
# read by BOTH readers and the resulting FORMS compared with jolt's own = (so the
|
|
# representation, host-built either way, matches structurally). Positions differ
|
|
# (char vs byte indices) and are not compared.
|
|
#
|
|
# janet test/chez/reader-parity.janet (from repo root)
|
|
(import ../../src/jolt/api :as api)
|
|
(import ../../src/jolt/backend :as backend)
|
|
(import ../../src/jolt/reader :as r)
|
|
(import ../../src/jolt/types_ctx :as tctx)
|
|
(import ../../src/jolt/types_ns :as tns)
|
|
(import ../../src/jolt/types_var :as tvar)
|
|
(import ../../src/jolt/core :as core)
|
|
|
|
(var total 0) (var fails 0)
|
|
(defn ok [name pred &opt extra]
|
|
(++ total)
|
|
(if pred (printf "ok: %s" name)
|
|
(do (++ fails) (printf "FAIL: %s %s" name (or extra "")))))
|
|
|
|
(def ctx (api/init {:compile? true}))
|
|
(def src (get (get (ctx :env) :embedded-sources) "jolt.reader"))
|
|
(assert src "jolt.reader not embedded (check stdlib_embed collect)")
|
|
(backend/bootstrap-load-source ctx "jolt.reader" src)
|
|
(def read-one (tvar/var-get (tns/ns-find (tctx/ctx-find-ns ctx "jolt.reader") "read-one")))
|
|
(assert read-one "jolt.reader/read-one not found")
|
|
|
|
# jolt's own value equality (the host =), the same comparator the corpus gate uses.
|
|
(defn jeq [a b] (core/jolt-equal? a b))
|
|
|
|
(defn check [input]
|
|
(def w (protect (in (r/parse-next input) 0))) # Janet seed reader (oracle)
|
|
(def g (protect (read-one input))) # portable Clojure reader
|
|
(cond
|
|
# both readers throw on the same input = faithful parity (e.g. the +N latent
|
|
# bug, jolt-if19 — reader.janet dispatches +digit to read-number but never
|
|
# strips the +, so "+5" errors; the port reproduces it).
|
|
(and (not (w 0)) (not (g 0))) (ok input true)
|
|
(not (w 0)) (ok input false (string "janet threw, clj didn't: clj=" (string/format "%p" (g 1))))
|
|
(not (g 0)) (ok input false (string "clj threw, janet ok: " (string (g 1))))
|
|
(ok input (jeq (w 1) (g 1))
|
|
(string "clj=" (string/format "%p" (g 1)) " janet=" (string/format "%p" (w 1))))))
|
|
|
|
# --- inc 5a: atoms -------------------------------------------------------------
|
|
# nil / bool
|
|
(each i ["nil" "true" "false"] (check i))
|
|
# symbols (plain, ns'd, punctuation, special chars)
|
|
(each i ["foo" "foo-bar" "my.ns/bar" "+" "-" "*" "->" "<=" "some?" "a1" "x'" "ns/+"] (check i))
|
|
# keywords
|
|
(each i [":a" ":foo-bar" ":my.ns/key" "::auto" ":a1" ":+"] (check i))
|
|
# strings (escapes)
|
|
(each i [`"hello"` `"with space"` `"tab\there"` `"nl\nhere"` `"q\"q"` `"back\\slash"` `""`] (check i))
|
|
# integers / signs / hex / radix
|
|
(each i ["0" "42" "-7" "+5" "123456" "0xFF" "0x10" "-0xff" "2r1010" "16rFF" "36rZ" "8r17"] (check i))
|
|
# floats / exponent / ratio / N|M suffix
|
|
(each i ["3.14" "-2.5" "0.0" "1e10" "1.5e-3" "2E5" "10N" "3.14M" "1/2" "-3/4" "22/7"] (check i))
|
|
# characters
|
|
(each i [`\a` `\Z` `\0` `\newline` `\tab` `\space` `\return` `\\` `\(` `\{` `\%` `A` `\o101`] (check i))
|
|
|
|
(printf "\n%d/%d ok" (- total fails) total)
|
|
(when (> fails 0) (os/exit 1))
|