[funds-cvs] r191 - trunk/funds/src

[abaine at common-lisp.net]

Author: abaine
Date: Mon Aug 20 11:54:26 2007
New Revision: 191

Modified:
   trunk/funds/src/package.lisp
   trunk/funds/src/queue.lisp
Log:
Renamed enqueue and dequeue.

Modified: trunk/funds/src/package.lisp
==============================================================================
--- trunk/funds/src/package.lisp	(original)
+++ trunk/funds/src/package.lisp	Mon Aug 20 11:54:26 2007
@@ -44,8 +44,8 @@
 
 	   :make-queue
 	   :queue-empty-p
-	   :queue-enqueue
-	   :queue-dequeue
+	   :enqueue
+	   :dequeue
 	   :queue-first
 	   :queue-size
 	   :queue-as-list

Modified: trunk/funds/src/queue.lisp
==============================================================================
--- trunk/funds/src/queue.lisp	(original)
+++ trunk/funds/src/queue.lisp	Mon Aug 20 11:54:26 2007
@@ -26,12 +26,12 @@
   "The value at the head of the given queue."
   (heap-first (queue-heap q)))
 
-(defun queue-enqueue (q item)
+(defun enqueue (q item)
   "The queue that results when the given item is equeued on the given queue."
   (make-queue :next-priority (1+ (queue-next-priority q))
 	      :heap (heap-insert (queue-heap q) item (queue-next-priority q))))
 
-(defun queue-dequeue (q)
+(defun dequeue (q)
   "The queue that results when the first item is removed from the given queue."
   (if (queue-empty-p q)
       q