[elephant-cvs] CVS elephant/src/elephant

[ieslick]

Update of /project/elephant/cvsroot/elephant/src/elephant
In directory clnet:/tmp/cvs-serv24154

Modified Files:
	controller.lisp 
Log Message:
Reduce typing for store controller keyword

--- /project/elephant/cvsroot/elephant/src/elephant/controller.lisp	2007/03/23 16:08:10	1.40
+++ /project/elephant/cvsroot/elephant/src/elephant/controller.lisp	2007/03/24 03:03:00	1.41
@@ -420,34 +420,34 @@
 ; Operations on the root index
 ;;
 
-(defun add-to-root (key value &key (store-controller *store-controller*))
+(defun add-to-root (key value &key (sc *store-controller*))
   "Add an arbitrary persistent thing to the root, so you can
 retrieve it in a later session.  N.B. this means it (and
 everything it points to) won't get gc'd."
   (declare (type store-controller store-controller))
   (assert (not (eq key *elephant-properties-label*)))
-  (setf (get-value key (controller-root store-controller)) value))
+  (setf (get-value key (controller-root sc)) value))
 
-(defun get-from-root (key &key (store-controller *store-controller*))
+(defun get-from-root (key &key (sc *store-controller*))
   "Get a something from the root."
-  (declare (type store-controller store-controller))
-  (get-value key (controller-root store-controller)))
+  (declare (type store-controller sc))
+  (get-value key (controller-root sc)))
 
-(defun root-existsp (key &key (store-controller *store-controller*))
+(defun root-existsp (key &key (sc *store-controller*))
   "Test whether a key exists in the root"
-  (declare (type store-controller store-controller))
-  (if (existsp key (controller-root store-controller))
+  (declare (type store-controller sc))
+  (if (existsp key (controller-root sc))
       t 
       nil))
 
-(defun remove-from-root (key &key (store-controller *store-controller*))
+(defun remove-from-root (key &key (sc *store-controller*))
   "Remove something from the root."
-  (declare (type store-controller store-controller))
-  (remove-kv key (controller-root store-controller)))
+  (declare (type store-controller sc))
+  (remove-kv key (controller-root sc)))
 
-(defun map-root (fn &key (store-controller *store-controller*))
+(defun map-root (fn &key (sc *store-controller*))
   "Map over all key-value pairs in the root"
-  (map-btree fn (controller-root store-controller)))
+  (map-btree fn (controller-root sc)))
 
 ;;
 ;; Explicit storage reclamation