Author: abaine Date: Sat Jul 7 23:23:18 2007 New Revision: 62

Modified: trunk/funds/src/queue.lisp trunk/funds/src/stack.lisp trunk/funds/src/trees/avl.lisp trunk/funds/src/trees/bt.lisp trunk/funds/src/trees/classes.lisp trunk/funds/src/trees/constructors.lisp trunk/funds/src/trees/heap/heap-empty-p.lisp trunk/funds/src/trees/heap/heap-first.lisp trunk/funds/src/trees/heap/heap-insert.lisp trunk/funds/src/trees/heap/heap-remove.lisp trunk/funds/src/trees/tree-as-alist.lisp trunk/funds/src/trees/tree-empty-p.lisp trunk/funds/src/trees/tree-find.lisp trunk/funds/src/trees/tree-height.lisp trunk/funds/src/trees/tree-insert.lisp trunk/funds/src/trees/tree-remove.lisp trunk/funds/src/trees/tree-weight.lisp Log: Changed all in-package forms to use funds rather than funds-clos.

Modified: trunk/funds/src/queue.lisp ============================================================================== --- trunk/funds/src/queue.lisp (original) +++ trunk/funds/src/queue.lisp Sat Jul 7 23:23:18 2007 @@ -1,5 +1,5 @@

-(in-package :funds-clos) +(in-package :funds)

