From f2f487abcb06afb9226ef7337754dbe2323a6c09 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 7 Jun 2021 09:26:51 -0700 Subject: use PUNAPPLY not just UNAPPLY & export symbol plist entry names At least for now let's not prefix all the SETPROP symbol plist entry names with 'p', but at least avoid having to remember which of :APPLY and :UNAPPLY subroutines are in a slot prefixed with a 'p'. Signed-off-by: Sean Whitton --- src/combinator.lisp | 2 +- src/package.lisp | 5 +++++ src/property.lisp | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/combinator.lisp b/src/combinator.lisp index f9e1409..7ba8ad6 100644 --- a/src/combinator.lisp +++ b/src/combinator.lisp @@ -171,7 +171,7 @@ apply the elements of REQUIREMENTS in reverse order." ;; subroutine is only to check compatibility (with-preserve-hostattrs (apply #'propattrs psym args))) - :apply (get psym 'unapply) + :apply (get psym 'punapply) :unapply (get psym 'papply) :args args))) diff --git a/src/package.lisp b/src/package.lisp index cf8d06d..1b2f6f7 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -166,6 +166,11 @@ #:with-change-if-changes-file-content #:with-change-if-changes-file-content-or-mode + #:ptype + #:plambda + #:papply + #:punapply + ;; propspec.lisp #:in-consfig #:propspec-systems diff --git a/src/property.lisp b/src/property.lisp index 6b8dbb1..f5c9680 100644 --- a/src/property.lisp +++ b/src/property.lisp @@ -46,7 +46,7 @@ (when apply (setf (get sym 'papply) apply)) (when unapply - (setf (get sym 'unapply) unapply)) + (setf (get sym 'punapply) unapply)) sym) (defun isprop (prop) @@ -110,7 +110,7 @@ (with-some-errors-are-failed-change (let ((check (get prop 'check)) (apply (get prop 'apply)) - (unapply (get prop 'unapply))) + (unapply (get prop 'punapply))) ;; Only fail if there's no :UNAPPLY when there is an :APPLY, because ;; that is the case in which we can't do what was requested. If there ;; is no :APPLY then we can infer that there is nothing on the host to -- cgit v1.2.3