fix: rename descendants function

erdos · Oct 5, 2021 · d375ee7 · d375ee7
1 parent 353eaa6
commit d375ee7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/stencil/postprocess/list_ref.clj b/src/stencil/postprocess/list_ref.clj
@@ -138,7 +138,7 @@
       (cond-> (:p flags) (-> (some-> (str " ")) (str (render-list-position bookmark parsed-ref))))))
 
 ;; lazy seq of all zippers in the subtree walked by preorder DFS graph traversal
-(defn- descendants [tree]
+(defn- locs-seq [tree]
   (assert (zipper? tree))
   (cons tree
         ((fn f [tree depth]
@@ -156,8 +156,8 @@
   (assert (zipper? tree))
   (assert (keyword? a))
   (case prop
-    :tag  (find-first (comp #{a} :tag zip/node) (descendants tree))
-    :attr (find-first (comp #{b} a :attrs zip/node) (descendants tree))))
+    :tag  (find-first (comp #{a} :tag zip/node) (locs-seq tree))
+    :attr (find-first (comp #{b} a :attrs zip/node) (locs-seq tree))))
 
 (defn- parse-num-pr [node]
   (assert (= ooxml/num-pr (:tag node)))

diff --git a/test/stencil/postprocess/list_ref_test.clj b/test/stencil/postprocess/list_ref_test.clj
@@ -6,7 +6,7 @@
             [stencil.integration :as integration]))
 
 
-(declare -find-elem -descendants)
+(declare -find-elem -locs-seq)
 
 
 ;; make all private maps public!
@@ -16,18 +16,18 @@
     (eval `(defn ~(symbol (str "-" k)) [~'& args#] (apply (deref ~v) args#)))))
 
 
-(deftest test-descendants
+(deftest test-locs-seq
   (let [tree (xml-zip {:tag :0
                        :content [{:tag :a :content [{:tag :b}
                                                     {:tag :c :content [{:tag :d}]}
                                                     {:tag :e}]}]})]
     (testing "siblings are not returned"
       (is (= [{:tag :b}]
-             (->> tree zip/down zip/down -descendants (map zip/node)))))
+             (->> tree zip/down zip/down -locs-seq (map zip/node)))))
     (is (= [:a :b :c :d :e]
-           (map (comp :tag zip/node) (-descendants (zip/down tree)))))
+           (map (comp :tag zip/node) (-locs-seq (zip/down tree)))))
     (is (= [1 2 3 4]
-           (map zip/node (next (-descendants (xml-zip {:tag :0 :content [1 2 3 4]}))))))))
+           (map zip/node (next (-locs-seq (xml-zip {:tag :0 :content [1 2 3 4]}))))))))
 
 
 (deftest test-find-elem