move custom zipper fns + utils into 'rewrite-clj.custom-zipper.*'.

Yannick Scherer · Yannick Scherer · commit 25a16173354c · 2016-03-28T13:08:24.000+02:00
diff --git a/src/rewrite_clj/custom_zipper/core.clj b/src/rewrite_clj/custom_zipper/core.clj
@@ -12,7 +12,7 @@
 (ns ^{:doc "Functional hierarchical zipper, with navigation, editing,
   and enumeration.  See Huet"
        :author "Rich Hickey"}
-  rewrite-clj.zip.zip
+  rewrite-clj.custom-zipper.core
   (:refer-clojure :exclude (replace remove next))
   (:require [rewrite-clj.node.protocols :as node]
             [clojure.zip :as clj-zip]))
diff --git a/src/rewrite_clj/custom_zipper/utils.clj b/src/rewrite_clj/custom_zipper/utils.clj
@@ -1,5 +1,5 @@
-(ns ^:no-doc rewrite-clj.zip.utils
-  (:require [rewrite-clj.zip.zip :as z]))
+(ns ^:no-doc rewrite-clj.custom-zipper.utils
+  (:require [rewrite-clj.custom-zipper.core :as z]))
 
 ;; ## Remove
 
diff --git a/src/rewrite_clj/zip.clj b/src/rewrite_clj/zip.clj
@@ -17,12 +17,12 @@
              [parser :as p]
              [potemkin :refer [import-vars]]
              [node :as node]]
-            [rewrite-clj.zip.zip :as z]))
+            [rewrite-clj.custom-zipper.core :as z]))
 
 ;; ## API Facade
 
 (import-vars
-  [rewrite-clj.zip.zip
+  [rewrite-clj.custom-zipper.core
    node position root]
 
   [rewrite-clj.zip.base
@@ -92,19 +92,19 @@
                :arglists `(quote ~arglists)})]
     `(def ~sym ~base)))
 
-(defbase right* rewrite-clj.zip.zip/right)
-(defbase left* rewrite-clj.zip.zip/left)
-(defbase up* rewrite-clj.zip.zip/up)
-(defbase down* rewrite-clj.zip.zip/down)
-(defbase next* rewrite-clj.zip.zip/next)
-(defbase prev* rewrite-clj.zip.zip/prev)
-(defbase rightmost* rewrite-clj.zip.zip/rightmost)
-(defbase leftmost* rewrite-clj.zip.zip/leftmost)
-(defbase replace* rewrite-clj.zip.zip/replace)
-(defbase edit* rewrite-clj.zip.zip/edit)
-(defbase remove* rewrite-clj.zip.zip/remove)
-(defbase insert-left* rewrite-clj.zip.zip/insert-left)
-(defbase insert-right* rewrite-clj.zip.zip/insert-right)
+(defbase right* rewrite-clj.custom-zipper.core/right)
+(defbase left* rewrite-clj.custom-zipper.core/left)
+(defbase up* rewrite-clj.custom-zipper.core/up)
+(defbase down* rewrite-clj.custom-zipper.core/down)
+(defbase next* rewrite-clj.custom-zipper.core/next)
+(defbase prev* rewrite-clj.custom-zipper.core/prev)
+(defbase rightmost* rewrite-clj.custom-zipper.core/rightmost)
+(defbase leftmost* rewrite-clj.custom-zipper.core/leftmost)
+(defbase replace* rewrite-clj.custom-zipper.core/replace)
+(defbase edit* rewrite-clj.custom-zipper.core/edit)
+(defbase remove* rewrite-clj.custom-zipper.core/remove)
+(defbase insert-left* rewrite-clj.custom-zipper.core/insert-left)
+(defbase insert-right* rewrite-clj.custom-zipper.core/insert-right)
 
 ;; ## DEPRECATED
 
diff --git a/src/rewrite_clj/zip/base.clj b/src/rewrite_clj/zip/base.clj
@@ -4,7 +4,7 @@
              [node :as node]
              [parser :as p]]
             [rewrite-clj.zip.whitespace :as ws]
-            [rewrite-clj.zip.zip :as z]))
+            [rewrite-clj.custom-zipper.core :as z]))
 
 ;; ## Zipper
 
diff --git a/src/rewrite_clj/zip/edit.clj b/src/rewrite_clj/zip/edit.clj
@@ -4,10 +4,11 @@
              [base :as base]
              [move :as m]
              [remove :as r]
