diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-02 14:45:39 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-02 14:45:39 -0700 |
| commit | 31ec2231bb0882d2a10fd141f3d1e03b6c4e47df (patch) | |
| tree | 385c7946f4612b353c4b89b1b428801c5536981d | |
| parent | 27c599b7370b70e2a3fe0ed39754039573b22574 (diff) | |
| download | consfigurator-31ec2231bb0882d2a10fd141f3d1e03b6c4e47df.tar.gz | |
rename COLLAPSE-PROPAPP-TYPES -> COMBINE-PROPAPP-TYPES
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| -rw-r--r-- | src/combinator.lisp | 2 | ||||
| -rw-r--r-- | src/property.lisp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/combinator.lisp b/src/combinator.lisp index 6b9acc4..c1a76a6 100644 --- a/src/combinator.lisp +++ b/src/combinator.lisp @@ -357,7 +357,7 @@ an :UNAPPLY subroutine for a property which works by calling other properties." (apply #'eseqprops (cdr unapply)) (cadr unapply)))) (if unapply - (:retprop :type (collapse-propapp-types apply (cdr unapply)) + (:retprop :type (combine-propapp-types apply (cdr unapply)) :hostattrs (lambda-ignoring-args (propappattrs apply-propapp) ;; as in definition of UNAPPLIED combinator diff --git a/src/property.lisp b/src/property.lisp index 3987764..aca6bbd 100644 --- a/src/property.lisp +++ b/src/property.lisp @@ -71,7 +71,7 @@ (defun collapse-types (&rest lists) (if (member :lisp (flatten lists)) :lisp :posix)) -(defun collapse-propapp-types (&rest lists) +(defun combine-propapp-types (&rest lists) (if (member :lisp (mapcan (curry #'mapcar #'propapptype) lists)) :lisp :posix)) |