Permalink
Browse files

Reverting "Changed cl-match to a weak dependency."

Revert "Changed cl-match to a weak dependency."

This reverts commit 866c38e.

Turns out this breaks things, better to just have the dependency.
  • Loading branch information...
1 parent 7422262 commit 1113b2d3c8e4d9f9fb4293b4977194ef7472cbdb @smithzvk committed Jul 13, 2012
Showing with 2 additions and 14 deletions.
  1. +1 −2 index-mapped-arrays.asd
  2. +0 −4 index-mapped-arrays.lisp
  3. +1 −8 simplifier.lisp
@@ -22,7 +22,6 @@ with the fundamental data structure and indices."
(:file "grouping")
(:file "printer"))
:serial t
- :depends-on (:alexandria :iterate)
- :weakly-depends-on (:cl-match))
+ :depends-on (:alexandria :cl-match :iterate))
@@ -143,10 +143,6 @@ quite often)."
:dims dims
:map-desc (list map-desc (map-desc-of object)))))
-(eval-when (:compile-toplevel :load-toplevel :execute)
- (when (asdf:find-system :cl-match)
- (pushnew :cl-match *features*)))
-
;; @\section{Common (built in) maps}
;; @This is an ugly, fragile macro that declares generic imref and (setf imref)
View
@@ -10,7 +10,6 @@
(t nil)))
;;<<>>=
-#+cl-match
(defun simplify (new-map ima)
"A basic, hard-coded, pattern based simplifier."
(cond ((and (not (eql :unknown new-map))
@@ -27,15 +26,9 @@
;; permutation of the original list, permuted by the
;; permuation of the permutation. It's so simple, man
(permute-indices (data-of ima) new-permutation))))
- ((list (list :block start1 extent1)
- (list (list :block start2 extent2) x))
+ ((list (list :block start1 extent1) (list (list :block start2 extent2) x))
(get-block (data-of ima) (mapcar #'+ start1 start2)
extent1))
(otherwise nil))))
(t nil)))
-#-cl-match
-(defun simplify (new-map ima)
- "A basic, hard-coded, pattern based simplifier. This is a stub, this does
-nothing."
- nil)

0 comments on commit 1113b2d

Please sign in to comment.