-             [utils :as u]
              [whitespace :as ws]]
             [rewrite-clj.node :as node]
-            [rewrite-clj.zip.zip :as z]))
+            [rewrite-clj.custom-zipper
+             [core :as z]
+             [utils :as u]]))
 
 ;; ## In-Place Modification
 
diff --git a/src/rewrite_clj/zip/find.clj b/src/rewrite_clj/zip/find.clj
@@ -4,7 +4,7 @@
              [base :as base]
              [move :as m]]
             [rewrite-clj.node :as node]
-            [rewrite-clj.zip.zip :as z]))
+            [rewrite-clj.custom-zipper.core :as z]))
 
 ;; ## Helpers
 
diff --git a/src/rewrite_clj/zip/insert.clj b/src/rewrite_clj/zip/insert.clj
@@ -3,7 +3,7 @@
              [base :as base]
              [whitespace :as ws]]
             [rewrite-clj.node :as node]
-            [rewrite-clj.zip.zip :as z]))
+            [rewrite-clj.custom-zipper.core :as z]))
 
 (def ^:private space
   (node/spaces 1))
diff --git a/src/rewrite_clj/zip/move.clj b/src/rewrite_clj/zip/move.clj
@@ -1,7 +1,7 @@
 (ns ^:no-doc rewrite-clj.zip.move
   (:refer-clojure :exclude [next])
   (:require [rewrite-clj.zip.whitespace :as ws]
-            [rewrite-clj.zip.zip :as z]))
+            [rewrite-clj.custom-zipper.core :as z]))
 
 (defn right
   "Move right to next non-whitespace/non-comment location."
diff --git a/src/rewrite_clj/zip/remove.clj b/src/rewrite_clj/zip/remove.clj
@@ -2,9 +2,10 @@
   (:refer-clojure :exclude [remove])
   (:require [rewrite-clj.zip
              [move :as m]
-             [utils :as u]
              [whitespace :as ws]]
-            [rewrite-clj.zip.zip :as z]))
+            [rewrite-clj.custom-zipper
+             [core :as z]
+             [utils :as u]]))
 
 (defn- remove-trailing-space
   "Remove all whitespace following a given node."
diff --git a/src/rewrite_clj/zip/seq.clj b/src/rewrite_clj/zip/seq.clj
@@ -6,7 +6,7 @@
              [find :as f]
              [insert :as i]
              [move :as m]]
-            [rewrite-clj.zip.zip :as z]))
+            [rewrite-clj.custom-zipper.core :as z]))
 
 ;; ## Predicates
 
diff --git a/src/rewrite_clj/zip/subedit.clj b/src/rewrite_clj/zip/subedit.clj
@@ -1,6 +1,6 @@
 (ns ^:no-doc rewrite-clj.zip.subedit
   (:require [rewrite-clj.zip.base :as base]
-            [rewrite-clj.zip.zip :as z]))
+            [rewrite-clj.custom-zipper.core :as z]))
 
 ;; ## Edit Scope
 
diff --git a/src/rewrite_clj/zip/walk.clj b/src/rewrite_clj/zip/walk.clj
@@ -1,5 +1,5 @@
 (ns ^:no-doc rewrite-clj.zip.walk
-  (:require [rewrite-clj.zip.zip :as z]
+  (:require [rewrite-clj.custom-zipper.core :as z]
             [rewrite-clj.zip
              [subedit :refer [subedit-node]]
              [move :as m]]))
diff --git a/src/rewrite_clj/zip/whitespace.clj b/src/rewrite_clj/zip/whitespace.clj
@@ -1,6 +1,6 @@
 (ns ^:no-doc rewrite-clj.zip.whitespace
   (:require [rewrite-clj.node :as node]
-            [rewrite-clj.zip.zip :as z]))
+            [rewrite-clj.custom-zipper.core :as z]))
 
 ;; ## Predicates
 
