test_is.clj: fixed bug that broke tests if first element wasn't a function

Reported by Stuart Halloway.  Still want to recover the fancier 
error reporting when the first element IS a function, but need a way to
test *at compile time* if something is a function.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/clojure/contrib/test_is.clj b/src/clojure/contrib/test_is.clj
index ed2b5e7a..316d6ad3 100644
--- a/src/clojure/contrib/test_is.clj
+++ b/src/clojure/contrib/test_is.clj
@@ -163,7 +163,9 @@
      (seq? form) (first form)
      :else :single)))
 
-(defmethod assert-expr :default [msg form]
+;; Not currently used -- how can we determine if predicate is a normal
+;; function and not a macro or method call?
+(defmethod assert-expr :predicate [msg form]
   ;; Generic assertion for any functional predicate.  The 'expected'
   ;; argument to 'report' contains the original form, the 'actual'
   ;; argument contains the form with all its sub-forms evaluated.  If
@@ -182,8 +184,8 @@
   ;; nil test: always fail
   `(report :fail ~msg nil nil))
 
-(defmethod assert-expr :single [msg form]
-  ;; Evaluate a bare symbol and pass if it is logical true.
+(defmethod assert-expr :default [msg form]
+  ;; Evaluate any expression and pass if it is logical true.
   `(let [value# ~form]
      (if value#
        (report :pass ~msg '~form value#)