Author: abaine Date: Sun Aug 19 11:53:04 2007 New Revision: 155 Modified: trunk/funds/src/heap/heap.lisp trunk/funds/src/trees/constructors.lisp Log: Moved +heap-leaf+ and make-heap-leaf from constructors.lisp to heap.lisp. Modified: trunk/funds/src/heap/heap.lisp ============================================================================== --- trunk/funds/src/heap/heap.lisp (original) +++ trunk/funds/src/heap/heap.lisp Sun Aug 19 11:53:04 2007 @@ -5,6 +5,11 @@ () (:documentation "A leaf node of a heap.")) +(defconstant +heap-leaf+ (make-instance 'heap-leaf)) + +(defun make-heap-leaf () + +heap-leaf+) + (defclass heap (binary-tree) ((key :initarg :priority :reader heap-priority) (left :initform (make-heap)) Modified: trunk/funds/src/trees/constructors.lisp ============================================================================== --- trunk/funds/src/trees/constructors.lisp (original) +++ trunk/funds/src/trees/constructors.lisp Sun Aug 19 11:53:04 2007 @@ -19,7 +19,6 @@ (defconstant +bt-leaf+ (make-instance 'bt-leaf)) (defconstant +avl-leaf+ (make-instance 'avl-leaf)) -(defconstant +heap-leaf+ (make-instance 'heap-leaf)) (defun make-bt-leaf () +bt-leaf+) @@ -27,9 +26,6 @@ (defun make-avl-leaf () +avl-leaf+) -(defun make-heap-leaf () - +heap-leaf+) - (defun make-binary-tree () (make-bt-leaf))