2014-10-17 01:09:24 -04:00
|
|
|
|
;;; eieio-base.el --- Base classes for EIEIO. -*- lexical-binding:t -*-
|
2009-09-28 00:49:54 +00:00
|
|
|
|
|
2022-01-01 02:45:51 -05:00
|
|
|
|
;; Copyright (C) 2000-2022 Free Software Foundation, Inc.
|
2009-09-28 00:49:54 +00:00
|
|
|
|
|
2019-05-26 00:58:28 -07:00
|
|
|
|
;; Author: Eric M. Ludlam <zappo@gnu.org>
|
2009-09-28 00:49:54 +00:00
|
|
|
|
;; Keywords: OO, lisp
|
2010-08-29 12:17:13 -04:00
|
|
|
|
;; Package: eieio
|
2009-09-28 00:49:54 +00:00
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 15:52:52 -07:00
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2009-09-28 00:49:54 +00:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
;;
|
|
|
|
|
;; Base classes for EIEIO. These classes perform some basic tasks
|
|
|
|
|
;; but are generally useless on their own. To use any of these classes,
|
|
|
|
|
;; inherit from one or more of them.
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
(require 'eieio)
|
2017-09-30 10:57:52 -07:00
|
|
|
|
(require 'seq)
|
2014-10-17 01:09:24 -04:00
|
|
|
|
(eval-when-compile (require 'cl-lib))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
|
|
|
|
|
;;; eieio-instance-inheritor
|
|
|
|
|
;;
|
|
|
|
|
;; Enable instance inheritance via the `clone' method.
|
|
|
|
|
;; Works by using the `slot-unbound' method which usually throws an
|
|
|
|
|
;; error if a slot is unbound.
|
|
|
|
|
(defclass eieio-instance-inheritor ()
|
|
|
|
|
((parent-instance :initarg :parent-instance
|
2015-01-08 00:24:24 -05:00
|
|
|
|
:type eieio-instance-inheritor
|
2009-09-28 00:49:54 +00:00
|
|
|
|
:documentation
|
|
|
|
|
"The parent of this instance.
|
2009-10-05 15:32:08 +00:00
|
|
|
|
If a slot of this class is referenced, and is unbound, then the parent
|
2009-09-28 00:49:54 +00:00
|
|
|
|
is checked for a value.")
|
|
|
|
|
)
|
|
|
|
|
"This special class can enable instance inheritance.
|
|
|
|
|
Use `clone' to make a new object that does instance inheritance from
|
|
|
|
|
a parent instance. When a slot in the child is referenced, and has
|
|
|
|
|
not been set, use values from the parent."
|
|
|
|
|
:abstract t)
|
|
|
|
|
|
2015-01-21 14:39:06 -05:00
|
|
|
|
(cl-defmethod slot-unbound ((object eieio-instance-inheritor)
|
2014-10-17 01:09:24 -04:00
|
|
|
|
_class slot-name _fn)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"If a slot OBJECT in this CLASS is unbound, try to inherit, or throw a signal.
|
2011-11-14 12:23:26 -08:00
|
|
|
|
SLOT-NAME is the offending slot. FN is the function signaling the error."
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(if (slot-boundp object 'parent-instance)
|
|
|
|
|
;; It may not look like it, but this line recurses back into this
|
|
|
|
|
;; method if the parent instance's slot is unbound.
|
|
|
|
|
(eieio-oref (oref object parent-instance) slot-name)
|
|
|
|
|
;; Throw the regular signal.
|
2015-01-21 14:39:06 -05:00
|
|
|
|
(cl-call-next-method)))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
|
2019-05-08 11:12:29 +02:00
|
|
|
|
(cl-defmethod clone ((obj eieio-instance-inheritor) &rest params)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"Clone OBJ, initializing `:parent' to OBJ.
|
|
|
|
|
All slots are unbound, except those initialized with PARAMS."
|
2019-05-08 11:12:29 +02:00
|
|
|
|
;; call next method without params as we makeunbound slots anyhow
|
|
|
|
|
(let ((nobj (if (stringp (car params))
|
|
|
|
|
(cl-call-next-method obj (pop params))
|
|
|
|
|
(cl-call-next-method obj))))
|
2019-06-16 16:48:34 +02:00
|
|
|
|
(dolist (descriptor (eieio-class-slots (eieio-object-class nobj)))
|
2019-05-08 11:12:29 +02:00
|
|
|
|
(let ((slot (eieio-slot-descriptor-name descriptor)))
|
|
|
|
|
(slot-makeunbound nobj slot)))
|
|
|
|
|
(when params
|
|
|
|
|
(shared-initialize nobj params))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(oset nobj parent-instance obj)
|
|
|
|
|
nobj))
|
|
|
|
|
|
2015-01-21 14:39:06 -05:00
|
|
|
|
(cl-defmethod eieio-instance-inheritor-slot-boundp ((object eieio-instance-inheritor)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
slot)
|
2009-10-05 15:32:08 +00:00
|
|
|
|
"Return non-nil if the instance inheritor OBJECT's SLOT is bound.
|
|
|
|
|
See `slot-boundp' for details on binding slots.
|
|
|
|
|
The instance inheritor uses unbound slots as a way of cascading cloned
|
2009-09-28 00:49:54 +00:00
|
|
|
|
slot values, so testing for a slot being bound requires extra steps
|
|
|
|
|
for this kind of object."
|
|
|
|
|
(if (slot-boundp object slot)
|
|
|
|
|
;; If it is regularly bound, return t.
|
|
|
|
|
t
|
|
|
|
|
(if (slot-boundp object 'parent-instance)
|
|
|
|
|
(eieio-instance-inheritor-slot-boundp (oref object parent-instance)
|
|
|
|
|
slot)
|
|
|
|
|
nil)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; eieio-instance-tracker
|
|
|
|
|
;;
|
|
|
|
|
;; Track all created instances of this class.
|
|
|
|
|
;; The class must initialize the `tracking-symbol' slot, and that
|
|
|
|
|
;; symbol is then used to contain these objects.
|
|
|
|
|
(defclass eieio-instance-tracker ()
|
|
|
|
|
((tracking-symbol :type symbol
|
|
|
|
|
:allocation :class
|
|
|
|
|
:documentation
|
|
|
|
|
"The symbol used to maintain a list of our instances.
|
|
|
|
|
The instance list is treated as a variable, with new instances added to it.")
|
|
|
|
|
)
|
|
|
|
|
"This special class enables instance tracking.
|
|
|
|
|
Inheritors from this class must overload `tracking-symbol' which is
|
|
|
|
|
a variable symbol used to store a list of all instances."
|
|
|
|
|
:abstract t)
|
|
|
|
|
|
2015-01-21 14:39:06 -05:00
|
|
|
|
(cl-defmethod initialize-instance :after ((this eieio-instance-tracker)
|
2014-10-17 01:09:24 -04:00
|
|
|
|
&rest _slots)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"Make sure THIS is in our master list of this class.
|
|
|
|
|
Optional argument SLOTS are the initialization arguments."
|
|
|
|
|
;; Theoretically, this is never called twice for a given instance.
|
|
|
|
|
(let ((sym (oref this tracking-symbol)))
|
|
|
|
|
(if (not (memq this (symbol-value sym)))
|
|
|
|
|
(set sym (append (symbol-value sym) (list this))))))
|
|
|
|
|
|
2015-01-21 14:39:06 -05:00
|
|
|
|
(cl-defmethod delete-instance ((this eieio-instance-tracker))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"Remove THIS from the master list of this class."
|
|
|
|
|
(set (oref this tracking-symbol)
|
|
|
|
|
(delq this (symbol-value (oref this tracking-symbol)))))
|
|
|
|
|
|
|
|
|
|
;; In retrospect, this is a silly function.
|
|
|
|
|
(defun eieio-instance-tracker-find (key slot list-symbol)
|
|
|
|
|
"Find KEY as an element of SLOT in the objects in LIST-SYMBOL.
|
|
|
|
|
Returns the first match."
|
|
|
|
|
(object-assoc key slot (symbol-value list-symbol)))
|
|
|
|
|
|
|
|
|
|
;;; eieio-singleton
|
|
|
|
|
;;
|
|
|
|
|
;; The singleton Design Pattern specifies that there is but one object
|
|
|
|
|
;; of a given class ever created. The EIEIO singleton base class defines
|
|
|
|
|
;; a CLASS allocated slot which contains the instance used. All calls to
|
|
|
|
|
;; `make-instance' will either create a new instance and store it in this
|
|
|
|
|
;; slot, or it will just return what is there.
|
|
|
|
|
(defclass eieio-singleton ()
|
|
|
|
|
((singleton :type eieio-singleton
|
|
|
|
|
:allocation :class
|
|
|
|
|
:documentation
|
|
|
|
|
"The only instance of this class that will be instantiated.
|
|
|
|
|
Multiple calls to `make-instance' will return this object."))
|
|
|
|
|
"This special class causes subclasses to be singletons.
|
2010-01-14 19:59:31 +01:00
|
|
|
|
A singleton is a class which will only ever have one instance."
|
2009-09-28 00:49:54 +00:00
|
|
|
|
:abstract t)
|
|
|
|
|
|
2015-02-16 02:22:46 -05:00
|
|
|
|
(cl-defmethod make-instance ((class (subclass eieio-singleton)) &rest _slots)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"Constructor for singleton CLASS.
|
|
|
|
|
NAME and SLOTS initialize the new object.
|
|
|
|
|
This constructor guarantees that no matter how many you request,
|
|
|
|
|
only one object ever exists."
|
|
|
|
|
;; NOTE TO SELF: In next version, make `slot-boundp' support classes
|
|
|
|
|
;; with class allocated slots or default values.
|
|
|
|
|
(let ((old (oref-default class singleton)))
|
2021-06-12 16:22:03 -04:00
|
|
|
|
(if (eq old eieio--unbound)
|
2015-01-21 14:39:06 -05:00
|
|
|
|
(oset-default class singleton (cl-call-next-method))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
old)))
|
|
|
|
|
|
|
|
|
|
|
2021-01-11 16:44:39 -05:00
|
|
|
|
;;; Named object
|
|
|
|
|
|
|
|
|
|
(defclass eieio-named ()
|
|
|
|
|
((object-name :initarg :object-name :initform nil))
|
|
|
|
|
"Object with a name."
|
|
|
|
|
:abstract t)
|
|
|
|
|
|
|
|
|
|
(cl-defmethod eieio-object-name-string ((obj eieio-named))
|
|
|
|
|
"Return a string which is OBJ's name."
|
|
|
|
|
(or (slot-value obj 'object-name)
|
|
|
|
|
(cl-call-next-method)))
|
|
|
|
|
|
|
|
|
|
(cl-defgeneric eieio-object-set-name-string (obj name)
|
|
|
|
|
"Set the string which is OBJ's NAME."
|
|
|
|
|
(declare (obsolete "inherit from `eieio-named' and use (setf (slot-value OBJ \\='object-name) NAME) instead" "25.1"))
|
|
|
|
|
(cl-check-type name string)
|
|
|
|
|
(setf (gethash obj eieio--object-names) name))
|
|
|
|
|
(define-obsolete-function-alias
|
|
|
|
|
'object-set-name-string 'eieio-object-set-name-string "24.4")
|
|
|
|
|
|
|
|
|
|
(with-suppressed-warnings ((obsolete eieio-object-set-name-string))
|
|
|
|
|
(cl-defmethod eieio-object-set-name-string ((obj eieio-named) name)
|
|
|
|
|
"Set the string which is OBJ's NAME."
|
|
|
|
|
(cl-check-type name string)
|
|
|
|
|
(eieio-oset obj 'object-name name)))
|
|
|
|
|
|
|
|
|
|
(cl-defmethod clone ((obj eieio-named) &rest params)
|
|
|
|
|
"Clone OBJ, initializing `:parent' to OBJ.
|
|
|
|
|
All slots are unbound, except those initialized with PARAMS."
|
|
|
|
|
(let* ((newname (and (stringp (car params)) (pop params)))
|
|
|
|
|
(nobj (apply #'cl-call-next-method obj params))
|
|
|
|
|
(nm (slot-value nobj 'object-name)))
|
|
|
|
|
(eieio-oset nobj 'object-name
|
|
|
|
|
(or newname
|
|
|
|
|
(if (equal nm (slot-value obj 'object-name))
|
|
|
|
|
(save-match-data
|
|
|
|
|
(if (and nm (string-match "-\\([0-9]+\\)" nm))
|
|
|
|
|
(let ((num (1+ (string-to-number
|
|
|
|
|
(match-string 1 nm)))))
|
|
|
|
|
(concat (substring nm 0 (match-beginning 0))
|
|
|
|
|
"-" (int-to-string num)))
|
|
|
|
|
(concat nm "-1")))
|
|
|
|
|
nm)))
|
|
|
|
|
nobj))
|
|
|
|
|
|
|
|
|
|
(cl-defmethod make-instance ((class (subclass eieio-named)) &rest args)
|
|
|
|
|
(if (not (stringp (car args)))
|
|
|
|
|
(cl-call-next-method)
|
|
|
|
|
(funcall (if eieio-backward-compatibility #'ignore #'message)
|
|
|
|
|
"Obsolete: name passed without :object-name to %S constructor"
|
|
|
|
|
class)
|
|
|
|
|
(apply #'cl-call-next-method class :object-name args)))
|
|
|
|
|
|
2009-09-28 00:49:54 +00:00
|
|
|
|
;;; eieio-persistent
|
|
|
|
|
;;
|
|
|
|
|
;; For objects which must save themselves to disk. Provides an
|
|
|
|
|
;; `object-write' method to save an object to disk, and a
|
|
|
|
|
;; `eieio-persistent-read' function to call to read an object
|
|
|
|
|
;; from disk.
|
|
|
|
|
;;
|
|
|
|
|
;; Also provide the method `eieio-persistent-path-relative' to
|
|
|
|
|
;; calculate path names relative to a given instance. This will
|
|
|
|
|
;; make the saved object location independent by converting all file
|
|
|
|
|
;; references to be relative to the directory the object is saved to.
|
2011-11-19 18:29:42 -08:00
|
|
|
|
;; You must call `eieio-persistent-path-relative' on each file name
|
2009-09-28 00:49:54 +00:00
|
|
|
|
;; saved in your object.
|
|
|
|
|
(defclass eieio-persistent ()
|
|
|
|
|
((file :initarg :file
|
|
|
|
|
:type string
|
|
|
|
|
:documentation
|
|
|
|
|
"The save file for this persistent object.
|
|
|
|
|
This must be a string, and must be specified when the new object is
|
|
|
|
|
instantiated.")
|
|
|
|
|
(extension :type string
|
|
|
|
|
:allocation :class
|
|
|
|
|
:initform ".eieio"
|
|
|
|
|
:documentation
|
|
|
|
|
"Extension of files saved by this object.
|
|
|
|
|
Enables auto-choosing nice file names based on name.")
|
|
|
|
|
(file-header-line :type string
|
|
|
|
|
:allocation :class
|
|
|
|
|
:initform ";; EIEIO PERSISTENT OBJECT"
|
|
|
|
|
:documentation
|
|
|
|
|
"Header line for the save file.
|
|
|
|
|
This is used with the `object-write' method.")
|
|
|
|
|
(do-backups :type boolean
|
|
|
|
|
:allocation :class
|
|
|
|
|
:initform t
|
|
|
|
|
:documentation
|
|
|
|
|
"Saving this object should make backup files.
|
|
|
|
|
Setting to nil will mean no backups are made."))
|
2021-09-18 13:12:41 +02:00
|
|
|
|
"This special class enables persistence through save files.
|
2020-09-23 13:35:55 +02:00
|
|
|
|
Use the `object-write' method to write this object to disk. The save
|
2009-09-28 00:49:54 +00:00
|
|
|
|
format is Emacs Lisp code which calls the constructor for the saved
|
|
|
|
|
object. For this reason, only slots which do not have an `:initarg'
|
|
|
|
|
specified will not be saved."
|
|
|
|
|
:abstract t)
|
|
|
|
|
|
2015-01-21 14:39:06 -05:00
|
|
|
|
(cl-defmethod eieio-persistent-save-interactive ((this eieio-persistent) prompt
|
2009-09-28 00:49:54 +00:00
|
|
|
|
&optional name)
|
2009-10-05 15:32:08 +00:00
|
|
|
|
"Prepare to save THIS. Use in an `interactive' statement.
|
2009-09-28 00:49:54 +00:00
|
|
|
|
Query user for file name with PROMPT if THIS does not yet specify
|
|
|
|
|
a file. Optional argument NAME specifies a default file name."
|
|
|
|
|
(unless (slot-boundp this 'file)
|
|
|
|
|
(oset this file
|
|
|
|
|
(read-file-name prompt nil
|
|
|
|
|
(if name
|
|
|
|
|
(concat name (oref this extension))
|
|
|
|
|
))))
|
|
|
|
|
(oref this file))
|
|
|
|
|
|
2012-10-02 02:10:29 +08:00
|
|
|
|
(defun eieio-persistent-read (filename &optional class allow-subclass)
|
|
|
|
|
"Read a persistent object from FILENAME, and return it.
|
|
|
|
|
Signal an error if the object in FILENAME is not a constructor
|
|
|
|
|
for CLASS. Optional ALLOW-SUBCLASS says that it is ok for
|
2012-10-04 22:57:24 -07:00
|
|
|
|
`eieio-persistent-read' to load in subclasses of class instead of
|
|
|
|
|
being pedantic."
|
2012-10-02 02:10:29 +08:00
|
|
|
|
(unless class
|
2018-03-10 16:26:38 +08:00
|
|
|
|
(warn "`eieio-persistent-read' called without specifying a class"))
|
EIEIO: Simplify help hyperlinks; Try and reduce hardcoding in .elc
* lisp/emacs-lisp/cl-generic.el (cl--generic-search-method): Fix regexp.
* lisp/emacs-lisp/eieio-core.el (eieio--check-type): Remove.
Use cl-check-type everywhere instead.
(eieio-class-object): Remove, use find-class instead when needed.
(class-p): Don't inline.
(eieio-object-p): Check more thoroughly, so we don't treat cl-structs,
such as eieio classes, as objects. Don't inline.
(object-p): Mark as obsolete.
(eieio-defclass-autoload, eieio-defclass-internal, eieio-oref)
(eieio--generic-tagcode): Avoid `class-p'.
(eieio-make-class-predicate, eieio-make-child-predicate): New functions.
(eieio-defclass-internal): Use current-load-list rather than
`class-location'.
* lisp/emacs-lisp/eieio-opt.el (eieio-help-class, eieio-help-constructor):
Use find-lisp-object-file-name, help-fns-short-filename and new calling
convention for eieio-class-def.
(eieio-build-class-list): Remove function, unused.
(eieio-method-def): Remove button type, unused.
(eieio-class-def): Inherit from help-function-def.
(eieio--defclass-regexp): New constant.
(find-function-regexp-alist): Use it.
(eieio--specializers-apply-to-class-p): Handle eieio--static as well.
(eieio-help-find-method-definition, eieio-help-find-class-definition):
Remove functions.
* lisp/emacs-lisp/eieio.el (defclass): Use new eieio-make-class-predicate
and eieio-make-child-predicate.
(eieio-class-parents): Use eieio--class-object.
(slot-boundp, find-class, eieio-override-prin1): Avoid class-p.
(slot-exists-p): Use find-class.
* test/automated/eieio-tests.el (eieio-test-23-inheritance-check): Simplify.
2015-01-31 00:48:14 -05:00
|
|
|
|
(when class (cl-check-type class class))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(let ((ret nil)
|
|
|
|
|
(buffstr nil))
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn
|
* textmodes/two-column.el (2C-split):
* textmodes/texnfo-upd.el (texinfo-multi-file-included-list):
* textmodes/tex-mode.el (tex-set-buffer-directory):
* textmodes/spell.el (spell-region, spell-string):
* textmodes/reftex.el (reftex-erase-buffer):
(reftex-get-file-buffer-force, reftex-kill-temporary-buffers):
* textmodes/reftex-toc.el (reftex-toc-promote-action):
* textmodes/reftex-sel.el (reftex-get-offset, reftex-insert-docstruct)
(reftex-select-item):
* textmodes/reftex-ref.el (reftex-label-info-update)
(reftex-offer-label-menu):
* textmodes/reftex-index.el (reftex-index-change-entry)
(reftex-index-phrases-info):
* textmodes/reftex-global.el (reftex-create-tags-file)
(reftex-save-all-document-buffers, reftex-ensure-write-access):
* textmodes/reftex-dcr.el (reftex-echo-ref, reftex-echo-cite)
(reftex-view-crossref-from-bibtex):
* textmodes/reftex-cite.el (reftex-bibtex-selection-callback)
(reftex-extract-bib-entries-from-thebibliography)
(reftex-all-used-citation-keys, reftex-create-bibtex-file):
* textmodes/refbib.el (r2b-capitalize-title):
(r2b-convert-buffer, r2b-help):
* textmodes/page-ext.el (pages-directory)
(pages-directory-goto-with-mouse):
* textmodes/bibtex.el (bibtex-validate-globally):
* textmodes/bib-mode.el (bib-capitalize-title):
* textmodes/artist.el (artist-clear-buffer, artist-system):
* progmodes/xscheme.el (global-set-scheme-interaction-buffer):
(local-set-scheme-interaction-buffer, xscheme-process-filter)
(verify-xscheme-buffer, xscheme-enter-interaction-mode)
(xscheme-enter-debugger-mode, xscheme-debugger-mode-p)
(xscheme-send-control-g-interrupt, xscheme-start-process)
(xscheme-process-sentinel, xscheme-cd):
* progmodes/verilog-mode.el (verilog-read-always-signals)
(verilog-set-define, verilog-getopt-file)
(verilog-module-inside-filename-p):
* progmodes/sh-script.el:
* progmodes/python.el (python-pdbtrack-get-source-buffer)
(python-pdbtrack-grub-for-buffer, python-execute-file):
* progmodes/octave-inf.el (inferior-octave):
* progmodes/idlwave.el (idlwave-scan-user-lib-files)
(idlwave-shell-compile-helper-routines, idlwave-set-local)
(idlwave-display-completion-list-xemacs, idlwave-list-abbrevs)
(idlwave-display-completion-list-emacs, idlwave-list-load-path-shadows)
(idlwave-completion-fontify-classes, idlwave-display-calling-sequence):
* progmodes/idlw-shell.el (idlwave-shell-examine-display-clear)
(idlwave-shell-filter, idlwave-shell-examine-highlight)
(idlwave-shell-sentinel, idlwave-shell-filter-directory)
(idlwave-shell-display-line, idlwave-shell-set-bp-in-module)
(idlwave-shell-examine-display, idlwave-shell-run-region)
(idlwave-shell-filter-bp, idlwave-shell-save-and-action)
(idlwave-shell-sources-filter, idlwave-shell-goto-next-error):
* progmodes/idlw-help.el (idlwave-help-get-special-help)
(idlwave-help-get-help-buffer):
* progmodes/gud.el (gud-basic-call, gud-find-class)
(gud-tooltip-activate-mouse-motions-if-enabled):
* progmodes/gdb-mi.el (gdb-mouse-toggle-breakpoint-fringe):
* progmodes/ebrowse.el (ebrowse-member-table, ebrowse-save-tree-as)
(ebrowse-view-exit-fn, ebrowse-tags-list-members-in-file)
(ebrowse-tags-next-file):
* progmodes/ebnf2ps.el (ebnf-generate-eps, ebnf-generate-eps)
(ebnf-eps-production-list, ebnf-begin-file, ebnf-log)
(ebnf-eps-finish-and-write):
* progmodes/cpp.el (cpp-edit-save):
* progmodes/cperl-mode.el (cperl-pod-to-manpage):
* progmodes/cc-defs.el (c-emacs-features):
* progmodes/antlr-mode.el (antlr-invalidate-context-cache)
(antlr-directory-dependencies):
* progmodes/ada-xref.el (ada-gnat-parse-gpr, ada-get-ali-file-name)
(ada-run-application, ada-find-in-src-path, ada-goto-parent)
(ada-find-any-references, ada-make-filename-from-adaname)
(ada-make-body-gnatstub):
* obsolete/rnews.el (news-list-news-groups):
* obsolete/resume.el (resume-suspend-hook,resume-write-buffer-to-file):
* obsolete/iso-acc.el (iso-acc-minibuf-setup):
* net/rcirc.el (rcirc-debug):
* net/newst-treeview.el (newsticker--treeview-list-add-item)
(newsticker--treeview-list-clear, newsticker-treeview-browse-url)
(newsticker--treeview-list-update-faces, newsticker-treeview-save)
(newsticker--treeview-item-show-text, newsticker--treeview-item-show)
(newsticker--treeview-tree-update-tag,newsticker--treeview-buffer-init)
(newsticker-treeview-show-item, newsticker--treeview-unfold-node)
(newsticker--treeview-list-clear-highlight)
(newsticker--treeview-list-update-highlight)
(newsticker--treeview-list-highlight-start)
(newsticker--treeview-tree-update-highlight)
(newsticker--treeview-get-selected-item)
(newsticker-treeview-mark-list-items-old)
(newsticker--treeview-set-current-node):
* net/newst-plainview.el (newsticker--buffer-set-uptodate):
* net/newst-backend.el (newsticker--get-news-by-funcall)
(newsticker--get-news-by-wget, newsticker--image-get)
(newsticker--image-sentinel):
* net/mairix.el (mairix-rmail-fetch-field, mairix-gnus-fetch-field):
* net/eudcb-ph.el (eudc-ph-do-request, eudc-ph-open-session):
(eudc-ph-close-session):
* net/eudc.el (eudc-save-options):
* language/thai-word.el (thai-update-word-table):
* language/japan-util.el (japanese-string-conversion):
* international/titdic-cnv.el (tsang-quick-converter)
(ziranma-converter, ctlau-converter):
* international/mule-cmds.el (describe-language-environment):
* international/ja-dic-cnv.el (skkdic-convert-okuri-ari)
(skkdic-convert-postfix, skkdic-convert-prefix):
(skkdic-convert-okuri-nasi, skkdic-convert):
* emacs-lisp/re-builder.el (reb-update-overlays):
* emacs-lisp/pp.el (pp-to-string, pp-display-expression):
* emacs-lisp/gulp.el (gulp-send-requests):
* emacs-lisp/find-gc.el (trace-call-tree):
* emacs-lisp/eieio-opt.el (eieio-browse, eieio-describe-class)
(eieio-describe-generic):
* emacs-lisp/eieio-base.el (eieio-persistent-read):
* emacs-lisp/edebug.el (edebug-outside-excursion):
* emacs-lisp/debug.el (debugger-make-xrefs):
* emacs-lisp/cust-print.el (custom-prin1-to-string):
* emacs-lisp/chart.el (chart-new-buffer):
* emacs-lisp/authors.el (authors-scan-el, authors-scan-change-log):
Use with-current-buffer.
* textmodes/artist.el (artist-system): Don't call
copy-sequence on a fresh string.
* progmodes/idlw-shell.el (easymenu setup): Use dolist.
2009-10-31 02:38:34 +00:00
|
|
|
|
(with-current-buffer (get-buffer-create " *tmp eieio read*")
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(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))
|
2012-10-02 02:10:29 +08:00
|
|
|
|
(when (not (child-of-class-p (car ret) 'eieio-persistent))
|
2018-03-10 16:26:38 +08:00
|
|
|
|
(error
|
|
|
|
|
"Invalid object: %s is not a subclass of `eieio-persistent'"
|
|
|
|
|
(car ret)))
|
2012-10-02 02:10:29 +08:00
|
|
|
|
(when (and class
|
2018-03-10 16:26:38 +08:00
|
|
|
|
(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))
|
2020-08-27 17:58:03 -07:00
|
|
|
|
(setq ret (eieio-persistent-make-instance (car ret) (cdr ret)))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(oset ret file filename))
|
|
|
|
|
(kill-buffer " *tmp eieio read*"))
|
|
|
|
|
ret))
|
|
|
|
|
|
2020-08-27 17:58:03 -07:00
|
|
|
|
(cl-defgeneric eieio-persistent-make-instance (objclass inputlist)
|
|
|
|
|
"Convert INPUTLIST, representing slot values, to an instance of OBJCLASS.
|
|
|
|
|
Clean slot values, and possibly recursively create additional
|
|
|
|
|
objects found there."
|
|
|
|
|
(:method
|
|
|
|
|
((objclass (subclass eieio-default-superclass)) inputlist)
|
|
|
|
|
|
2021-01-10 10:54:49 -05:00
|
|
|
|
(let* ((name nil)
|
|
|
|
|
(slots (if (stringp (car inputlist))
|
|
|
|
|
(progn
|
|
|
|
|
;; Earlier versions of `object-write' added a
|
|
|
|
|
;; string name for the object, now obsolete.
|
|
|
|
|
;; Save as 'name' in case this object is subclass
|
|
|
|
|
;; of eieio-named with no :object-name slot specified.
|
|
|
|
|
(setq name (car inputlist))
|
|
|
|
|
(cdr inputlist))
|
|
|
|
|
inputlist))
|
|
|
|
|
(createslots nil))
|
2020-08-27 17:58:03 -07:00
|
|
|
|
;; If OBJCLASS is an eieio autoload object, then we need to
|
|
|
|
|
;; load it (we don't need the return value).
|
|
|
|
|
(eieio--full-class-object objclass)
|
|
|
|
|
(while slots
|
|
|
|
|
(let ((initarg (car slots))
|
|
|
|
|
(value (car (cdr slots))))
|
|
|
|
|
|
|
|
|
|
;; Strip out quotes, list functions, and update object
|
|
|
|
|
;; constructors as needed.
|
|
|
|
|
(setq value (eieio-persistent-fix-value value))
|
|
|
|
|
|
|
|
|
|
(push initarg createslots)
|
|
|
|
|
(push value createslots))
|
|
|
|
|
|
|
|
|
|
(setq slots (cdr (cdr slots))))
|
|
|
|
|
|
2021-01-10 10:54:49 -05:00
|
|
|
|
(let ((newobj (apply #'make-instance objclass (nreverse createslots))))
|
|
|
|
|
|
|
|
|
|
;; Check for special case of subclass of `eieio-named', and do
|
|
|
|
|
;; name assignment.
|
|
|
|
|
(when (and eieio-backward-compatibility
|
2021-01-11 16:44:39 -05:00
|
|
|
|
(object-of-class-p newobj 'eieio-named)
|
2021-01-10 10:54:49 -05:00
|
|
|
|
(not (oref newobj object-name))
|
|
|
|
|
name)
|
|
|
|
|
(oset newobj object-name name))
|
|
|
|
|
|
|
|
|
|
newobj))))
|
2012-10-02 02:10:29 +08:00
|
|
|
|
|
2020-08-27 17:17:19 -07:00
|
|
|
|
(defun eieio-persistent-fix-value (proposed-value)
|
|
|
|
|
"Fix PROPOSED-VALUE.
|
|
|
|
|
Remove leading quotes from lists, and the symbol `list' from the
|
|
|
|
|
head of lists. Explicitly construct any objects found, and strip
|
|
|
|
|
any text properties from string values.
|
2012-10-02 02:10:29 +08:00
|
|
|
|
|
2020-08-27 17:17:19 -07:00
|
|
|
|
This function will descend into the contents of lists, hash
|
|
|
|
|
tables, and vectors."
|
2012-10-02 02:10:29 +08:00
|
|
|
|
(cond ((consp proposed-value)
|
|
|
|
|
;; Lists with something in them need special treatment.
|
2020-08-27 17:17:19 -07:00
|
|
|
|
(cond ((eq (car proposed-value) 'quote)
|
|
|
|
|
(while (eq (car-safe proposed-value) 'quote)
|
|
|
|
|
(setq proposed-value (car (cdr proposed-value))))
|
|
|
|
|
proposed-value)
|
|
|
|
|
|
|
|
|
|
;; An empty list sometimes shows up as (list), which is dumb, but
|
|
|
|
|
;; we need to support it for backward compar.
|
|
|
|
|
((and (eq (car proposed-value) 'list)
|
|
|
|
|
(= (length proposed-value) 1))
|
|
|
|
|
nil)
|
|
|
|
|
|
|
|
|
|
;; List of object constructors.
|
|
|
|
|
((and (eq (car proposed-value) 'list)
|
|
|
|
|
;; 2nd item is a list.
|
|
|
|
|
(consp (car (cdr proposed-value)))
|
|
|
|
|
;; 1st elt of 2nd item is a class name.
|
|
|
|
|
(class-p (car (car (cdr proposed-value)))))
|
|
|
|
|
|
|
|
|
|
;; We have a list of objects here. Lets load them
|
|
|
|
|
;; in.
|
|
|
|
|
(let ((objlist nil))
|
|
|
|
|
(dolist (subobj (cdr proposed-value))
|
2020-08-27 17:58:03 -07:00
|
|
|
|
(push (eieio-persistent-make-instance
|
|
|
|
|
(car subobj) (cdr subobj))
|
2020-08-27 17:17:19 -07:00
|
|
|
|
objlist))
|
|
|
|
|
;; return the list of objects ... reversed.
|
|
|
|
|
(nreverse objlist)))
|
|
|
|
|
;; We have a slot with a single object that can be
|
|
|
|
|
;; saved here. Recurse and evaluate that
|
|
|
|
|
;; sub-object.
|
|
|
|
|
((class-p (car proposed-value))
|
2020-08-27 17:58:03 -07:00
|
|
|
|
(eieio-persistent-make-instance
|
|
|
|
|
(car proposed-value) (cdr proposed-value)))
|
2020-08-27 17:17:19 -07:00
|
|
|
|
(t
|
|
|
|
|
proposed-value)))
|
2017-12-05 14:41:50 -08:00
|
|
|
|
;; For hash-tables and vectors, the top-level `read' will not
|
|
|
|
|
;; "look inside" member values, so we need to do that
|
2018-04-08 16:49:20 -07:00
|
|
|
|
;; explicitly. Because `eieio-override-prin1' is recursive in
|
|
|
|
|
;; the case of hash-tables and vectors, we recurse
|
|
|
|
|
;; `eieio-persistent-validate/fix-slot-value' here as well.
|
2017-12-05 14:41:50 -08:00
|
|
|
|
((hash-table-p proposed-value)
|
|
|
|
|
(maphash
|
|
|
|
|
(lambda (key value)
|
2018-04-08 16:49:20 -07:00
|
|
|
|
(setf (gethash key proposed-value)
|
|
|
|
|
(if (class-p (car-safe value))
|
2020-08-27 17:58:03 -07:00
|
|
|
|
(eieio-persistent-make-instance
|
|
|
|
|
(car value) (cdr value))
|
2020-08-27 17:17:19 -07:00
|
|
|
|
(eieio-persistent-fix-value value))))
|
2017-12-05 14:41:50 -08:00
|
|
|
|
proposed-value)
|
|
|
|
|
proposed-value)
|
|
|
|
|
|
|
|
|
|
((vectorp proposed-value)
|
|
|
|
|
(dotimes (i (length proposed-value))
|
2017-12-28 18:14:47 -08:00
|
|
|
|
(let ((val (aref proposed-value i)))
|
2018-04-08 16:49:20 -07:00
|
|
|
|
(aset proposed-value i
|
|
|
|
|
(if (class-p (car-safe val))
|
2020-08-27 17:58:03 -07:00
|
|
|
|
(eieio-persistent-make-instance
|
|
|
|
|
(car val) (cdr val))
|
2020-08-27 17:17:19 -07:00
|
|
|
|
(eieio-persistent-fix-value val)))))
|
2017-12-05 14:41:50 -08:00
|
|
|
|
proposed-value)
|
2012-10-02 02:10:29 +08:00
|
|
|
|
|
2020-08-27 17:17:19 -07:00
|
|
|
|
((stringp proposed-value)
|
|
|
|
|
;; Else, check for strings, remove properties.
|
|
|
|
|
(substring-no-properties proposed-value))
|
2012-10-02 02:10:29 +08:00
|
|
|
|
|
|
|
|
|
(t
|
2020-08-27 17:17:19 -07:00
|
|
|
|
;; Else, just return whatever the constant was.
|
|
|
|
|
proposed-value)))
|
2012-10-02 02:10:29 +08:00
|
|
|
|
|
2015-01-21 14:39:06 -05:00
|
|
|
|
(cl-defmethod object-write ((this eieio-persistent) &optional comment)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"Write persistent object THIS out to the current stream.
|
|
|
|
|
Optional argument COMMENT is a header line comment."
|
2015-01-21 14:39:06 -05:00
|
|
|
|
(cl-call-next-method this (or comment (oref this file-header-line))))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
|
2015-01-21 14:39:06 -05:00
|
|
|
|
(cl-defmethod eieio-persistent-path-relative ((this eieio-persistent) file)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"For object THIS, make absolute file name FILE relative."
|
|
|
|
|
(file-relative-name (expand-file-name file)
|
|
|
|
|
(file-name-directory (oref this file))))
|
|
|
|
|
|
2015-01-21 14:39:06 -05:00
|
|
|
|
(cl-defmethod eieio-persistent-save ((this eieio-persistent) &optional file)
|
2009-09-28 00:49:54 +00:00
|
|
|
|
"Save persistent object THIS to disk.
|
|
|
|
|
Optional argument FILE overrides the file name specified in the object
|
|
|
|
|
instance."
|
2015-07-06 11:55:37 -04:00
|
|
|
|
(when file (setq file (expand-file-name file)))
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(let* ((cfn (or file (oref this file)))
|
|
|
|
|
(default-directory (file-name-directory cfn)))
|
|
|
|
|
(cl-letf ((standard-output (current-buffer))
|
2020-05-08 03:49:24 +02:00
|
|
|
|
((oref this file) ;FIXME: Why change it?
|
2015-07-06 11:55:37 -04:00
|
|
|
|
(if file
|
|
|
|
|
;; FIXME: Makes a name relative to (oref this file),
|
|
|
|
|
;; whereas I think it should be relative to cfn.
|
|
|
|
|
(eieio-persistent-path-relative this file)
|
|
|
|
|
(file-name-nondirectory cfn))))
|
|
|
|
|
(object-write this (oref this file-header-line)))
|
|
|
|
|
(let ((backup-inhibited (not (oref this do-backups)))
|
|
|
|
|
(coding-system-for-write 'utf-8-emacs))
|
|
|
|
|
;; Old way - write file. Leaves message behind.
|
|
|
|
|
;;(write-file cfn nil)
|
|
|
|
|
|
|
|
|
|
;; New way - Avoid the vast quantities of error checking
|
|
|
|
|
;; just so I can get at the special flags that disable
|
|
|
|
|
;; displaying random messages.
|
|
|
|
|
(write-region (point-min) (point-max) cfn nil 1)
|
|
|
|
|
))))
|
2009-09-28 00:49:54 +00:00
|
|
|
|
|
|
|
|
|
;; Notes on the persistent object:
|
|
|
|
|
;; It should also set up some hooks to help it keep itself up to date.
|
|
|
|
|
|
|
|
|
|
|
2015-03-30 17:51:50 -04:00
|
|
|
|
|
2009-09-28 00:49:54 +00:00
|
|
|
|
(provide 'eieio-base)
|
|
|
|
|
|
|
|
|
|
;;; eieio-base.el ends here
|