Merge remote-tracking branch 'ambrosebs/master'

amalloy · Aug 19, 2011 · 2efa2f5 · 2efa2f5
2 parents 53d9958 + f03e5b8
commit 2efa2f5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/match/core.clj b/src/match/core.clj
@@ -970,16 +970,21 @@
     `(defn ~name ~vars 
        ~clj-form)))
 
-(defmacro match [vars & clauses]
+(defmacro match-1 [vars & clauses]
   (binding [*line* (-> &form meta :line)
             *warned* (atom false)]
-    (let [[vars clauses] (if (not (vector? vars))
-                           [[vars] (mapcat (fn [[row action]]
-                                             (if (not= row :else)
-                                               [[row] action]
-                                               [row action]))
-                                           (partition 2 clauses))]
-                           [vars clauses])]
+    (let [[vars clauses] [[vars] (mapcat (fn [[row action]]
+                                           (if (not= row :else)
+                                             [[row] action]
+                                             [row action]))
+                                         (partition 2 clauses))]]
       `~(-> (emit-matrix vars clauses)
           compile
           n-to-clj))))
+
+(defmacro match [vars & clauses]
+  (binding [*line* (-> &form meta :line)
+            *warned* (atom false)]
+    `~(-> (emit-matrix vars clauses)
+        compile
+        n-to-clj)))
diff --git a/test/match/test/core.clj b/test/match/test/core.clj
@@ -216,16 +216,16 @@
 
 (deftest match-single-1
   (is (= (let [x 3]
-           (match x
+           (match-1 x
              1 :a0
              2 :a1
              :else :a2))
          :a2)))
 
 (deftest match-single-2
   (is (= (let [x 3]
-           (match (mod x 2)
+           (match-1 (mod x 2)
              1 :a0
              2 :a1
              :else :a2))
-         :a0)))
+         :a0)))