Only walk var forms when the predicate passes

fixes ztellman#12
trptcolin · Jun 23, 2014 · 02ec516 · 02ec516
1 parent fbf70b8
commit 02ec516
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/riddley/walk.clj b/src/riddley/walk.clj
@@ -198,7 +198,7 @@
              walk-exprs' (partial walk-exprs predicate handler special-form?)
              x' (cond
 
-                  (and (walkable? x) (= 'var (first x)))
+                  (and (walkable? x) (= 'var (first x)) (predicate x))
                   (handler (eval x))
 
                   (and (walkable? x) (= 'quote (first x)))

diff --git a/test/riddley/walk_test.clj b/test/riddley/walk_test.clj
@@ -62,10 +62,19 @@
 (deftest test-var-evaluation
   (is (= #{#'riddley.walk-test/foo}
          (let [acc (atom #{})]
-           (r/walk-exprs 
-            (constantly false) 
+           (r/walk-exprs
+            (constantly true)
             #(do (swap! acc conj %) %)
-            '(#'riddley.walk-test/foo))
+            '#'riddley.walk-test/foo)
+           @acc))))
+
+(deftest test-doesnt-walk-var-if-not-requested
+  (is (= #{}
+         (let [acc (atom #{})]
+           (r/walk-exprs
+            (constantly false)
+            #(do (swap! acc conj %) %)
+            '#'riddley.walk-test/foo)
            @acc))))
 
 (deftest catch-old-fn*-syntax