Skip to content

Fix for SLOT-MISSING loses slot name under custom metaclasses #739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blakemcbride wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for SLOT-MISSING loses slot name under custom metaclasses #739

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions src/org/armedbear/lisp/clos.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,8 +756,10 @@
(eq metaclass +the-structure-class+)
(eq metaclass +the-funcallable-standard-class+))
(std-slot-value object slot-name)
(slot-value-using-class class object
(find-slot-definition class slot-name)))))
(let ((slot-def (find-slot-definition class slot-name)))
(if slot-def
(slot-value-using-class class object slot-def)
(values (slot-missing class object slot-name 'slot-value)))))))

(defun %set-slot-value (object slot-name new-value)
(let* ((class (class-of object))
Expand All @@ -766,18 +768,23 @@
(eq metaclass +the-structure-class+)
(eq metaclass +the-funcallable-standard-class+))
(setf (std-slot-value object slot-name) new-value)
(setf (slot-value-using-class class object
(find-slot-definition class slot-name))
new-value))))
(let ((slot-def (find-slot-definition class slot-name)))
(if slot-def
(setf (slot-value-using-class class object slot-def) new-value)
(progn
(slot-missing class object slot-name 'setf new-value)
new-value))))))

(defsetf slot-value %set-slot-value)

(defun slot-boundp (object slot-name)
(let ((class (class-of object)))
(if (std-class-p class)
(std-slot-boundp object slot-name)
(slot-boundp-using-class class object
(find-slot-definition class slot-name)))))
(let ((slot-def (find-slot-definition class slot-name)))
(if slot-def
(slot-boundp-using-class class object slot-def)
(and (slot-missing class object slot-name 'slot-boundp) t))))))

(defun std-slot-makunbound (instance slot-name)
(let ((location (instance-slot-location instance slot-name)))
Expand All @@ -793,8 +800,12 @@
(let ((class (class-of object)))
(if (std-class-p class)
(std-slot-makunbound object slot-name)
(slot-makunbound-using-class class object
(find-slot-definition class slot-name)))))
(let ((slot-def (find-slot-definition class slot-name)))
(if slot-def
(slot-makunbound-using-class class object slot-def)
(progn
(slot-missing class object slot-name 'slot-makunbound)
object))))))

(defun std-slot-exists-p (instance slot-name)
(not (null (find slot-name (class-slots (class-of instance))
Expand Down
Loading