From d8ed269b483ae8054d9bd26e835b91e594aa9c0d Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 9 Nov 2021 17:21:17 -0700 Subject: COLLAPSE{,-PROPAPP}-TYPES: invert logic These functions are used to determine whether a composite property is :POSIX or :LISP. If any of the composing properties are :LISP, then we need to return :LISP, such that attempting to apply the composite property using a POSIX-type connection produces an error. Signed-off-by: Sean Whitton --- src/property.lisp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/property.lisp b/src/property.lisp index cebc084..885a24d 100644 --- a/src/property.lisp +++ b/src/property.lisp @@ -69,11 +69,11 @@ (cdr propapp))) (defun collapse-types (&rest lists) - (if (member :posix (flatten lists)) :posix :lisp)) + (if (member :lisp (flatten lists)) :lisp :posix)) (defun collapse-propapp-types (&rest lists) - (if (member :posix (mapcan (curry #'mapcar #'propapptype) lists)) - :posix :lisp)) + (if (member :lisp (mapcan (curry #'mapcar #'propapptype) lists)) + :lisp :posix)) (defun propdesc (prop &rest args) (apply (get prop 'desc #'noop) args)) -- cgit v1.2.3