we need to pass everything along since we don't have backtracking,

match-order-6-recur however still failing.
clojure · Jun 14, 2013 · 2998fca · 2998fca
1 parent c975778
commit 2998fca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/main/clojure/clojure/core/match.clj b/src/main/clojure/clojure/core/match.clj
@@ -604,10 +604,7 @@
     (if-not *recur-present*
       [(pattern-matrix (take n rows) ocrs)
        (pattern-matrix (drop n rows) ocrs)]
-      [(pattern-matrix
-         (concat (take n rows)
-           (drop-while #(not (wildcard-pattern? (first %))) rows))
-         ocrs)
+      [(pattern-matrix rows ocrs)
        (pattern-matrix (drop n rows) ocrs)])))
 
 (defn default-matrix [matrix]

diff --git a/src/test/clojure/clojure/core/match/test/impl.clj b/src/test/clojure/clojure/core/match/test/impl.clj
@@ -108,7 +108,7 @@
 
 (deftest test-matrix-splitter-recur-1
   (testing "for Maranget example, show specialized matrix and default
-            matrix are as expected in the presence of recur."
+matrix are as expected in the presence of recur."
     (let [m1 (build-matrix [y x z]
                [false _     true ] (recur x y z 1)
                [true  false _    ] (recur x y z 2)
@@ -117,6 +117,7 @@
                :else 5)
           S  (build-matrix [y x z]
                [false _     true ] (recur x y z 1)
+               [true  false _    ] (recur x y z 2)
                [_     _     false] (recur x y z 3)
                [_     _     true ] (recur x y z 4)
                :else 5)