May 2005 - cl-utilities-cvs@common-lisp.net

[cl-utilities-cvs] CVS update: cl-utilities/package.sh
by pscott＠common-lisp.net 26 May '05

26 May '05

Update of /project/cl-utilities/cvsroot/cl-utilities In directory common-lisp.net:/tmp/cvs-serv7761 Modified Files: package.sh Log Message: Updated version number Date: Thu May 26 22:29:24 2005 Author: pscott Index: cl-utilities/package.sh diff -u cl-utilities/package.sh:1.2 cl-utilities/package.sh:1.3 --- cl-utilities/package.sh:1.2 Tue May 17 21:30:09 2005 +++ cl-utilities/package.sh Thu May 26 22:29:24 2005 @@ -1,17 +1,17 @@ #!/bin/sh -mkdir cl-utilities-1.0.2 -cp cl-utilities.asd package.sh collecting.lisp expt-mod.lisp package.lisp split-sequence.lisp compose.lisp extremum.lisp read-delimited.lisp test.lisp copy-array.lisp once-only.lisp rotate-byte.lisp with-unique-names.lisp README cl-utilities-1.0.2/ +mkdir cl-utilities-1.1 +cp cl-utilities.asd package.sh collecting.lisp expt-mod.lisp package.lisp split-sequence.lisp compose.lisp extremum.lisp read-delimited.lisp test.lisp copy-array.lisp once-only.lisp rotate-byte.lisp with-unique-names.lisp README cl-utilities-1.1/ rm -f cl-utilities-latest.tar.gz cl-utilities-latest.tar.gz.asc -tar -czvf cl-utilities-1.0.2.tar.gz cl-utilities-1.0.2/ -ln -s /root/lisp/cl-utilities/cl-utilities-1.0.2.tar.gz /root/lisp/cl-utilities/cl-utilities-latest.tar.gz -/usr/bin/xterm -e gpg -b -a /root/lisp/cl-utilities/cl-utilities-1.0.2.tar.gz -ln -s /root/lisp/cl-utilities/cl-utilities-1.0.2.tar.gz.asc /root/lisp/cl-utilities/cl-utilities-latest.tar.gz.asc -rm -Rf cl-utilities-1.0.2/ +tar -czvf cl-utilities-1.1.tar.gz cl-utilities-1.1/ +ln -s /root/lisp/cl-utilities/cl-utilities-1.1.tar.gz /root/lisp/cl-utilities/cl-utilities-latest.tar.gz +/usr/bin/xterm -e gpg -b -a /root/lisp/cl-utilities/cl-utilities-1.1.tar.gz +ln -s /root/lisp/cl-utilities/cl-utilities-1.1.tar.gz.asc /root/lisp/cl-utilities/cl-utilities-latest.tar.gz.asc +rm -Rf cl-utilities-1.1/ -scp cl-utilities-1.0.2.tar.gz pscott@common-lisp.net:/project/cl-utilities/public_html/cl-utilities-1.0.2.tar.gz -scp cl-utilities-1.0.2.tar.gz.asc pscott@common-lisp.net:/project/cl-utilities/public_html/cl-utilities-1.0.2.tar.gz.asc +scp cl-utilities-1.1.tar.gz pscott@common-lisp.net:/project/cl-utilities/public_html/cl-utilities-1.1.tar.gz +scp cl-utilities-1.1.tar.gz.asc pscott@common-lisp.net:/project/cl-utilities/public_html/cl-utilities-1.1.tar.gz.asc scp cl-utilities-latest.tar.gz pscott@common-lisp.net:/project/cl-utilities/public_html/cl-utilities-latest.tar.gz scp cl-utilities-latest.tar.gz.asc pscott@common-lisp.net:/project/cl-utilities/public_html/cl-utilities-latest.tar.gz.asc

1 0

[cl-utilities-cvs] CVS update: cl-utilities/copy-array.lisp
by pscott＠common-lisp.net 26 May '05

26 May '05

