keith/objective-lisp
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix bug with :slot access

Browse source
This commit is contained in:
~keith 2022-02-22 15:35:49 +00:00
parent 914d5dfcdc
commit 7d85c12f3a
Signed by: keith
GPG key ID: 5BEBEEAB2C73D520
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
objective-lisp.lisp
View file

@ -14,14 +14,16 @@
(let ((expr root)) (let ((expr root))
(loop for entry on forms (loop for entry on forms
for form = (car entry) for form = (car entry)
do (setf expr and prev-form = nil then form
(cond ((consp form) `(,(car form) ,expr ,@(cdr form))) unless (eq prev-form :slot)
((eq form :slot) (prog1 do (setf expr
`(slot-value ,expr ',(cadr entry)) (cond ((consp form) `(,(car form) ,expr ,@(cdr form)))
(rplacd entry (cddr entry)))) ((eq form :slot) (prog1 `(slot-value ,expr ',(cadr entry))
((symbolp form) `(,form ,expr)) (unless (cadr entry)
(t (error "Unexpected form ~S" form)) (error "Missing slot name"))))
))) ((symbolp form) `(,form ,expr))
(t (error "Unexpected form ~S" form)))))
;(format t "~S => ~S~%" `(O! ,root ,@forms) expr)
expr)) expr))
(defun read-construct (stream char arg) (defun read-construct (stream char arg)