same as Clojure b7199fb + a simple test

Author: swannodette

src/main/cljs/cljs/spec.cljc

@@ -229,7 +229,7 @@
   conjunction of the predicates, and any conforming they might perform."
   [re & preds]
   (let [pv (vec preds)]
-    `(cljs.spec/amp-impl ~re ~pv '~pv)))
+    `(cljs.spec/amp-impl ~re ~pv '~(mapv #(res &env %) pv))))
 
 (defmacro conformer
   "takes a predicate function with the semantics of conform i.e. it should return either a

src/main/cljs/cljs/spec.cljs

@@ -779,9 +779,7 @@
       ::amp (c/and (accept-nil? p1)
                    (c/or (noret? p1 (preturn p1))
                          (let [ret (-> (preturn p1) (and-preds ps (next forms)))]
-                           (if (= ret ::invalid)
-                             nil
-                             ret))))
+                           (not= ret ::invalid))))
       ::rep (c/or (identical? p1 p2) (accept-nil? p1))
       ::pcat (every? accept-nil? ps)
       ::alt (c/some accept-nil? ps))))
@@ -846,7 +844,11 @@
         nil (let [ret (dt p x p)]
               (when-not (= ::invalid ret) (accept ret)))
         ::amp (when-let [p1 (deriv p1 x)]
-                (amp-impl p1 ps forms))
+                (if (= ::accept (::op p1))
+                  (let [ret (-> (preturn p1) (and-preds ps (next forms)))]
+                    (when-not (= ret ::invalid)
+                      (accept ret)))
+                  (amp-impl p1 ps forms)))
         ::pcat (alt2 (pcat* {:ps (cons (deriv p0 x) pr), :ks ks, :forms forms, :ret ret})
                      (when (accept-nil? p0) (deriv (pcat* {:ps pr, :ks kr, :forms (next forms), :ret (add-ret p0 ret k0)}) x)))
         ::alt (alt* (map #(deriv % x) ps) ks forms)

src/test/cljs/cljs/spec_test.cljs

@@ -0,0 +1,25 @@
+(ns cljs.spec-test
+  (:require [cljs.spec :as s]
+            [cljs.test :as test :refer-macros [deftest is]]))
+
+(s/def ::even? (s/and number? even?))
+(s/def ::odd? (s/and number? odd?))
+
+(def s2
+  (s/cat :forty-two #{42}
+    :odds (s/+ ::odd?)
+    :m (s/keys :req-un [::a ::b ::c])
+    :oes (s/& (s/* (s/cat :o ::odd? :e ::even?)) #(< (count %) 3))
+    :ex (s/* (s/alt :odd ::odd? :even ::even?))))
+
+(deftest test-roundtrip
+  (let [xs [42 11 13 15 {:a 1 :b 2 :c 3} 1 2 3 42 43 44 11]]
+    (is (= xs (s/unform s2 (s/conform s2 xs))))))
+
+(comment
+
+  (s/conform s2 [42 11 13 15 {:a 1 :b 2 :c 3} 1 2 3 42 43 44 11])
+  (s/unform s2
+    (s/conform s2 [42 11 13 15 {:a 1 :b 2 :c 3} 1 2 3 42 43 44 11]))
+
+  )

src/test/cljs/cljs/test_runner.cljs

@@ -14,7 +14,8 @@
             [cljs.keyword-test]
             [cljs.import-test]
             [cljs.ns-test.foo]
-            [cljs.pprint]))
+            [cljs.pprint]
+            [cljs.spec-test]))
 
 (set! *print-newline* false)
 (set-print-fn! js/print)
@@ -34,4 +35,5 @@
   'cljs.ns-test.foo
   'foo.ns-shadow-test
   'cljs.import-test
-  'cljs.pprint)
+  'cljs.pprint
+  'cljs.spec-test)