Update of /project/cl-utilities/cvsroot/cl-utilities In directory common-lisp.net:/tmp/cvs-serv7681 Modified Files: copy-array.lisp Log Message: Factored out part of COPY-ARRAY into its own function. Date: Thu May 26 22:24:24 2005 Author: pscott Index: cl-utilities/copy-array.lisp diff -u cl-utilities/copy-array.lisp:1.1.1.1 cl-utilities/copy-array.lisp:1.2 --- cl-utilities/copy-array.lisp:1.1.1.1 Mon May 9 23:26:29 2005 +++ cl-utilities/copy-array.lisp Thu May 26 22:24:24 2005 @@ -7,19 +7,23 @@ unless UNDISPLACE is non-NIL, in which case the contents of the array will be copied into a completely new, not displaced, array." (declare (type array array)) - (let ((copy - (apply #'make-array - (list* (array-dimensions array) - :element-type (array-element-type array) - :adjustable (adjustable-array-p array) - :fill-pointer (when (array-has-fill-pointer-p array) - (fill-pointer array)) - (multiple-value-bind (displacement offset) - (array-displacement array) - (when (and displacement (not undisplace)) - (list :displaced-to displacement - :displaced-index-offset offset))))))) + (let ((copy (%make-array-with-same-properties array undisplace))) (unless (array-displacement copy) (dotimes (n (array-total-size copy)) (setf (row-major-aref copy n) (row-major-aref array n)))) - copy)) \ No newline at end of file + copy)) + +(defun %make-array-with-same-properties (array undisplace) + "Make an array with the same properties (size, adjustability, etc.) +as another array, optionally undisplacing the array." + (apply #'make-array + (list* (array-dimensions array) + :element-type (array-element-type array) + :adjustable (adjustable-array-p array) + :fill-pointer (when (array-has-fill-pointer-p array) + (fill-pointer array)) + (multiple-value-bind (displacement offset) + (array-displacement array) + (when (and displacement (not undisplace)) + (list :displaced-to displacement + :displaced-index-offset offset)))))) \ No newline at end of file

1 0

[cl-utilities-cvs] CVS update: cl-utilities/collecting.lisp
by pscott＠common-lisp.net 26 May '05

26 May '05

