From dbebd8a7fbe36dd91ea887d8b686af3405fc80a9 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 21 Mar 2021 17:36:50 -0700 Subject: APPEND-PROPSPECS: better handle case where one side of union is nil Signed-off-by: Sean Whitton --- src/propspec.lisp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/propspec.lisp') diff --git a/src/propspec.lisp b/src/propspec.lisp index 39b9d48..00e76f2 100644 --- a/src/propspec.lisp +++ b/src/propspec.lisp @@ -231,8 +231,11 @@ systems." ((first unpreprocessed-propspec) (second unpreprocessed-propspec)) (make-propspec :systems (union (propspec-systems first) (propspec-systems second)) - :propspec `(silent-seqprops ,(propspec-props first) - ,(propspec-props second)))) + :propspec (let ((firstp (propspec-props first)) + (secondp (propspec-props second))) + (if (and firstp secondp) + `(silent-seqprops ,firstp ,secondp) + (or firstp secondp))))) (defmethod eval-propspec ((propspec preprocessed-propspec)) (eval (slot-value propspec 'preprocessed-propspec-expression))) -- cgit v1.2.3