From 154dc6b3f9688d36fd9fb75e5b192ba8808ee8a5 Mon Sep 17 00:00:00 2001 From: Ben Sless Date: Tue, 19 Mar 2024 21:32:45 +0200 Subject: [PATCH] Add IOverride cache Closes #87 --- src/fipp/edn.cljc | 17 +++++++++++++++-- src/fipp/visit.cljc | 7 ++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/fipp/edn.cljc b/src/fipp/edn.cljc index 29cf20b..7fe1621 100644 --- a/src/fipp/edn.cljc +++ b/src/fipp/edn.cljc @@ -2,7 +2,7 @@ "Provides a pretty document serializer and pprint fn for Clojure/EDN forms. See fipp.clojure for pretty printing Clojure code." (:require [clojure.string :as str] - [fipp.ednize :refer [edn record->tagged]] + [fipp.ednize :refer [edn record->tagged IOverride]] [fipp.visit :refer [visit visit*]] [fipp.engine :refer (pprint-document)])) @@ -19,10 +19,22 @@ [:span sep "..."])] [:group open [:align ys ellipsis] close])) -(defrecord EdnPrinter [symbols print-meta print-length print-level] +(defn- cached-override? + [cache x] + (let [clazz (type x) + ret (get @cache clazz ::not-found)] + (if (identical? ::not-found ret) + (let [ret (satisfies? IOverride x)] + (vswap! cache assoc clazz ret) + ret) + ret))) + +(defrecord EdnPrinter [symbols print-meta print-length print-level cache] fipp.visit/IVisitor + (visit-ovrride? [_ x] + (cached-override? cache x)) (visit-unknown [this x] (visit this (edn x))) @@ -96,6 +108,7 @@ ([x] (pretty x {})) ([x options] (let [defaults {:symbols {} + :cache (volatile! {}) :print-length *print-length* :print-level *print-level* :print-meta *print-meta*} diff --git a/src/fipp/visit.cljc b/src/fipp/visit.cljc index 5ac82e7..29f6bd1 100644 --- a/src/fipp/visit.cljc +++ b/src/fipp/visit.cljc @@ -1,7 +1,6 @@ (ns fipp.visit "Convert to and visit edn structures." - (:require [fipp.util :as util] - [fipp.ednize :refer [override?]])) + (:require [fipp.util :as util])) ;;;TODO Stablize public interface @@ -27,6 +26,8 @@ (visit-var [this x]) (visit-pattern [this x]) (visit-record [this x]) + + (visit-override? [this x]) ) (defn visit* @@ -34,7 +35,7 @@ [visitor x] (cond (nil? x) (visit-nil visitor) - (override? x) (visit-unknown visitor x) + (visit-override? visitor x) (visit-unknown visitor x) (util/boolean? x) (visit-boolean visitor x) (string? x) (visit-string visitor x) (util/char? x) (visit-character visitor x)