Update of /project/cl-utilities/cvsroot/cl-utilities In directory common-lisp.net:/tmp/cvs-serv7621 Modified Files: collecting.lisp Log Message: Refactored, moved things around, improved error handling, and generally improved things. Date: Thu May 26 22:16:47 2005 Author: pscott Index: cl-utilities/collecting.lisp diff -u cl-utilities/collecting.lisp:1.1.1.1 cl-utilities/collecting.lisp:1.2 --- cl-utilities/collecting.lisp:1.1.1.1 Mon May 9 23:26:29 2005 +++ cl-utilities/collecting.lisp Thu May 26 22:16:47 2005 @@ -1,5 +1,3 @@ -(in-package :cl-utilities) - ;; Opinions differ on how a collection macro should work. There are ;; two main points for discussion: multiple collection variables and ;; implementation method. @@ -14,11 +12,11 @@ ;; it always uses the COLLECT function. If you want to collect into ;; multiple lists, use the WITH-COLLECT macro. - +(in-package :cl-utilities) ;; This should only be called inside of COLLECTING macros, but we ;; define it here to provide an informative error message and to make -;; it easier for SLIME (et al) to get documentation for the COLLECT +;; it easier for SLIME (et al.) to get documentation for the COLLECT ;; function when it's used in the COLLECTING macro. (defun collect (thing) "Collect THING in the context established by the COLLECTING macro" @@ -40,27 +38,13 @@ ,@body) ,collector))) -#+nil -(collecting - (dotimes (x 10) - (collect x))) - -;(collecting (mapc #'collect '(1 2 3 4 5))) - (defmacro with-collectors ((&rest collectors) &body body) "Collect some things into lists forwards. The names in COLLECTORS are defined as local functions which each collect into a separate list. Returns as many values as there are collectors, in the order they were given." - ;; Check that all of the COLLECTORS are symbols. If not, raise an error. - (let ((bad-collector (find-if-not #'symbolp collectors))) - (when bad-collector - (error "WITH-COLLECTORS expected a symbol but got ~S" bad-collector))) - (let ((gensyms-alist (mapcar #'cons collectors - (mapcar #'gensym - (mapcar #'(lambda (x) - (format nil "~A-TAIL-" x)) - collectors))))) + (%with-collectors-check-collectors collectors) + (let ((gensyms-alist (%with-collectors-gensyms-alist collectors))) `(let ,(loop for collector in collectors for tail = (cdr (assoc collector gensyms-alist)) nconc (list collector tail)) @@ -75,10 +59,26 @@ ,@body) (values ,@collectors)))) -#+nil -(with-collectors (one-through-nine abc) - (mapcar #'abc '(a b c)) - (dotimes (x 10) - (one-through-nine x) - (print one-through-nine)) - (terpri) (terpri)) \ No newline at end of file +(defun %with-collectors-check-collectors (collectors) + "Check that all of the COLLECTORS are symbols. If not, raise an error." + (let ((bad-collector (find-if-not #'symbolp collectors))) + (when bad-collector + (error 'type-error + :datum bad-collector + :expected-type 'symbol)))) + +(defun %with-collectors-gensyms-alist (collectors) + "Return an alist mapping the symbols in COLLECTORS to gensyms" + (mapcar #'cons collectors + (mapcar (compose #'gensym + #'(lambda (x) + (format nil "~A-TAIL-" x))) + collectors))) + +;; Some test code which would be too hard to move to the test suite. +#+nil (with-collectors (one-through-nine abc) + (mapcar #'abc '(a b c)) + (dotimes (x 10) + (one-through-nine x) + (print one-through-nine)) + (terpri) (terpri)) \ No newline at end of file

1 0

[cl-utilities-cvs] CVS update: cl-utilities/cl-utilities.asd
by pscott＠common-lisp.net 26 May '05

26 May '05

Update of /project/cl-utilities/cvsroot/cl-utilities In directory common-lisp.net:/tmp/cvs-serv6732 Modified Files: cl-utilities.asd Log Message: Added dependency for COMPOSE used in macroexpander code in WITH-COLLECTORS Date: Thu May 26 22:10:56 2005 Author: pscott Index: cl-utilities/cl-utilities.asd diff -u cl-utilities/cl-utilities.asd:1.1.1.1 cl-utilities/cl-utilities.asd:1.2 --- cl-utilities/cl-utilities.asd:1.1.1.1 Mon May 9 23:26:29 2005 +++ cl-utilities/cl-utilities.asd Thu May 26 22:10:56 2005 @@ -8,11 +8,15 @@ (defsystem cl-utilities :author "Maintained by Peter Scott" :components ((:file "package") - (:file "extremum" :depends-on ("package")) + (:file "extremum" :depends-on ("package" + "with-unique-names" + "once-only")) (:file "read-delimited" :depends-on ("package")) (:file "expt-mod" :depends-on ("package")) (:file "with-unique-names" :depends-on ("package")) - (:file "collecting" :depends-on ("package" "with-unique-names")) + (:file "collecting" :depends-on ("package" + "with-unique-names" + "compose")) (:file "once-only" :depends-on ("package")) (:file "rotate-byte" :depends-on ("package")) (:file "copy-array" :depends-on ("package"))

1 0

[cl-utilities-cvs] CVS update: cl-utilities/with-unique-names.lisp
by pscott＠common-lisp.net 26 May '05

26 May '05

Update of /project/cl-utilities/cvsroot/cl-utilities In directory common-lisp.net:/tmp/cvs-serv5859 Modified Files: with-unique-names.lisp Log Message: Refactored and improved type checking. Date: Thu May 26 22:00:00 2005 Author: pscott Index: cl-utilities/with-unique-names.lisp diff -u cl-utilities/with-unique-names.lisp:1.3 cl-utilities/with-unique-names.lisp:1.4 --- cl-utilities/with-unique-names.lisp:1.3 Mon May 16 21:12:00 2005 +++ cl-utilities/with-unique-names.lisp Thu May 26 22:00:00 2005 @@ -6,17 +6,21 @@ "Executes a series of forms with each var bound to a fresh, uninterned symbol. See http://www.cliki.net/WITH-UNIQUE-NAMES" `(let ,(mapcar #'(lambda (binding) - (destructuring-bind (var prefix) - (if (consp binding) - binding - (list binding binding)) - (if (symbolp var) - `(,var (gensym ,(format nil "~A" prefix))) - (error 'type-error - :datum var - :expected-type 'symbol)))) + (multiple-value-bind (var prefix) + (%with-unique-names-binding-parts binding) + (check-type var symbol) + `(,var (gensym ,(format nil "~A" + (or prefix var)))))) bindings) ,@body)) + +(defun %with-unique-names-binding-parts (binding) + "Return (values var prefix) from a WITH-UNIQUE-NAMES binding +form. If PREFIX is not given in the binding, NIL is returned to +indicate that the default should be used." + (if (consp binding) + (values (first binding) (second binding)) + (values binding nil))) (define-condition list-binding-not-supported (warning) ((binding :initarg :binding :reader list-binding-not-supported-binding))

1 0

[cl-utilities-cvs] CVS update: cl-utilities/once-only.lisp
by pscott＠common-lisp.net 26 May '05

26 May '05

Update of /project/cl-utilities/cvsroot/cl-utilities In directory common-lisp.net:/tmp/cvs-serv5783 Modified Files: once-only.lisp Log Message: Switched to %foo naming convention for auxilliary functions. Date: Thu May 26 21:47:53 2005 Author: pscott Index: cl-utilities/once-only.lisp diff -u cl-utilities/once-only.lisp:1.2 cl-utilities/once-only.lisp:1.3 --- cl-utilities/once-only.lisp:1.2 Thu May 26 21:09:05 2005 +++ cl-utilities/once-only.lisp Thu May 26 21:47:53 2005 @@ -7,7 +7,7 @@ (in-package :cl-utilities) -(defun check-once-only-names (names) +(defun %check-once-only-names (names) "Check that all of the NAMES are symbols. If not, raise an error." ;; This only raises an error for the first non-symbol argument ;; found. While this won't report multiple errors, it is probably @@ -18,7 +18,7 @@ (defmacro once-only (names &body body) ;; Check the NAMES list for validity. - (check-once-only-names names) + (%check-once-only-names names) ;; Do not touch this code unless you really know what you're doing. (let ((gensyms (loop for name in names collect (gensym (string name))))) `(let (,@(loop for g in gensyms

1 0

[cl-utilities-cvs] CVS update: cl-utilities/read-delimited.lisp
by pscott＠common-lisp.net 26 May '05

26 May '05

Update of /project/cl-utilities/cvsroot/cl-utilities In directory common-lisp.net:/tmp/cvs-serv5758 Modified Files: read-delimited.lisp Log Message: Major refactoring. It now does exactly the same thing as it used to, but now it does it in such a way that I'm not afraid of its source code. Date: Thu May 26 21:46:46 2005 Author: pscott Index: cl-utilities/read-delimited.lisp diff -u cl-utilities/read-delimited.lisp:1.1.1.1 cl-utilities/read-delimited.lisp:1.2 --- cl-utilities/read-delimited.lisp:1.1.1.1 Mon May 9 23:26:29 2005 +++ cl-utilities/read-delimited.lisp Thu May 26 21:46:46 2005 @@ -1,5 +1,25 @@ (in-package :cl-utilities) +(defun read-delimited (sequence stream &key (start 0) end + (delimiter #\Newline) (test #'eql) (key #'identity)) + ;; Check bounds on SEQUENCE + (multiple-value-setq (start end) + (%read-delimited-bounds-check sequence start end)) + ;; Loop until we run out of input characters or places to put them, + ;; or until we encounter the delimiter. + (loop for index from start + for char = (read-char stream nil nil) + for test-result = (funcall test (funcall key char) delimiter) + while (and char + (< index end) + (not test-result)) + do (setf (elt sequence index) char) + finally (return-from read-delimited + (values index test-result)))) + +;; Conditions +;;;;;;;;;;;;; + (define-condition read-delimited-bounds-error (error) ((start :initarg :start :reader read-delimited-bounds-error-start) (end :initarg :end :reader read-delimited-bounds-error-end) @@ -11,41 +31,48 @@ (:documentation "There's a problem with the indices START and END for SEQUENCE. See CLHS SUBSEQ-OUT-OF-BOUNDS:IS-AN-ERROR issue.")) -(defun read-delimited (sequence stream &key (start 0) end - (delimiter #\Newline) (test #'eql) key) - ;; Check to make sure END is in bounds - (when (and end (> end (length sequence))) +;; Error checking for bounds +;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(defun %read-delimited-bounds-check (sequence start end) + "Check to make sure START and END are in bounds when calling +READ-DELIMITED with SEQUENCE" + (check-type start (or integer null)) + (check-type end (or integer null)) + (let ((start (%read-delimited-bounds-check-start sequence start end)) + (end (%read-delimited-bounds-check-end sequence start end))) + ;; Returns (values start end) + (%read-delimited-bounds-check-order sequence start end))) + +(defun %read-delimited-bounds-check-order (sequence start end) + "Check the order of START and END bounds, and return them in the +correct order." + (when (< end start) (restart-case (error 'read-delimited-bounds-error :start start :end end :sequence sequence) (continue () - :report "Use default instead" - (setf end nil)))) - ;; Check to make sure START is in bounds + :report "Switch start and end" + (rotatef start end)))) + (values start end)) + +(defun %read-delimited-bounds-check-start (sequence start end) + "Check to make sure START is in bounds when calling READ-DELIMITED +with SEQUENCE" (when (and start (< start 0)) (restart-case (error 'read-delimited-bounds-error :start start :end end :sequence sequence) (continue () - :report "Use default instead" + :report "Use default for START instead" (setf start 0)))) - (let ((key (or key #'identity)) - (end (or end (length sequence)))) - ;; START and END should be positive integers by now - (check-type start unsigned-byte) - (check-type end unsigned-byte) - ;; Check to make sure that START < END - (when (< end start) - (restart-case (error 'read-delimited-bounds-error - :start start :end end :sequence sequence) - (continue () - :report "Switch start and end" - (rotatef start end)))) - ;; Actually do the looping - (loop for index from start - for char = (read-char stream nil nil) - for test-result = (funcall test (funcall key char) delimiter) - while (and char - (< index end) - (not test-result)) - do (setf (elt sequence index) char) - finally (return-from read-delimited - (values index test-result))))) \ No newline at end of file + start) + +(defun %read-delimited-bounds-check-end (sequence start end) + "Check to make sure END is in bounds when calling READ-DELIMITED +with SEQUENCE" + (when (and end (> end (length sequence))) + (restart-case (error 'read-delimited-bounds-error + :start start :end end :sequence sequence) + (continue () + :report "Use default for END instead" + (setf end nil)))) + (or end (length sequence))) \ No newline at end of file

1 0

[cl-utilities-cvs] CVS update: cl-utilities/extremum.lisp
by pscott＠common-lisp.net 26 May '05

26 May '05

Update of /project/cl-utilities/cvsroot/cl-utilities In directory common-lisp.net:/tmp/cvs-serv3996 Modified Files: extremum.lisp Log Message: Updated and improved documentation Date: Thu May 26 21:20:28 2005 Author: pscott Index: cl-utilities/extremum.lisp diff -u cl-utilities/extremum.lisp:1.5 cl-utilities/extremum.lisp:1.6 --- cl-utilities/extremum.lisp:1.5 Tue May 17 21:17:34 2005 +++ cl-utilities/extremum.lisp Thu May 26 21:20:28 2005 @@ -22,6 +22,11 @@ (if (funcall ,test a b) a b)) whole)) +;; The normal way of testing the if length of a proper sequence equals +;; zero is to just use (zerop (length sequence)). And, while some +;; implementations may optimize this, it's probably a good idea to +;; just write an optimized version and use it. This method can speed +;; up list length testing. (defun zero-length-p (sequence) "Is the length of SEQUENCE equal to zero?" (declare (optimize (speed 3) (safety 0) (space 0) (debug 1))) @@ -51,9 +56,7 @@ &key (key #'identity) (start 0) end) "Returns the element of SEQUENCE that would appear first if the sequence were ordered according to SORT using PREDICATE and KEY. See -http://www.cliki.net/EXTREMUM for the full -specification. Additionally, START and END specify the beginning and -ending indices of the part of the sequence we should look at." +http://www.cliki.net/EXTREMUM for the full specification." (with-check-length (sequence start end) (reduce (comparator predicate key) sequence :start start :end end))) @@ -68,15 +71,6 @@ (reduce (comparator ,predicate) ,sequence :start ,start :end ,end)))) whole)) - -;; And, for backup, here's a strictly spec-compliant version. -#+nil -(defun extremum (sequence predicate &key (key #'identity)) - "Returns the element of SEQUENCE that would appear first if the -sequence were ordered according to SORT using PREDICATE and KEY. See -http://www.cliki.net/EXTREMUM for the full specification." - (with-check-length (sequence 0 nil) - (reduce (comparator predicate key) sequence))) ;; This is an "optimized" version which calls KEY less. REDUCE is ;; already so optimized that this will actually be slower unless KEY

1 0

[cl-utilities-cvs] CVS update: cl-utilities/compose.lisp
by pscott＠common-lisp.net 26 May '05

26 May '05

Update of /project/cl-utilities/cvsroot/cl-utilities In directory common-lisp.net:/tmp/cvs-serv3117 Modified Files: compose.lisp Log Message: Added some commentary on single and multiple values. Date: Thu May 26 21:11:52 2005 Author: pscott Index: cl-utilities/compose.lisp diff -u cl-utilities/compose.lisp:1.3 cl-utilities/compose.lisp:1.4 --- cl-utilities/compose.lisp:1.3 Fri May 13 21:17:38 2005 +++ cl-utilities/compose.lisp Thu May 26 21:11:51 2005 @@ -1,3 +1,7 @@ +;; This version of COMPOSE can only handle functions which take one +;; value and return one value. There are other ways of writing +;; COMPOSE, but this is the most commonly used. + (in-package :cl-utilities) ;; This is really slow and conses a lot. Fortunately we can speed it

1 0

[cl-utilities-cvs] CVS update: cl-utilities/once-only.lisp
by pscott＠common-lisp.net 26 May '05

26 May '05

Update of /project/cl-utilities/cvsroot/cl-utilities In directory common-lisp.net:/tmp/cvs-serv3083 Modified Files: once-only.lisp Log Message: Factored out error checking Date: Thu May 26 21:09:05 2005 Author: pscott Index: cl-utilities/once-only.lisp diff -u cl-utilities/once-only.lisp:1.1.1.1 cl-utilities/once-only.lisp:1.2 --- cl-utilities/once-only.lisp:1.1.1.1 Mon May 9 23:26:29 2005 +++ cl-utilities/once-only.lisp Thu May 26 21:09:05 2005 @@ -7,11 +7,18 @@ (in-package :cl-utilities) -(defmacro once-only ((&rest names) &body body) - ;; Check that all of the NAMES are symbols. If not, raise an error. +(defun check-once-only-names (names) + "Check that all of the NAMES are symbols. If not, raise an error." + ;; This only raises an error for the first non-symbol argument + ;; found. While this won't report multiple errors, it is probably + ;; more convenient to only report one. (let ((bad-name (find-if-not #'symbolp names))) (when bad-name - (error "ONCE-ONLY expected a symbol but got ~S" bad-name))) + (error "ONCE-ONLY expected a symbol but got ~S" bad-name)))) + +(defmacro once-only (names &body body) + ;; Check the NAMES list for validity. + (check-once-only-names names) ;; Do not touch this code unless you really know what you're doing. (let ((gensyms (loop for name in names collect (gensym (string name))))) `(let (,@(loop for g in gensyms

1 0