diff --git a/DEVELOPER.md b/DEVELOPER.md index 3f9e483..c46a583 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -7,7 +7,7 @@ lein cleantest # Running ClojureScript tests ``` -$ rm -rf out/ -$ rlwrap java -cp `lein classpath` clojure.main repl.clj -cljs.user=> (require 'com.rpl.specter.cljs-test-runner) +rm -rf out/ +rlwrap java -cp `lein classpath` clojure.main repl.clj +(require 'com.rpl.specter.cljs-test-runner) ``` diff --git a/src/clj/com/rpl/specter/zipper.cljx b/src/clj/com/rpl/specter/zipper.cljx index 353a3a8..a653af9 100644 --- a/src/clj/com/rpl/specter/zipper.cljx +++ b/src/clj/com/rpl/specter/zipper.cljx @@ -2,10 +2,11 @@ #+cljs (:require-macros [com.rpl.specter.macros :refer [defpath]]) + #+clj (:use - #+clj [com.rpl.specter.macros :only [defpath]] - [com.rpl specter]) - (:require [clojure [zip :as zip]])) + [com.rpl.specter.macros :only [defpath]]) + (:require [com.rpl.specter :as s] + [clojure.zip :as zip])) (defpath zipper [constructor] (select* [this structure next-fn] @@ -18,13 +19,13 @@ (def SEQ-ZIP (zipper zip/seq-zip)) (def XML-ZIP (zipper zip/xml-zip)) -(def NEXT (view zip/next)) -(def RIGHT (view zip/right)) -(def RIGHTMOST (view zip/rightmost)) -(def LEFT (view zip/left)) -(def DOWN (view zip/down)) -(def LEFTMOST (view zip/leftmost)) -(def UP (view zip/up)) +(def NEXT (s/view zip/next)) +(def RIGHT (s/view zip/right)) +(def RIGHTMOST (s/view zip/rightmost)) +(def LEFT (s/view zip/left)) +(def DOWN (s/view zip/down)) +(def LEFTMOST (s/view zip/leftmost)) +(def UP (s/view zip/up)) (defn- inner-insert [structure next-fn inserter mover backer] (let [to-insert (next-fn []) diff --git a/test/com/rpl/specter/cljs_test_runner.cljs b/test/com/rpl/specter/cljs_test_runner.cljs index 5f80a2d..070e965 100644 --- a/test/com/rpl/specter/cljs_test_runner.cljs +++ b/test/com/rpl/specter/cljs_test_runner.cljs @@ -1,6 +1,8 @@ (ns com.rpl.specter.cljs-test-runner (:require [cljs.test :as test :refer-macros [run-tests]] - [com.rpl.specter.core-test])) + [com.rpl.specter.core-test] + [com.rpl.specter.zipper-test] + )) (run-tests 'com.rpl.specter.core-test) (run-tests 'com.rpl.specter.zipper-test)