diff --git a/test/rewrite_clj/custom_zipper/core_test.clj b/test/rewrite_clj/custom_zipper/core_test.clj
@@ -1,4 +1,4 @@
-(ns rewrite-clj.zip.zip-test
+(ns rewrite-clj.custom-zipper.core-test
   (:require [clojure.test.check
               [generators :as gen]
               [properties :as prop]]
@@ -8,9 +8,10 @@
             [rewrite-clj.test-helpers :refer :all]
             [rewrite-clj.zip
               [base :as base]
-              [whitespace :as ws]
-              [utils :as u]
-              [zip :as z]]))
+              [whitespace :as ws]]
+            [rewrite-clj.custom-zipper
+             [core :as z]
+             [utils :as u]]))
 
 (z/with-positional-zipper
   (fact "zipper starts with position [1 1]"
diff --git a/test/rewrite_clj/custom_zipper/utils_test.clj b/test/rewrite_clj/custom_zipper/utils_test.clj
@@ -1,9 +1,9 @@
-(ns rewrite-clj.zip.utils-test
+(ns rewrite-clj.custom-zipper.utils-test
   (:require [midje.sweet :refer :all]
             [rewrite-clj.node :as node]
             [rewrite-clj.zip.base :as base]
-            [rewrite-clj.zip.zip :as z]
-            [rewrite-clj.zip.utils :refer :all]))
+            [rewrite-clj.custom-zipper.core :as z]
+            [rewrite-clj.custom-zipper.utils :refer :all]))
 
 (let [a (node/token-node 'a)
       b (node/token-node 'b)
diff --git a/test/rewrite_clj/regression_test.clj b/test/rewrite_clj/regression_test.clj
@@ -3,7 +3,7 @@
             [rewrite-clj
              [node :as node]
              [zip :as z]]
-            [rewrite-clj.zip.zip :as fz]))
+            [rewrite-clj.custom-zipper.core :as fz]))
 
 ;; ## Regression Tests for 0.3.x -> 0.4.x
 
diff --git a/test/rewrite_clj/zip/base_test.clj b/test/rewrite_clj/zip/base_test.clj
@@ -2,7 +2,7 @@
   (:require [midje.sweet :refer :all]
             [rewrite-clj.node :as node]
             [rewrite-clj.zip.base :as base]
-            [rewrite-clj.zip.zip :as z]))
+            [rewrite-clj.custom-zipper.core :as z]))
 
 (let [n (node/forms-node
           [(node/spaces 3)
diff --git a/test/rewrite_clj/zip/find_test.clj b/test/rewrite_clj/zip/find_test.clj
@@ -1,6 +1,6 @@
 (ns rewrite-clj.zip.find-test
   (:require [midje.sweet :refer :all]
-            [rewrite-clj.zip.zip :as z]
+            [rewrite-clj.custom-zipper.core :as z]
             [rewrite-clj.zip
              [base :as base]
              [find :as f]]))
diff --git a/test/rewrite_clj/zip/insert_test.clj b/test/rewrite_clj/zip/insert_test.clj
@@ -4,7 +4,7 @@
              [base :as base]
              [move :as m]
              [insert :refer :all]]
-            [rewrite-clj.zip.zip :as z]))
+            [rewrite-clj.custom-zipper.core :as z]))
 
 (tabular
   (fact "about whitespace-aware insertion."
diff --git a/test/rewrite_clj/zip/remove_test.clj b/test/rewrite_clj/zip/remove_test.clj
@@ -4,7 +4,7 @@
              [base :as base]
              [move :as m]
              [remove :as r]]
-            [rewrite-clj.zip.zip :as z]))
+            [rewrite-clj.custom-zipper.core :as z]))
 
 (tabular
   (fact "about whitespace-aware removal."
diff --git a/test/rewrite_clj/zip/subedit_test.clj b/test/rewrite_clj/zip/subedit_test.clj
@@ -4,7 +4,7 @@
              [base :as base]
              [move :as m]
              [subedit :refer :all]]
-            [rewrite-clj.zip.zip :as z]))
+            [rewrite-clj.custom-zipper.core :as z]))
 
 (let [root (base/of-string "[1 #{2 [3 4] 5} 6]")]
   (fact "about modifying subtrees."
diff --git a/test/rewrite_clj/zip/whitespace_test.clj b/test/rewrite_clj/zip/whitespace_test.clj
@@ -1,7 +1,7 @@
 (ns rewrite-clj.zip.whitespace-test
   (:require [midje.sweet :refer :all]
             [rewrite-clj.zip.base :as base]
-            [rewrite-clj.zip.zip :as z]
+            [rewrite-clj.custom-zipper.core :as z]
             [rewrite-clj.node :as node]
             [rewrite-clj.zip.whitespace :refer :all]))
 
