Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 3 additions & 24 deletions src/nextjournal/clerk/analyzer.clj
Original file line number Diff line number Diff line change
Expand Up @@ -501,33 +501,12 @@
(filter (comp #{:code} :type)
blocks))))

(defn transitive-deps
([id analysis-info]
(loop [seen #{}
deps #{id}
res #{}]
(if (seq deps)
(let [dep (first deps)]
(if (contains? seen dep)
(recur seen (rest deps) res)
(let [{new-deps :deps} (get analysis-info dep)
seen (conj seen dep)
deps (concat (rest deps) new-deps)
res (into res deps)]
(recur seen deps res))))
res))))

#_(transitive-deps id analysis-info)

#_(transitive-deps :main {:main {:deps [:main :other]}
:other {:deps [:another]}
:another {:deps [:another-one :another :main]}})

(defn run-macros [init-state]
(let [{:keys [blocks ->analysis-info]} init-state
(let [{:keys [blocks]} init-state
macro-block-ids (keep #(when (:macro %)
(:id %)) blocks)
deps (mapcat #(transitive-deps % ->analysis-info) macro-block-ids)
{:keys [graph]} (analyze-doc-deps init-state)
deps (mapcat (partial dep/transitive-dependencies graph) macro-block-ids)
all-block-ids (into (set macro-block-ids) deps)
all-blocks (filter #(contains? all-block-ids (:id %)) blocks)]
(doseq [block all-blocks]
Expand Down
7 changes: 5 additions & 2 deletions test/nextjournal/clerk/eval_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -294,14 +294,17 @@
(remove-ns 'fixture-ns)
(clerk/clear-cache!)
(let [ns "(ns my-random-namespace)
(defn helper-compile-time1 [x] x)
(defn helper-compile-time2 [x] (helper-compile-time1 x))
(defn macro-helper* [x] x)
(defmacro attempt1
[& body]
(helper-compile-time2
`(macro-helper* (try
(do ~@body)
(catch Exception e# e#))))
(catch Exception e# e#)))))
(def a1
(do
Expand Down
Loading