Permalink
Browse files

Remove use excl package, fix mop::, some whitespace, remove dynamic-e…

…xtent declaration
  • Loading branch information...
1 parent 3ed7251 commit b6abc2e818d68555a57900997d481bdf9ce518bb @Ramarren committed Oct 26, 2008
Showing with 14 additions and 15 deletions.
  1. +1 −1 defpackage.lisp
  2. +11 −12 fm-utilities.lisp
  3. +1 −1 utils-kt/defpackage.lisp
  4. +1 −1 utils-kt/detritus.lisp
View
@@ -23,7 +23,7 @@
(in-package :common-lisp-user)
(defpackage :cells
- (:use #:common-lisp #:excl #:utils-kt)
+ (:use #:common-lisp #:utils-kt)
(:import-from
;; MOP
#+allegro #:excl
View
@@ -689,27 +689,26 @@ $Header: /home/ramarren/LISP/cells-hack/rsynced-cvs/cells/fm-utilities.lisp,v 1.
(when (consp md-name) (cadr md-name)))
(defun fm-find-one (family md-name &key (must-find t)
- (global-search t) skip-tree (test #'true-that)
- &aux diag)
+ (global-search t) skip-tree (test #'true-that)
+ &aux diag)
(count-it :fm-find-one)
(flet ((matcher (fm)
(when diag
(trc nil
- "fm-find-one matcher sees name" (md-name fm) :ofthing (type-of fm) :seeking md-name global-search))
+ "fm-find-one matcher sees name" (md-name fm) :ofthing (type-of fm) :seeking md-name global-search))
(when (and (eql (name-root md-name)(md-name fm))
- (or (null (name-subscript md-name))
- (eql (name-subscript md-name) (fm-pos fm)))
- (progn
- (when diag
- (trc "fm-find-one testing" fm))
- (funcall test fm)))
+ (or (null (name-subscript md-name))
+ (eql (name-subscript md-name) (fm-pos fm)))
+ (progn
+ (when diag
+ (trc "fm-find-one testing" fm))
+ (funcall test fm)))
(throw 'fm-find-one fm))))
- #-lispworks (declare (dynamic-extent matcher))
(trc nil "fm-find-one> entry " md-name family)
(let ((match (catch 'fm-find-one
(fm-traverse family #'matcher
- :skip-tree skip-tree
- :global-search global-search))))
+ :skip-tree skip-tree
+ :global-search global-search))))
(when (and must-find (null match))
(trc "fm-find-one > erroring fm-not-found, in family: " family :seeking md-name :global? global-search)
(setq diag t must-find nil)
View
@@ -35,7 +35,7 @@ See the Lisp Lesser GNU Public License for more details.
(defpackage :utils-kt
(:nicknames #:ukt)
- (:use #:common-lisp #:excl
+ (:use #:common-lisp
#+(or allegro lispworks clisp) #:clos
#+cmu #:mop
#+sbcl #:sb-mop
View
@@ -33,7 +33,7 @@ See the Lisp Lesser GNU Public License for more details.
(let ((cc (find-class c)))
(when cc
(finalize-inheritance cc))
- (mop::class-prototype cc)))
+ (class-prototype cc)))
(defun brk (&rest args)

0 comments on commit b6abc2e

Please sign in to comment.