specs for defn, defn-, fn

Signed-off-by: Rich Hickey <richhickey@gmail.com>

Author: puredanger

src/clj/clojure/core/specs.clj

@@ -61,3 +61,38 @@
 (s/fdef clojure.core/when-let
   :args (s/cat :bindings (s/and vector? ::binding)
                :body (s/* any?)))
+
+;; defn, defn-, fn
+
+(s/def ::arg-list
+  (s/and
+    vector?
+    (s/cat :args (s/* ::binding-form)
+           :varargs (s/? (s/cat :amp #{'&} :form ::binding-form)))))
+
+(s/def ::args+body
+  (s/cat :args ::arg-list
+         :prepost (s/? map?)
+         :body (s/* any?)))
+
+(def defn-args
+  (s/cat :name simple-symbol?
+         :docstring (s/? string?)
+         :meta (s/? map?)
+         :bs (s/alt :arity-1 ::args+body
+                    :arity-n (s/cat :bodies (s/+ (s/spec ::args+body))
+                                    :attr (s/? map?)))))
+
+(s/fdef clojure.core/defn
+  :args defn-args
+  :ret any?)
+
+(s/fdef clojure.core/defn-
+  :args defn-args
+  :ret any?)
+
+(s/fdef clojure.core/fn
+  :args (s/cat :name (s/? simple-symbol?)
+               :bs (s/alt :arity-1 ::args+body
+                          :arity-n (s/+ (s/spec ::args+body))))
+  :ret any?)

test/clojure/test_clojure/def.clj

@@ -14,33 +14,33 @@
   (testing "multiarity syntax invalid parameter declaration"
     (is (fails-with-cause? 
           IllegalArgumentException 
-          #"Parameter declaration \"arg1\" should be a vector"
+          #"Call to clojure.core/defn did not conform to spec"
           (eval-in-temp-ns (defn foo (arg1 arg2))))))
 
   (testing "multiarity syntax invalid signature"
     (is (fails-with-cause? 
           IllegalArgumentException 
-          #"Invalid signature \"\[a b\]\" should be a list"
+          #"Call to clojure.core/defn did not conform to spec"
           (eval-in-temp-ns (defn foo 
                              ([a] 1)
                              [a b])))))
 
   (testing "assume single arity syntax"
     (is (fails-with-cause? 
           IllegalArgumentException 
-          #"Parameter declaration \"a\" should be a vector"
+          #"Call to clojure.core/defn did not conform to spec"
           (eval-in-temp-ns (defn foo a)))))
 
   (testing "bad name"
     (is (fails-with-cause? 
           IllegalArgumentException 
-          #"First argument to defn must be a symbol"
+          #"Call to clojure.core/defn did not conform to spec"
           (eval-in-temp-ns (defn "bad docstring" testname [arg1 arg2])))))
 
   (testing "missing parameter/signature"
     (is (fails-with-cause? 
           IllegalArgumentException 
-          #"Parameter declaration missing"
+          #"Call to clojure.core/defn did not conform to spec"
           (eval-in-temp-ns (defn testname)))))
 
   (testing "allow trailing map"
@@ -49,7 +49,7 @@
   (testing "don't allow interleaved map"
     (is (fails-with-cause? 
           IllegalArgumentException 
-          #"Invalid signature \"\{:a :b\}\" should be a list"
+          #"Call to clojure.core/defn did not conform to spec"
           (eval-in-temp-ns (defn a "asdf" ([a] 1) {:a :b} ([] 1)))))))
 
 (deftest non-dynamic-warnings

test/clojure/test_clojure/fn.clj

@@ -14,42 +14,42 @@
 (deftest fn-error-checking
   (testing "bad arglist"
     (is (fails-with-cause? java.lang.IllegalArgumentException 
-          #"Parameter declaration a should be a vector"
+          #"Call to clojure.core/fn did not conform to spec"
           (eval '(fn "a" a)))))
 
   (testing "treat first param as args"
     (is (fails-with-cause? java.lang.IllegalArgumentException 
-          #"Parameter declaration a should be a vector"
+          #"Call to clojure.core/fn did not conform to spec"
           (eval '(fn "a" [])))))
 
   (testing "looks like listy signature, but malformed declaration"
     (is (fails-with-cause? java.lang.IllegalArgumentException
-          #"Parameter declaration 1 should be a vector"
+          #"Call to clojure.core/fn did not conform to spec"
           (eval '(fn (1))))))
 
   (testing "checks each signature"
     (is (fails-with-cause? java.lang.IllegalArgumentException
-          #"Parameter declaration a should be a vector"
+          #"Call to clojure.core/fn did not conform to spec"
           (eval '(fn
                    ([a] 1)
                    ("a" 2))))))
 
   (testing "correct name but invalid args"
     (is (fails-with-cause? java.lang.IllegalArgumentException
-          #"Parameter declaration a should be a vector"
+          #"Call to clojure.core/fn did not conform to spec"
           (eval '(fn a "a")))))
 
   (testing "first sig looks multiarity, rest of sigs should be lists"
     (is (fails-with-cause? java.lang.IllegalArgumentException 
-          #"Invalid signature \[a b\] should be a list"
+          #"Call to clojure.core/fn did not conform to spec"
           (eval '(fn a
                    ([a] 1)
                    [a b])))))
 
   (testing "missing parameter declaration"
     (is (fails-with-cause? java.lang.IllegalArgumentException 
-          #"Parameter declaration missing"
+          #"Call to clojure.core/fn did not conform to spec"
           (eval '(fn a))))
     (is (fails-with-cause? java.lang.IllegalArgumentException 
-          #"Parameter declaration missing"
+          #"Call to clojure.core/fn did not conform to spec"
           (eval '(fn))))))