cl-utilities-cvs

cl-utilities-cvs@common-lisp.net

41 discussions

[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

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

17 May '05

Update of /project/cl-utilities/cvsroot/cl-utilities In directory common-lisp.net:/tmp/cvs-serv25204 Modified Files: package.sh Log Message: Fixed symlink bug Date: Tue May 17 21:30:09 2005 Author: pscott Index: cl-utilities/package.sh diff -u cl-utilities/package.sh:1.1.1.1 cl-utilities/package.sh:1.2 --- cl-utilities/package.sh:1.1.1.1 Mon May 9 23:26:29 2005 +++ cl-utilities/package.sh Tue May 17 21:30:09 2005 @@ -1,15 +1,17 @@ #!/bin/sh -mkdir cl-utilities-1.0 -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/ +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/ -tar -czvf cl-utilities-1.0.tar.gz cl-utilities-1.0/ -ln -s /root/lisp/cl-utilities/cl-utilities-1.0.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.tar.gz -ln -s /root/lisp/cl-utilities/cl-utilities-1.0.tar.gz.asc /root/lisp/cl-utilities/cl-utilities-latest.tar.gz.asc -rm -Rf cl-utilities-1.0/ +rm -f cl-utilities-latest.tar.gz cl-utilities-latest.tar.gz.asc -scp cl-utilities-1.0.tar.gz pscott@common-lisp.net:/project/cl-utilities/public_html/cl-utilities-1.0.tar.gz -scp cl-utilities-1.0.tar.gz.asc pscott@common-lisp.net:/project/cl-utilities/public_html/cl-utilities-1.0.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/ + +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-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/extremum.lisp
by pscott＠common-lisp.net 17 May '05

17 May '05

Update of /project/cl-utilities/cvsroot/cl-utilities In directory common-lisp.net:/tmp/cvs-serv24989 Modified Files: extremum.lisp Log Message: Fixed various problems and factored out some very ugly repeated checking code into a macro. The code is now much cleaner and less error-prone. Date: Tue May 17 21:17:34 2005 Author: pscott Index: cl-utilities/extremum.lisp diff -u cl-utilities/extremum.lisp:1.4 cl-utilities/extremum.lisp:1.5 --- cl-utilities/extremum.lisp:1.4 Tue May 17 00:06:47 2005 +++ cl-utilities/extremum.lisp Tue May 17 21:17:34 2005 @@ -31,6 +31,19 @@ (declaim (inline zero-length-p)) +;; Checks the length of the subsequence of SEQUENCE specified by START +;; and END, and if it's 0 then a NO-EXTREMUM error is signalled. This +;; should only be used in EXTREMUM functions. +(defmacro with-check-length ((sequence start end) &body body) + (once-only (sequence start end) + `(if (or (zero-length-p ,sequence) + (>= ,start (or ,end (length ,sequence)))) + (restart-case (error 'no-extremum) + (continue () + :report "Return NIL instead" + nil)) + ,@body))) + ;; This is an extended version which takes START and END keyword ;; arguments. Any spec-compliant use of EXTREMUM will also work with ;; this extended version. @@ -41,26 +54,16 @@ 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." - (if (or (zero-length-p sequence) - (>= start (or end (length sequence)))) - (restart-case (error 'no-extremum) - (continue () - :report "Return NIL instead" - nil)) - (reduce (comparator predicate key) sequence - :start start :end end))) + (with-check-length (sequence start end) + (reduce (comparator predicate key) sequence + :start start :end end))) ;; This optimizes the case where KEY is #'identity (define-compiler-macro extremum (&whole whole sequence predicate &key (key #'identity) (start 0) end) (if (eql key #'identity) (once-only (sequence predicate start end) - `(if (or (zero-length-p ,sequence) - (>= ,start (or ,end (length ,sequence)))) - (restart-case (error 'no-extremum) - (continue () - :report "Return NIL instead" - nil)) + `(with-check-length (,sequence ,start ,end) (locally (declare (optimize (speed 3) (safety 0) (space 0) (debug 1))) (reduce (comparator ,predicate) ,sequence :start ,start :end ,end)))) @@ -72,12 +75,8 @@ "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." - (if (zero-length-p sequence) - (restart-case (error 'no-extremum) - (continue () - :report "Return NIL instead" - nil)) - (reduce (comparator predicate key) sequence))) + (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 @@ -91,26 +90,21 @@ if the KEY function is so slow that calling it less often would be a significant improvement; ordinarily it's slower." (declare (optimize (speed 3) (safety 0) (space 0) (debug 1))) - (if (or (zero-length-p sequence) - (>= start (or end (length sequence)))) - (restart-case (error 'no-extremum) - (continue () - :report "Return NIL instead" - nil)) - (let* ((smallest (elt sequence 0)) - (smallest-key (funcall key smallest)) - (current-index 0) - (real-end (or end #.(1- most-positive-fixnum)))) - (declare (type (integer 0 #.most-positive-fixnum) - current-index real-end start)) - (map nil #'(lambda (x) - (when (<= start current-index real-end) - (let ((x-key (funcall key x))) - (when (funcall predicate - x-key - smallest-key) - (setf smallest x) - (setf smallest-key x-key)))) - (incf current-index)) - sequence) - smallest))) \ No newline at end of file + (with-check-length (sequence start end) + (let* ((smallest (elt sequence 0)) + (smallest-key (funcall key smallest)) + (current-index 0) + (real-end (or end #.(1- most-positive-fixnum)))) + (declare (type (integer 0 #.most-positive-fixnum) + current-index real-end start)) + (map nil #'(lambda (x) + (when (<= start current-index real-end) + (let ((x-key (funcall key x))) + (when (funcall predicate + x-key + smallest-key) + (setf smallest x) + (setf smallest-key x-key)))) + (incf current-index)) + sequence) + smallest))) \ No newline at end of file

1 0

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

17 May '05

Update of /project/cl-utilities/cvsroot/cl-utilities In directory common-lisp.net:/tmp/cvs-serv13214 Modified Files: extremum.lisp Log Message: Probably fixed problem with START and END and error checking. Date: Tue May 17 00:06:47 2005 Author: pscott Index: cl-utilities/extremum.lisp diff -u cl-utilities/extremum.lisp:1.3 cl-utilities/extremum.lisp:1.4 --- cl-utilities/extremum.lisp:1.3 Fri May 13 21:45:09 2005 +++ cl-utilities/extremum.lisp Tue May 17 00:06:47 2005 @@ -41,7 +41,8 @@ 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." - (if (zero-length-p sequence) + (if (or (zero-length-p sequence) + (>= start (or end (length sequence)))) (restart-case (error 'no-extremum) (continue () :report "Return NIL instead" @@ -54,7 +55,8 @@ &key (key #'identity) (start 0) end) (if (eql key #'identity) (once-only (sequence predicate start end) - `(if (zero-length-p ,sequence) + `(if (or (zero-length-p ,sequence) + (>= ,start (or ,end (length ,sequence)))) (restart-case (error 'no-extremum) (continue () :report "Return NIL instead" @@ -89,7 +91,8 @@ if the KEY function is so slow that calling it less often would be a significant improvement; ordinarily it's slower." (declare (optimize (speed 3) (safety 0) (space 0) (debug 1))) - (if (zero-length-p sequence) + (if (or (zero-length-p sequence) + (>= start (or end (length sequence)))) (restart-case (error 'no-extremum) (continue () :report "Return NIL instead"

1 0

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

16 May '05

Update of /project/cl-utilities/cvsroot/cl-utilities In directory common-lisp.net:/tmp/cvs-serv1864 Modified Files: with-unique-names.lisp Log Message: Improved documentation and type checking. Cleaned up code a little. Date: Mon May 16 21:12:00 2005 Author: pscott Index: cl-utilities/with-unique-names.lisp diff -u cl-utilities/with-unique-names.lisp:1.2 cl-utilities/with-unique-names.lisp:1.3 --- cl-utilities/with-unique-names.lisp:1.2 Fri May 13 23:18:23 2005 +++ cl-utilities/with-unique-names.lisp Mon May 16 21:12:00 2005 @@ -10,7 +10,11 @@ (if (consp binding) binding (list binding binding)) - `(,var (gensym ,(format nil "~A" prefix))))) + (if (symbolp var) + `(,var (gensym ,(format nil "~A" prefix))) + (error 'type-error + :datum var + :expected-type 'symbol)))) bindings) ,@body)) @@ -28,7 +32,11 @@ (defmacro with-gensyms ((&rest bindings) &body body) "Synonym for WITH-UNIQUE-NAMES, but BINDINGS should only consist of -atoms; lists are not supported." +atoms; lists are not supported. If you try to give list bindings, a +LIST-BINDING-NOT-SUPPORTED warning will be signalled, but it will work +the same way as WITH-UNIQUE-NAMES. Don't do it, though." + ;; Signal a warning for each list binding, if there are any (dolist (binding (remove-if-not #'listp bindings)) (warn 'list-binding-not-supported :binding binding)) + ;; Otherwise, this is a synonym for WITH-UNIQUE-NAMES `(with-unique-names ,bindings ,@body))

1 0

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

13 May '05

Update of /project/cl-utilities/cvsroot/cl-utilities In directory common-lisp.net:/tmp/cvs-serv7403 Modified Files: with-unique-names.lisp Log Message: Replaced (string prefix) with (format nil "~A" prefix), which is more general. I can't see why anybody would want to take advantage of this, but I can't see any reason *not* to let them either. Date: Fri May 13 23:18:23 2005 Author: pscott Index: cl-utilities/with-unique-names.lisp diff -u cl-utilities/with-unique-names.lisp:1.1.1.1 cl-utilities/with-unique-names.lisp:1.2 --- cl-utilities/with-unique-names.lisp:1.1.1.1 Mon May 9 23:26:29 2005 +++ cl-utilities/with-unique-names.lisp Fri May 13 23:18:23 2005 @@ -10,7 +10,7 @@ (if (consp binding) binding (list binding binding)) - `(,var (gensym ,(string prefix))))) + `(,var (gensym ,(format nil "~A" prefix))))) bindings) ,@body))

