mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/emacs-lisp/eieio-base.el (eieio-persistent-read): Simplify.

Browse source
This commit is contained in:
Stefan Kangas 2022-07-31 12:01:01 +02:00
parent ef5abcd4cc
commit ca2d3ed74c
1 changed files with 20 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

46
lisp/emacs-lisp/eieio-base.el
View file

@ -281,32 +281,26 @@ being pedantic."
(unless class
(warn "`eieio-persistent-read' called without specifying a class"))
(when class (cl-check-type class class))
(let ((ret nil)
(buffstr nil))
(unwind-protect
(progn
(with-current-buffer (get-buffer-create " *tmp eieio read*")
(insert-file-contents filename nil nil nil t)
(goto-char (point-min))
(setq buffstr (buffer-string)))
;; Do the read in the buffer the read was initialized from
;; so that any initialize-instance calls that depend on
;; the current buffer will work.
(setq ret (read buffstr))
(when (not (child-of-class-p (car ret) 'eieio-persistent))
(error
"Invalid object: %s is not a subclass of `eieio-persistent'"
(car ret)))
(when (and class
(not (or (eq (car ret) class) ; same class
(and allow-subclass ; subclass
(child-of-class-p (car ret) class)))))
(error
"Invalid object: %s is not an object of class %s nor a subclass"
(car ret) class))
(setq ret (eieio-persistent-make-instance (car ret) (cdr ret)))
(oset ret file filename))
(kill-buffer " *tmp eieio read*"))
(let* ((buffstr (with-temp-buffer
(insert-file-contents filename)
(buffer-string)))
;; Do the read in the buffer the read was initialized from
;; so that any initialize-instance calls that depend on
;; the current buffer will work.
(ret (read buffstr)))
(when (not (child-of-class-p (car ret) 'eieio-persistent))
(error
"Invalid object: %s is not a subclass of `eieio-persistent'"
(car ret)))
(when (and class
(not (or (eq (car ret) class) ; same class
(and allow-subclass ; subclass
(child-of-class-p (car ret) class)))))
(error
"Invalid object: %s is not an object of class %s nor a subclass"
(car ret) class))
(setq ret (eieio-persistent-make-instance (car ret) (cdr ret)))
(oset ret file filename)
ret))
(cl-defgeneric eieio-persistent-make-instance (objclass inputlist)