From e9f5fadb0ecb64148472f846a99a0d7e95daeaee Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Thu, 31 Dec 2020 15:32:51 +0100 Subject: [PATCH] * Fix two predicates for missing negation handling * lisp/emacs-lisp/comp-cstr.el (comp-cstr-empty-p) (comp-cstr-null-p): Fix missing negation handling. --- lisp/emacs-lisp/comp-cstr.el | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lisp/emacs-lisp/comp-cstr.el b/lisp/emacs-lisp/comp-cstr.el index c03056e3afe..a53372be006 100644 --- a/lisp/emacs-lisp/comp-cstr.el +++ b/lisp/emacs-lisp/comp-cstr.el @@ -139,14 +139,16 @@ Integer values are handled in the `range' slot.") (with-comp-cstr-accessors (and (null (typeset cstr)) (null (valset cstr)) - (null (range cstr))))) + (null (range cstr)) + (null (neg cstr))))) -(defsubst comp-cstr-null-p (x) +(defsubst comp-cstr-null-p (cstr) "Return t if CSTR is equivalent to the `null' type specifier, nil otherwise." (with-comp-cstr-accessors - (and (null (typeset x)) - (null (range x)) - (equal (valset x) '(nil))))) + (and (null (typeset cstr)) + (null (range cstr)) + (null (neg cstr)) + (equal (valset cstr) '(nil))))) (defun comp-cstrs-homogeneous (cstrs) "Check if constraints CSTRS are all homogeneously negated or non-negated. -- 2.39.5