1 0

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

13 May '05

Update of /project/cl-utilities/cvsroot/cl-utilities In directory common-lisp.net:/tmp/cvs-serv2061 Modified Files: test.lisp Log Message: Added more tests for EXREMUM. Date: Fri May 13 21:45:58 2005 Author: pscott Index: cl-utilities/test.lisp diff -u cl-utilities/test.lisp:1.4 cl-utilities/test.lisp:1.5 --- cl-utilities/test.lisp:1.4 Tue May 10 21:46:38 2005 +++ cl-utilities/test.lisp Fri May 13 21:45:57 2005 @@ -41,7 +41,11 @@ (signals no-extremum (extremum '() #'<)) (is-false (handler-bind ((no-extremum #'continue)) (extremum '() #'<))) - (is (= (extremum '(2/3 2 3 4) #'> :key (lambda (x) (/ 1 x))) 2/3))) + (is (= (extremum '(2/3 2 3 4) #'> :key (lambda (x) (/ 1 x))) 2/3)) + (is (= (locally (declare (optimize (speed 3) (safety 0))) + (extremum #(1 23 3 4 5 0) #'>)) + 23)) + (is (= (extremum-fastkey '(2/3 2 3 4) #'> :key (lambda (x) (/ 1 x))) 2/3))) (defun delimited-test (&key (delimiter #\|) (start 0) end (string "foogo|ogreogrjejgierjijri|bar|baz"))

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

cl-utilities-cvs