eb7a9f1b20
Fifteen vars from the spec coverage gap (docs/spec/coverage.md): parse-long/parse-double/parse-boolean (strict validation; scan-number alone accepts 0x10), newline, current-time-ms (host clock for time), update-keys/ update-vals (PHM base, collisions last-wins), partitionv/partitionv-all/ splitv-at (lazy seqs of vectors; splitv-at's tail stays a seq, matching the reference), with-redefs/with-redefs-fn (roots restored on throw), time, macroexpand (expand-1 to fixpoint), alias/ns-unalias (write BOTH alias stores — require :as uses string-keyed :imports while ns-aliases reads :aliases; split filed), ns-publics (symbol-keyed map; publics == interns, no privacy). Three pre-existing bugs fixed along the way: - (partition n step pad coll) misparsed pad as the coll and returned () - (require 'bare.symbol) rejected — only vector specs were accepted - analyze-form leaked the interpreted analyzer's ns on a punt: a throw out of the analyzer left current-ns=jolt.analyzer and :compile-ns set, so the fallback interpretation resolved user vars against the wrong namespace (bit (var user-sym) under compile mode) And one overlay-authoring landmine documented in-code: a 20-coll fn must not use 30-macros macros (with-redefs-fn's dotimes compiled as a forward ref that resolved to the macro fn at runtime) — loop/recur instead. Gate: conformance 316x3 (+14 rows), suite 4324 pass / 78 clean (was 4081/72; parse_*/update_* files now contribute), baselines raised, all specs+unit, fixpoint, self-host, sci, staged. Coverage: missing-portable 35 -> 20.
87 lines
5.4 KiB
Text
87 lines
5.4 KiB
Text
# Specification: macros, quoting and syntax-quote.
|
|
(use ../support/harness)
|
|
|
|
(defspec "macros / quoting"
|
|
["quote symbol" "(quote a)" "(quote a)"]
|
|
["quote list" "[1 2 3]" "(quote (1 2 3))"]
|
|
["quote nested" "[1 [2 3]]" "(quote (1 (2 3)))"]
|
|
["quote sugar" "'a" "'a"]
|
|
["syntax-quote literal" "[1 2]" "`[1 2]"]
|
|
["unquote" "[1 2 3]" "(let [x 2] `[1 ~x 3])"]
|
|
["unquote-splicing" "[1 2 3 4]" "(let [xs [2 3]] `[1 ~@xs 4])"]
|
|
["unquote in list" "[3]" "(let [x 3] `(~x))"]
|
|
["syntax-quote symbol qualifies" "true" "(symbol? `foo)"])
|
|
|
|
(defspec "macros / defmacro"
|
|
["simple macro" "3"
|
|
"(do (defmacro m [a b] `(+ ~a ~b)) (m 1 2))"]
|
|
["macro unless" "1"
|
|
"(do (defmacro unless [c body] `(if ~c nil ~body)) (unless false 1))"]
|
|
["macro with body splice" "6"
|
|
"(do (defmacro msum [& xs] `(+ ~@xs)) (msum 1 2 3))"]
|
|
["macroexpand-1" "true"
|
|
"(do (defmacro m [x] `(inc ~x)) (list? (macroexpand-1 '(m 5))))"]
|
|
["gensym unique" "false"
|
|
"(= (gensym) (gensym))"]
|
|
["gensym# in template" "true"
|
|
"(do (defmacro m [] `(let [x# 1] x#)) (= 1 (m)))"])
|
|
|
|
# Core macros ported from Janet to the Clojure overlay (jolt-1j0 phase 3,
|
|
# jolt-core/clojure/core/30-macros.clj).
|
|
(defspec "macros / core-overlay"
|
|
["if-not true branch" ":then" "(if-not false :then :else)"]
|
|
["if-not else branch" ":else" "(if-not true :then :else)"]
|
|
["if-not no else" "nil" "(if-not true :then)"]
|
|
["if-not no else hit" ":then" "(if-not false :then)"]
|
|
["comment -> nil" "nil" "(comment a b c)"]
|
|
["comment in do" "42" "(do (comment ignored) 42)"]
|
|
["if-let then" "6" "(if-let [x 5] (inc x) :none)"]
|
|
["if-let else" ":none" "(if-let [x nil] (inc x) :none)"]
|
|
["if-let else scope" "9" "(let [x 9] (if-let [x nil] :t x))"]
|
|
["if-some zero" "1" "(if-some [x 0] (inc x) :none)"]
|
|
["if-some nil" ":none" "(if-some [x nil] x :none)"]
|
|
["when-some multi" "14" "(when-some [x 7] (inc x) (* x 2))"]
|
|
["when-some nil" "nil" "(when-some [x nil] x)"]
|
|
["while loop" "3" "(let [a (atom 0)] (while (< @a 3) (swap! a inc)) @a)"]
|
|
["dotimes sum" "10" "(let [a (atom 0)] (dotimes [i 5] (swap! a + i)) @a)"]
|
|
["as-> threads" "12" "(as-> 5 x (+ x 1) (* x 2))"]
|
|
["as-> no forms" "5" "(as-> 5 x)"]
|
|
["some-> through" "6" "(some-> {:a {:b 5}} :a :b inc)"]
|
|
["some-> short-circuit" "nil" "(some-> {:a nil} :a :b)"]
|
|
["some->> through" "9" "(some->> [1 2 3] (map inc) (reduce +))"]
|
|
["some->> nil" "nil" "(some->> nil (map inc))"]
|
|
["doto returns obj" "[1 2]" "(deref (doto (atom []) (swap! conj 1) (swap! conj 2)))"]
|
|
["when-first" "20" "(when-first [x [10 20 30]] (* x 2))"]
|
|
["when-first empty" "nil" "(when-first [x []] :body)"]
|
|
["when-first nil coll" "nil" "(when-first [x nil] :body)"]
|
|
["when-first range" "0" "(when-first [x (range 5)] x)"]
|
|
["cond->> threads" "12" "(cond->> 5 true (+ 1) false (* 100) true (* 2))"]
|
|
["cond->> skip" "10" "(cond->> 10 false (+ 1))"]
|
|
["assert pass" ":ok" "(do (assert (= 1 1)) :ok)"]
|
|
["assert throws" ":threw" "(try (assert (= 1 2)) (catch :default e :threw))"]
|
|
["assert message" "\"nope\"" "(try (assert false \"nope\") (catch :default e (ex-message e)))"]
|
|
["delay value" "42" "(deref (delay 42))"]
|
|
["delay forces once" "1" "(let [c (atom 0) d (delay (swap! c inc))] @d @d @c)"]
|
|
["future deref" "9" "(deref (future (* 3 3)))"]
|
|
["letfn simple" "25" "(letfn [(sq [x] (* x x))] (sq 5))"]
|
|
["letfn mutual" "true" "(letfn [(ev? [n] (if (zero? n) true (od? (dec n)))) (od? [n] (if (zero? n) false (ev? (dec n))))] (ev? 8))"]
|
|
["condp match" ":two" "(condp = 2 1 :one 2 :two 3 :three)"]
|
|
["condp default" ":else" "(condp = 9 1 :one 2 :two :else)"]
|
|
["condp :>> form" "\"got 2\"" "(condp some [1 2 3] #{0 9} :>> (fn [x] (str \"got \" x)) #{2 6} :>> (fn [x] (str \"got \" x)))"]
|
|
["condp no match" ":threw" "(try (condp = 9 1 :one) (catch :default e :threw))"]
|
|
["binding rebinds" "99" "(do (def ^:dynamic *bx* 10) (binding [*bx* 99] *bx*))"]
|
|
["binding restores" "10" "(do (def ^:dynamic *by* 10) (binding [*by* 99] *by*) *by*)"]
|
|
["binding seen by fn" "7" "(do (def ^:dynamic *bz* 0) (defn rdz [] *bz*) (binding [*bz* 7] (rdz)))"])
|
|
|
|
# time returns the body value (the timing line goes to *out*); with-redefs
|
|
# temporarily rebinds var roots and restores on exit (even on throw);
|
|
# macroexpand expands repeatedly until the head is no longer a macro.
|
|
(defspec "macros / time, with-redefs, macroexpand"
|
|
["time returns value" "3" "(time (+ 1 2))"]
|
|
["with-redefs rebinds" "42" "(do (defn wr-f [] 1) (with-redefs [wr-f (fn [] 42)] (wr-f)))"]
|
|
["with-redefs restores" "1" "(do (defn wr-g [] 1) (with-redefs [wr-g (fn [] 42)]) (wr-g))"]
|
|
["with-redefs restores on throw" "1"
|
|
"(do (defn wr-h [] 1) (try (with-redefs [wr-h (fn [] 42)] (throw (ex-info \"x\" {}))) (catch :default e nil)) (wr-h))"]
|
|
["with-redefs-fn" "42" "(do (defn wr-i [] 1) (with-redefs-fn {(var wr-i) (fn [] 42)} (fn [] (wr-i))))"]
|
|
["macroexpand full" "true" "(let [e (macroexpand (quote (when-not false 1)))] (= (quote if) (first e)))"]
|
|
["macroexpand non-macro" "[1 2]" "(macroexpand (quote [1 2]))"])
|