rearrange code to hide riddley usage from bootstrap

This commit is contained in:
Nathan Marz 2016-06-13 19:49:35 -04:00
parent aedb7235f9
commit ecda5e2cff
2 changed files with 10 additions and 3 deletions

View file

@ -72,6 +72,14 @@
; (macroexpand' x) ; (macroexpand' x)
; x)) form)) ; x)) form))
#+clj
(defn clj-macroexpand-all [form]
(riddley/macroexpand-all form))
#+cljs
(defn clj-macroexpand-all [form]
(throw-illegal "not implemented"))
#+clj #+clj
(defn intern* [ns name val] (intern ns name val)) (defn intern* [ns name val] (intern ns name val))

View file

@ -1,7 +1,6 @@
(ns com.rpl.specter.macros (ns com.rpl.specter.macros
(:require [com.rpl.specter.impl :as i] (:require [com.rpl.specter.impl :as i]
[clojure.walk :as cljwalk] [clojure.walk :as cljwalk])
[riddley.walk :as riddley])
) )
(defn ^:no-doc gensyms [amt] (defn ^:no-doc gensyms [amt]
@ -496,7 +495,7 @@
;; &env is preserved in any potential nested calls to select (like via ;; &env is preserved in any potential nested calls to select (like via
;; a view function) ;; a view function)
expanded (if (= platform :clj) expanded (if (= platform :clj)
(riddley/macroexpand-all (vec path)) (i/clj-macroexpand-all (vec path))
(cljs-macroexpand-all &env (vec path))) (cljs-macroexpand-all &env (vec path)))
prepared-path (ic-prepare-path local-syms expanded) prepared-path (ic-prepare-path local-syms expanded)