[Cl-heap-cvs] r15 - cl-heap/trunk

[rneeser at common-lisp.net]

Author: rneeser
Date: Sat Mar 31 10:11:36 2012
New Revision: 15

Log:
Removing accessors - patches from Michał Psota

Modified:
   cl-heap/trunk/AUTHORS
   cl-heap/trunk/ChangeLog
   cl-heap/trunk/cl-heap-tests.asd
   cl-heap/trunk/cl-heap.asd
   cl-heap/trunk/fibonacci-heap.lisp
   cl-heap/trunk/heap.lisp

Modified: cl-heap/trunk/AUTHORS
==============================================================================
--- cl-heap/trunk/AUTHORS	Sat Sep  4 07:22:45 2010	(r14)
+++ cl-heap/trunk/AUTHORS	Sat Mar 31 10:11:36 2012	(r15)
@@ -1,2 +1,5 @@
 Authors:
-	Rudolph Neeser <rudy.neeser at gmail.com>
\ No newline at end of file
+	Rudolph Neeser <rudy.neeser at gmail.com>
+
+Contributors:
+	Michał Psota
\ No newline at end of file

Modified: cl-heap/trunk/ChangeLog
==============================================================================
--- cl-heap/trunk/ChangeLog	Sat Sep  4 07:22:45 2010	(r14)
+++ cl-heap/trunk/ChangeLog	Sat Mar 31 10:11:36 2012	(r15)
@@ -1,3 +1,16 @@
+2012-03-31  Rudy Neeser  <rudy.neeser at gmail.com>
+
+	* cl-heap-tests.asd (:cl-heap-tests): Updated version number to
+	0.1.5
+
+	* cl-heap.asd (:cl-heap): Updated version number to 0.1.5
+
+	* heap.lisp (print-object):
+	Removed unnecessary slot accessor. Patch by Michał Psota.
+
+	* fibonacci-heap.lisp (concatenate-node-lists):
+	Removed unnecessary slot accessors. Patch by Michał Psota.
+
 2010-09-04  Rudy Neeser  <rudy.neeser at gmail.com>
 
 	* binary-heap.lisp (children-positions, parent-position)

Modified: cl-heap/trunk/cl-heap-tests.asd
==============================================================================
--- cl-heap/trunk/cl-heap-tests.asd	Sat Sep  4 07:22:45 2010	(r14)
+++ cl-heap/trunk/cl-heap-tests.asd	Sat Mar 31 10:11:36 2012	(r15)
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; -*-
 ;;;
-;;; Copyright 2009-2010 Rudolph Neeser <rudy.neeser at gmail.com>
+;;; Copyright 2009-2010, 2012 Rudolph Neeser <rudy.neeser at gmail.com>
 ;;; 
 ;;; This file is part of CL-HEAP
 ;;; 
@@ -28,7 +28,7 @@
 (defsystem :cl-heap-tests
     :description "Tests for the CL-HEAP package, an implementation of
     heap and priority queue data structures."
-    :version "0.1.3"
+    :version "0.1.5"
     :author "Rudy Neeser <rudy.neeser at gmail.com>"
     :license "GPLv3"
     :depends-on (:xlunit :cl-heap)

Modified: cl-heap/trunk/cl-heap.asd
==============================================================================
--- cl-heap/trunk/cl-heap.asd	Sat Sep  4 07:22:45 2010	(r14)
+++ cl-heap/trunk/cl-heap.asd	Sat Mar 31 10:11:36 2012	(r15)
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; -*-
 ;;;
-;;; Copyright 2009-2010 Rudolph Neeser <rudy.neeser at gmail.com>
+;;; Copyright 2009-2010, 2012 Rudolph Neeser <rudy.neeser at gmail.com>
 ;;; 
 ;;; This file is part of CL-HEAP
 ;;; 
@@ -27,7 +27,7 @@
 
 (defsystem :cl-heap
     :description "An implementation of heap and priority queue data structures."
-    :version "0.1.4"
+    :version "0.1.5"
     :author "Rudy Neeser <rudy.neeser at gmail.com>"
     :license "GPLv3"
     :serial t

Modified: cl-heap/trunk/fibonacci-heap.lisp
==============================================================================
--- cl-heap/trunk/fibonacci-heap.lisp	Sat Sep  4 07:22:45 2010	(r14)
+++ cl-heap/trunk/fibonacci-heap.lisp	Sat Mar 31 10:11:36 2012	(r15)
@@ -1,4 +1,5 @@
 ;;; Copyright 2009-2010 Rudolph Neeser <rudy.neeser at gmail.com>.
+;;; Copyright 2012 CL-HEAP (See AUTHORS file).
 ;;; 
 ;;; This file is part of CL-HEAP
 ;;; 
@@ -81,16 +82,10 @@
   (:method ((lhs null) (rhs node))
     rhs)
   (:method ((lhs node) (rhs node))
-    (with-slots ((lhs-next next)
-		 (lhs-last last)
-		 (lhs-item item)) lhs
-      (with-slots ((rhs-next next)
-		   (rhs-last last)
-		   (rhs-item item)) rhs
-	(psetf (node-next lhs) rhs
-	       (node-last (node-next lhs)) (node-last rhs)
-	       (node-last rhs) lhs
-	       (node-next (node-last rhs)) (node-next lhs))))
+    (psetf (node-next lhs) rhs
+	   (node-last (node-next lhs)) (node-last rhs)
+	   (node-last rhs) lhs
+	   (node-next (node-last rhs)) (node-next lhs))
     lhs))
 
 
@@ -390,4 +385,4 @@
 	(if (node-marked-p parent)
 	    (cut-node heap parent)
 	    (mark-node parent)))))
-  heap)
\ No newline at end of file
+  heap)

Modified: cl-heap/trunk/heap.lisp
==============================================================================
--- cl-heap/trunk/heap.lisp	Sat Sep  4 07:22:45 2010	(r14)
+++ cl-heap/trunk/heap.lisp	Sat Mar 31 10:11:36 2012	(r15)
@@ -1,4 +1,5 @@
 ;;; Copyright 2009-2010 Rudolph Neeser <rudy.neeser at gmail.com>.
+;;; Copyright 2012 CL-HEAP (See AUTHORS file).
 ;;; 
 ;;; This file is part of CL-HEAP
 ;;; 
@@ -113,6 +114,5 @@
 
 (defmethod print-object ((heap heap) stream)
   (print-unreadable-object (heap stream :type t :identity t)
-    (with-slots (key sort-fun) heap
-      (format stream "Size: ~A"	 (heap-size heap)))))
+    (format stream "Size: ~A" (heap-size heap))))