X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=contrib%2Fsb-simple-streams%2Ffndb.lisp;h=ad29bbcaa0ba9ba92bcd48b31aaca6ae2071a9a9;hb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;hp=2df6088dd800a4c0a77e17b3f746ebd365935e51;hpb=79cc569a97e444389350ea3f5b1017374fe16bec;p=sbcl.git diff --git a/contrib/sb-simple-streams/fndb.lisp b/contrib/sb-simple-streams/fndb.lisp index 2df6088..ad29bbc 100644 --- a/contrib/sb-simple-streams/fndb.lisp +++ b/contrib/sb-simple-streams/fndb.lisp @@ -22,24 +22,24 @@ Here's a (smarter) replacement: (defun result-type-open-class (call) (declare (type sb-c::combination call)) (let* ((not-set '#:not-set) - (not-constant '#:not-constant) - (direction not-set) - (if-exists not-set) - (if-does-not-exist not-set) - (class not-set)) + (not-constant '#:not-constant) + (direction not-set) + (if-exists not-set) + (if-does-not-exist not-set) + (class not-set)) ;; find (the first occurence of) each interesting keyword argument (do ((args (cdr (combination-args call)) (cddr args))) - ((null args)) + ((null args)) (macrolet ((maybe-set (var) - `(when (and (eq ,var not-set) (cadr args)) - (if (constant-continuation-p (cadr args)) - (setq ,var (continuation-value (cadr args))) - (setq ,var not-constant))))) - (case (continuation-value (car args)) - (:direction (maybe-set direction)) - (:if-exists (maybe-set if-exists)) - (:if-does-not-exist (maybe-set if-does-not-exist)) - (:class (maybe-set class))))) + `(when (and (eq ,var not-set) (cadr args)) + (if (constant-continuation-p (cadr args)) + (setq ,var (continuation-value (cadr args))) + (setq ,var not-constant))))) + (case (continuation-value (car args)) + (:direction (maybe-set direction)) + (:if-exists (maybe-set if-exists)) + (:if-does-not-exist (maybe-set if-does-not-exist)) + (:class (maybe-set class))))) ;; and set default values for any that weren't set above (when (eq direction not-set) (setq direction :input)) (when (eq if-exists not-constant) (setq if-exists nil)) @@ -51,11 +51,11 @@ Here's a (smarter) replacement: ;; direction is :output or :io or not-constant and :if-exists is nil ;; :if-does-not-exist is nil (if (or (and (or (eq direction :probe) (eq direction not-constant)) - (not (eq if-does-not-exist :error))) - (and (or (eq direction :output) (eq direction :io) - (eq direction not-constant)) - (eq if-exists nil)) - (eq if-does-not-exist nil)) + (not (eq if-does-not-exist :error))) + (and (or (eq direction :output) (eq direction :io) + (eq direction not-constant)) + (eq if-exists nil)) + (eq if-does-not-exist nil)) (specifier-type `(or null ,class)) (specifier-type class))))