Removed tag=/value= and added find-tag/find-next-tag.

Author: Yannick Scherer

README.md

@@ -131,22 +131,13 @@ Search functions include:
   location (default movement: `rewrite-clj.zip/right`). This might return `zloc` itself. 
 - `(find-next zloc [f] p?)`: find the next match for the given predicate by repeatedly applying `f` to the current zipper
   location (default movement: `rewrite-clj.zip/right`). This will not return `zloc` itself.
+- `(find-tag zloc [f] t)`: uses `find` to get the first node with the given tag.
+- `(find-next-tag zloc [f] t)`: uses `find-next` to get the first node with the given tag.
 - `(find-token zloc [f] p?): like `find` but will only check `:token` nodes. The predicate is applied to the node's value.
 - `(find-next-token zloc [f] p?): like `find-next` but will only check `:token` nodes.
 - `(find-value zloc [f] v)`: uses `find` to get the first `:token` node with the given value.
 - `(find-next-value zloc [f] v)`: uses `find-next` to get the first `:token` node with the given value.
 
-The following two functions are designed to be used as predicates in `find` and `find-next`:
-
-- `(tag= t)`: creates a predicate that checks a zipper node against the given tag.
-- `(value= t)`: creates a predicate that checks a zipper node's value against the given one.
-
-Example:
-
-```clojure
-(-> zloc z/down (z/find (z/tag= :list)) z/tag) ;; => :list
-```
-
 ### Handling Clojure Data Structures
 
 rewrite-clj aims at providing easy ways to work with Clojure data structures. It offers functions corresponding

src/rewrite_clj/zip.clj

@@ -192,13 +192,17 @@
    (when-let [zloc (f zloc)]
      (find zloc f p?))))
 
-(defn tag= [t] #(= (tag %) t))
-(defn value= [v] #(and (= (tag %) :token) (= (value %) v)))
-
-(comment
-  ;; Usage:
-  (-> zloc down (find (tag= :list)))
-  (-> zloc (find-next (value= :description))))
+(defn find-tag
+  "Find element with the given tag by applying the given movement function to the initial 
+   zipper location."
+  ([zloc t] (find-tag zloc right t))
+  ([zloc f t] (find zloc f #(= (tag %) t))))
+
+(defn find-next-tag
+  "Find element other than the current zipper location with the given tag by applying the 
+   given movement function to the initial zipper location."
+  ([zloc t] (find-next-tag zloc right t))
+  ([zloc f t] (find-next zloc f #(= (tag %) t))))
 
 (defn find-token
   "Find token element matching the given predicate by applying the given movement function

test/rewrite_clj/zip_test.clj

@@ -86,10 +86,10 @@
   (-> root (z/find-value z/next :description) z/right z/node) => [:token "A project."]
   (-> root (z/find-value z/next "private") z/right z/node) => [:token "http://private.com/repo"]
 
-  (-> root (z/find z/next (z/tag= :map)) z/down z/node) => [:token "private"]
-  (->> root z/down (iterate #(z/find-next % (z/tag= :token))) (take-while identity) (map z/node) (map second))
+  (-> root (z/find-tag z/next :map) z/down z/node) => [:token "private"]
+  (->> root z/down (iterate #(z/find-next-tag % :token)) (take-while identity) (map z/node) (map second))
     => ['defproject 'my-project "0.1.0-SNAPSHOT" :description "A project." :dependencies :repositories]
-  (->> root z/down z/rightmost (iterate #(z/find-next % z/left  (z/tag= :token))) (rest) (take-while identity) (map z/node) (map second))
+  (->> root z/down z/rightmost (iterate #(z/find-next-tag % z/left :token)) (rest) (take-while identity) (map z/node) (map second))
     => [:repositories :dependencies "A project." :description "0.1.0-SNAPSHOT" 'my-project 'defproject])
 
 (fact "about zipper seq operations"