X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/7a3da82906a0439313b1a075c739046836e4a80f..12949379840101e2d65883f29c5e8f0f6de49e9c:/src/pset-impl.lisp?ds=sidebyside diff --git a/src/pset-impl.lisp b/src/pset-impl.lisp index 338306a..42049db 100644 --- a/src/pset-impl.lisp +++ b/src/pset-impl.lisp @@ -74,13 +74,16 @@ (error "Symbol `~A' not external in package `~A'" name (package-name package))))))))) -(let ((truish '("true" "t" "yes" "on" "verily")) - (falsish '("false" "nil" "no" "off" "nowise"))) +(let ((truth-map (make-hash-table :test #'equalp))) + (dolist (string '("true" "t" "yes" "on" "yup" "verily")) + (setf (gethash string truth-map) t)) + (dolist (string '("false" "nil" "no" "off" "nope" "nowise")) + (setf (gethash string truth-map) nil)) (defun truishp (string) "Convert STRING to a boolean." - (cond ((member string truish :test #'string-equal) t) - ((member string falsish :test #'string-equal) nil) - (t (error "Unrecognized boolean value `~A'" string))))) + (multiple-value-bind (val foundp) (gethash string truth-map) + (if foundp val + (error "Unrecognized boolean value `~A'" string))))) ;;;-------------------------------------------------------------------------- ;;; Property representation.