@@ -300,36 +300,11 @@ following example illustrates its use: 16 ---------------------------------------------- -SLICE fixes certain arguments of a given function and returns a -function on the remaining (free) arguments. Here are some examples: - ------------------------------------------------------------------------------------ - CL-USER> (funcall (slice #'< _ 10) 5) - T - CL-USER> (funcall (slice #'concatenate 'string) (list #\f #\o #\o #\b #\a #\r)) - "foobar" ------------------------------------------------------------------------------------ - Hash table utilities ^^^^^^^^^^^^^^^^^^^^ -To quickly create a hash table you can use ALIST->HASH-TABLE. Here's -an example: - ------------------------------------------------------------------------------ - CL-USER> (defparameter *hash-table* - (alist->hash-table (pairlis '("one" "two" "three") '(1 2 3)))) - *HASH-TABLE* - CL-USER> *hash-table* - #<HASH-TABLE :TEST EQL :COUNT 3 {AAEAF99}> ------------------------------------------------------------------------------ - -The function ALIST->HASH-TABLE will process the specified list and -pass every other parameter to MAKE-HASH-TABLE. That way, you can -control how the hash table will behave. - -Now, if you want to traverse a hash table, DOHASH can iterate over it -with semantics similar to those of DOLIST: +If you want to traverse a hash table, DOHASH can iterate over it with +semantics similar to those of DOLIST: ------------------------------------------------------- CL-USER> (dohash (key value *hash-table*) @@ -344,14 +319,6 @@ with semantics similar to those of DOLIST: 6 ------------------------------------------------------- -Finally, for easy serialization, there's HASH-TABLE->ALIST, which -converts the specified hash table to an association list: - ---------------------------------------------- - CL-USER> (hash-table->alist *hash-table*) - (("one" . 1) ("two" . 2) ("three" . 3)) ---------------------------------------------- - Strings ^^^^^^^ README @@ -22,21 +22,6 @@ ;;; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ;;; DEALINGS IN THE SOFTWARE. -(defmacro slice (function &rest args) - ;; Inspired by iterate's sharpl reader macro and - ;; http://srfi.schemers.org/srfi-26/srfi-26.html - (let ((lambda-list nil) - (parameters nil) - (remaining-args (gensym "SLICE"))) - (dolist (x args) - (if (eq x '_) - (let ((s (gensym "SLICE"))) - (push s lambda-list) - (push s parameters)) - (push x parameters))) - `(lambda (,@(nreverse lambda-list) &rest ,remaining-args) - (apply ,function ,@(nreverse parameters) ,remaining-args)))) - (defun $ (&rest functions) "Returns the composition of FUNCTIONS. Note that FUNCTIONS must be composable in the order specified. @@ -48,7 +33,7 @@ 2) 16 - INCF-CL> (funcall ($ #'values #'floor #'sqrt (slice #'expt _ 2)) -2) + INCF-CL> (funcall ($ #'values #'floor #'sqrt (lambda (x) (expt x 2))) -2) 2" (assert (every #'functionp functions)) (flet ((compose (f g) function.lisp @@ -31,19 +31,3 @@ NIL or the result of evaluating RESULT-FORM if it was specified." (progn ,@body) finally (return ,result-form))) - -(defun hash-table->alist (hash-table) - "Returns an association list containing the keys and values in -HASH-TABLE." - (let (alist) - (dohash (key value hash-table alist) - (setf alist (acons key value alist))))) - -(defun alist->hash-table (alist &rest make-hash-table-parameters) - "Returns a new hash table containing the keys and values present in -each element of the association list ALIST. The hash table will be -created using MAKE-HASH-TABLE-PARAMETERS." - (let ((hash-table - (apply #'make-hash-table make-hash-table-parameters))) - (dolist (x alist hash-table) - (setf (gethash (car x) hash-table) (cdr x))))) hash-table.lisp @@ -53,14 +53,10 @@ #:intersperse #:nintersperse #-clisp #:dohash - #:hash-table->alist - #:alist->hash-table #:while #:string-join #:signals-p #:doctest - #:slice - #:_ #:$ #:nest #:nest-list package.lisp @@ -145,7 +145,9 @@ LIST itself is used.") (defmethod insert (x (list list) &key key (test #'<) test-not) (check-type key function-or-null) (let ((test (canonicalize-test test test-not))) - (multiple-value-bind (lt ge) (span (slice test _ (apply-key key x)) list :key key) + (multiple-value-bind (lt ge) (span (lambda (z) + (funcall test z (apply-key key x))) + list :key key) (nconc lt (cons x ge))))) (defun replicate (n x) @@ -342,7 +344,7 @@ LIST itself is used. For example, - INCF-CL> (mapcar (slice #'concatenate 'string) + INCF-CL> (mapcar (lambda (x) (concatenate 'string x)) (group (coerce \"Mississippi\" 'list))) (\"M\" \"i\" \"ss\" \"i\" \"ss\" \"i\" \"pp\" \"i\")")) @@ -354,7 +356,8 @@ LIST itself is used. (do () ((null list) (rest result)) (destructuring-bind (x . xs) list - (multiple-value-bind (ys zs) (span (slice test (apply-key key x)) + (multiple-value-bind (ys zs) (span (lambda (z) + (funcall test z (apply-key key x))) xs :key key) (setf splice (setf (rest splice) (list (cons x ys)))) (setf list zs)))))) prelude.lisp @@ -70,7 +70,7 @@ (is (eq nil (take-while (constantly t) nil))) (is (eq nil (take-while (constantly nil) (list 1 2 3)))) (is (equal (list 1 2 3) (take-while (constantly t) (list 1 2 3)))) - (is (equal (list 1 2) (take-while (slice #'<= _ 2) + (is (equal (list 1 2) (take-while (lambda (x) (<= x 2)) (list 1 2 3))))) (deftest test-drop-while () @@ -78,7 +78,7 @@ (is (eq nil (drop-while (constantly t) (list 1 2 3)))) (is (equal (list 1 2 3) (drop-while (constantly nil) (list 1 2 3)))) - (is (equal (list 3) (drop-while (slice #'<= _ 2) + (is (equal (list 3) (drop-while (lambda (x) (<= x 2)) (list 1 2 3))))) (deftest test-partition () @@ -90,7 +90,7 @@ (list nil (list 1 2 3)))) (is (equal (multiple-value-list (partition #'oddp (list 1 2 3 4 5))) (list (list 1 3 5) (list 2 4)))) - (is (equal (multiple-value-list (partition (slice #'= 3) + (is (equal (multiple-value-list (partition (lambda (x) (= x 3)) (list "foo" "bar" "baz" "quux") :key #'length)) '(("foo" "bar" "baz") ("quux"))))) @@ -146,14 +146,6 @@ (is (equal (acons 0 0 (acons 0 1 (acons 1 0 (acons 1 1 nil)))) (lc (cons i j) (<- i '(0 1)) (<- j '(0 1)))))) -(deftest test-hash-table->alist () - (is (equal (sort (hash-table->alist - (alist->hash-table - (pairlis '("one" "two" "three") - '(1 2 3)))) - #'< :key #'cdr) - (acons "one" 1 (acons "two" 2 (acons "three" 3 nil)))))) - (deftest test-string-join () (is (eq nil (string-join nil nil))) (is (eq nil (string-join nil))) @@ -165,7 +157,7 @@ (defun read-lines (stream) (when (streamp stream) - (unfold (slice #'eq stream _) + (unfold (lambda (x) (eq stream x)) #'identity (lambda (x) (declare (ignore x)) @@ -175,7 +167,7 @@ (deftest test-unfold () (is (eq nil (unfold (constantly t) #'identity #'identity 0))) (is (equal (range 0 .1 (/ pi 2)) - (unfold (slice #'> _ (/ pi 2)) + (unfold (lambda (x) (> x (/ pi 2))) #'identity (lambda (x) (+ x 0.1)) 0))) @@ -184,7 +176,7 @@ 2 3") (is (equal (list "1" "2" "3") - (mapcar (slice #'string-trim " #\Tab" _) + (mapcar (lambda (x) (string-trim " #\Tab" x)) (read-lines stream)))))) (deftest test-doctest () @@ -246,7 +238,7 @@ (signals type-error (group nil :key 0)) (signals type-error (group nil :test 0)) (is (eq nil (group nil :test #'equal))) - (is (equal (group (list "abc" "aardvark" "ant" "buffalo" "zebra") :key (slice #'elt _ 0)) + (is (equal (group (list "abc" "aardvark" "ant" "buffalo" "zebra") :key (lambda (x) (elt x 0))) '(("abc" "aardvark" "ant") ("buffalo") ("zebra")))) (is (equal (concatenate 'string (mapcan #'identity test-suite.lisp @@ -22,7 +22,6 @@ ;;; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ;;; DEALINGS IN THE SOFTWARE. - (defun unfold (predicate transformer incrementor initial-value &optional (tail-gen (constantly nil))) "Returns a list built following the pattern: @@ -33,7 +32,7 @@ 1. List of squares: 1^2, ..., 10^2 - INCF-CL> (unfold (slice #'> _ 10) (slice #'expt _ 2) #'1+ 1) + INCF-CL> (unfold (lambda (x) (> x 10)) (lambda (x) (expt x 2)) #'1+ 1) (1 4 9 16 25 36 49 64 81 100) 2. Append (3 4 5) onto (1 2) unfold.lisp 7ef1e8e1ddad5739603f6ec0761bff4e8a321049 Juan M. Bello Rivas jmbr@superadditive.com http://github.com/jmbr/incf-cl/commit/1d0e8dbfec68566ce7d2ce7865cb166db6d6a6ad 1d0e8dbfec68566ce7d2ce7865cb166db6d6a6ad 2008-05-17T04:45:49-07:00 2008-05-17T04:45:49-07:00 Removed functionality also available in Alexandria. 3cd36722fb0771cf05d966e7d8e34b6bdcababd5 Juan M. Bello Rivas jmbr@superadditive.com