Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Browse files

cleanup declares

  • Loading branch information...
commit 52fbfe4faa35cd16244a7b03be40f18ecd8b34e7 1 parent c5851fd
@swannodette swannodette authored
Showing with 16 additions and 21 deletions.
  1. +16 −21 src/main/clojure/clojure/core/match.clj
37 src/main/clojure/clojure/core/match.clj
@@ -284,9 +284,7 @@
(all-wildcards? [this])
(drop-nth-bind [this n bind-expr])) ;; TODO: needs better name - David
-(declare leaf-bind-expr)
-(declare named-wildcard-pattern?)
-(declare sym)
+(declare leaf-bind-expr named-wildcard-pattern? sym)
(deftype PatternRow [ps action bindings]
@@ -504,9 +502,7 @@
(occurrences [this])
(action-for-row [this j]))
-(declare empty-matrix?)
-(declare useful-p?)
-(declare useful?)
+(declare empty-matrix? useful-p? useful?)
;; # Compilation Cases
@@ -553,10 +549,7 @@
_ (trace-dag (str "First row all wildcards, add leaf-node." a bs))]
(leaf-node a bs))))
-(declare pseudo-pattern?)
-(declare wildcard-pattern)
-(declare vector-pattern?)
-(declare pattern-matrix)
+(declare pseudo-pattern? wildcard-pattern vector-pattern? pattern-matrix)
(defn- first-column-chosen-case
"Case 3a: The first column is chosen. Compute and return a switch/bind node
@@ -919,9 +912,7 @@
;; They are split into multiple patterns, testing each element of the seq in order.
-(declare seq-pattern?)
-(declare rest-pattern?)
-(declare seq-pattern)
+(declare seq-pattern? rest-pattern? seq-pattern)
(deftype SeqPattern [s _meta]
@@ -1011,8 +1002,7 @@
;; Map patterns match maps, or any object that satisfies IMatchLookup.
-(declare map-pattern?)
-(declare guard-pattern)
+(declare map-pattern? guard-pattern)
(deftype MapPattern [m _meta]
@@ -1517,12 +1507,8 @@
(literal-pattern pat))
-(declare emit-pattern-for-syntax)
-(declare or-pattern)
-(declare as-pattern)
-(declare guard-pattern)
-(declare predicate-pattern)
-(declare vector-pattern)
+(declare emit-pattern-for-syntax or-pattern as-pattern guard-pattern
+ predicate-pattern vector-pattern)
(defmethod emit-pattern clojure.lang.ISeq
[pat] (if (and (= (count pat) 2)
@@ -1773,3 +1759,12 @@
`(let ~bindings
(match [~@bindvars#]
+ (defn foo [dirs cljs]
+ (match [dirs cljs]
+ [[:nothing] []] [:nothing]
+ [[:nothing] lst] [:just lst]
+ [[:just a] b] [:just (concat a b)]))
+ )
Please sign in to comment.
Something went wrong with that request. Please try again.