Revision: 3595 Author: ksprotte URL: http://bknr.net/trac/changeset/3595
return-contract-m2s has to be a generic function (mistakenly changed that earlier) U trunk/projects/bos/m2/allocation.lisp U trunk/projects/bos/m2/utils.lisp
Modified: trunk/projects/bos/m2/allocation.lisp =================================================================== --- trunk/projects/bos/m2/allocation.lisp 2008-07-23 18:06:05 UTC (rev 3594) +++ trunk/projects/bos/m2/allocation.lisp 2008-07-23 18:25:16 UTC (rev 3595) @@ -369,8 +369,11 @@ (let ((m2s (allocate-in-area area n))) (when m2s (return-from allocate-m2s-for-sale m2s)))))
-(defun return-contract-m2s (m2s) - "Mark the given square meters as free, so that they can be re-allocated." +(defgeneric return-contract-m2s (m2s) + (:documentation "Mark the given square meters as free, so that + they can be re-allocated.")) + +(defmethod return-contract-m2s (m2s) (when m2s (loop for m2 in m2s for allocation-area = (m2-allocation-area m2)
Modified: trunk/projects/bos/m2/utils.lisp =================================================================== --- trunk/projects/bos/m2/utils.lisp 2008-07-23 18:06:05 UTC (rev 3594) +++ trunk/projects/bos/m2/utils.lisp 2008-07-23 18:25:16 UTC (rev 3595) @@ -66,8 +66,8 @@ (defun enqueue (x queue) (if (null (car queue)) (setf (cdr queue) (setf (car queue) (list x))) - (setf (cdr (cdr queue)) (list x) - (cdr queue) (cdr (cdr queue)))) + (setf (cdr (cdr queue)) (list x) + (cdr queue) (cdr (cdr queue)))) (caar queue))
(defun dequeue (queue)