(defstruct queue (next-priority 0)

Modified: trunk/funds/src/stack.lisp ============================================================================== --- trunk/funds/src/stack.lisp (original) +++ trunk/funds/src/stack.lisp Sat Jul 7 23:23:18 2007 @@ -1,5 +1,5 @@

-(in-package :funds-clos) +(in-package :funds)

(defun make-stack () "An empty stack."

Modified: trunk/funds/src/trees/avl.lisp ============================================================================== --- trunk/funds/src/trees/avl.lisp (original) +++ trunk/funds/src/trees/avl.lisp Sat Jul 7 23:23:18 2007 @@ -1,5 +1,5 @@

-(in-package :funds-clos) +(in-package :funds)

(defun balance (inside root outside &key heavy-side) (let ((other-side (other-side heavy-side)))

Modified: trunk/funds/src/trees/bt.lisp ============================================================================== --- trunk/funds/src/trees/bt.lisp (original) +++ trunk/funds/src/trees/bt.lisp Sat Jul 7 23:23:18 2007 @@ -1,5 +1,5 @@

-(in-package :funds-clos) +(in-package :funds)

(defun left-p (side) (eq side :left))

Modified: trunk/funds/src/trees/classes.lisp ============================================================================== --- trunk/funds/src/trees/classes.lisp (original) +++ trunk/funds/src/trees/classes.lisp Sat Jul 7 23:23:18 2007 @@ -1,5 +1,5 @@

-(in-package :funds-clos) +(in-package :funds)

(defclass tree () ()

Modified: trunk/funds/src/trees/constructors.lisp ============================================================================== --- trunk/funds/src/trees/constructors.lisp (original) +++ trunk/funds/src/trees/constructors.lisp Sat Jul 7 23:23:18 2007 @@ -1,5 +1,5 @@

-(in-package :funds-clos) +(in-package :funds)

(defun make-bt-leaf () (make-instance 'bt-leaf))

Modified: trunk/funds/src/trees/heap/heap-empty-p.lisp ============================================================================== --- trunk/funds/src/trees/heap/heap-empty-p.lisp (original) +++ trunk/funds/src/trees/heap/heap-empty-p.lisp Sat Jul 7 23:23:18 2007 @@ -1,5 +1,5 @@

-(in-package :funds-clos) +(in-package :funds)

(defun heap-empty-p (heap) (tree-empty-p heap)) \ No newline at end of file

Modified: trunk/funds/src/trees/heap/heap-first.lisp ============================================================================== --- trunk/funds/src/trees/heap/heap-first.lisp (original) +++ trunk/funds/src/trees/heap/heap-first.lisp Sat Jul 7 23:23:18 2007 @@ -1,5 +1,5 @@

-(in-package :funds-clos) +(in-package :funds)

(defun heap-first (heap) (bt-value heap))

Modified: trunk/funds/src/trees/heap/heap-insert.lisp ============================================================================== --- trunk/funds/src/trees/heap/heap-insert.lisp (original) +++ trunk/funds/src/trees/heap/heap-insert.lisp Sat Jul 7 23:23:18 2007 @@ -1,5 +1,5 @@

-(in-package :funds-clos) +(in-package :funds)

(defgeneric heap-insert (heap value priority &key order))

Modified: trunk/funds/src/trees/heap/heap-remove.lisp ============================================================================== --- trunk/funds/src/trees/heap/heap-remove.lisp (original) +++ trunk/funds/src/trees/heap/heap-remove.lisp Sat Jul 7 23:23:18 2007 @@ -1,5 +1,5 @@

-(in-package :funds-clos) +(in-package :funds)

(defmethod heap-remove ((heap heap-leaf) &key order) (declare (ignore order))

Modified: trunk/funds/src/trees/tree-as-alist.lisp ============================================================================== --- trunk/funds/src/trees/tree-as-alist.lisp (original) +++ trunk/funds/src/trees/tree-as-alist.lisp Sat Jul 7 23:23:18 2007 @@ -1,5 +1,5 @@

-(in-package :funds-clos) +(in-package :funds)

(defgeneric tree-as-alist (tree) (:documentation

Modified: trunk/funds/src/trees/tree-empty-p.lisp ============================================================================== --- trunk/funds/src/trees/tree-empty-p.lisp (original) +++ trunk/funds/src/trees/tree-empty-p.lisp Sat Jul 7 23:23:18 2007 @@ -1,5 +1,5 @@

-(in-package :funds-clos) +(in-package :funds)

(defgeneric tree-empty-p (tree) (:documentation

Modified: trunk/funds/src/trees/tree-find.lisp ============================================================================== --- trunk/funds/src/trees/tree-find.lisp (original) +++ trunk/funds/src/trees/tree-find.lisp Sat Jul 7 23:23:18 2007 @@ -1,5 +1,5 @@

-(in-package :funds-clos) +(in-package :funds)

(defgeneric tree-find (tree key &key test order) (:documentation

Modified: trunk/funds/src/trees/tree-height.lisp ============================================================================== --- trunk/funds/src/trees/tree-height.lisp (original) +++ trunk/funds/src/trees/tree-height.lisp Sat Jul 7 23:23:18 2007 @@ -1,5 +1,5 @@

-(in-package :funds-clos) +(in-package :funds)

(defgeneric tree-height (tree) (:documentation "The height of the given tree."))

Modified: trunk/funds/src/trees/tree-insert.lisp ============================================================================== --- trunk/funds/src/trees/tree-insert.lisp (original) +++ trunk/funds/src/trees/tree-insert.lisp Sat Jul 7 23:23:18 2007 @@ -1,5 +1,5 @@

-(in-package :funds-clos) +(in-package :funds)

(defgeneric tree-insert (tree key value &key test order) (:documentation

Modified: trunk/funds/src/trees/tree-remove.lisp ============================================================================== --- trunk/funds/src/trees/tree-remove.lisp (original) +++ trunk/funds/src/trees/tree-remove.lisp Sat Jul 7 23:23:18 2007 @@ -1,5 +1,5 @@

-(in-package :funds-clos) +(in-package :funds)

(defgeneric tree-remove (tree key &key test order) (:documentation

Modified: trunk/funds/src/trees/tree-weight.lisp ============================================================================== --- trunk/funds/src/trees/tree-weight.lisp (original) +++ trunk/funds/src/trees/tree-weight.lisp Sat Jul 7 23:23:18 2007 @@ -1,5 +1,5 @@

-(in-package :funds-clos) +(in-package :funds)

(defgeneric tree-weight (tree) (:documentation